[SCM] Qt 4 packaging branch, master, updated. debian/4.8.0-1-47-gd71e5d5

[Fathi Boudra]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=d71e5d5

The following commit has been merged in the master branch:
commit d71e5d519e23acbf78992c8b675aab063f7c0ff4
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue May 1 13:28:27 2012 +0300

    Refresh patches.
---
 ...rash_in_cursorToX_when_new_block_is_added.patch |    4 ++--
 debian/patches/gcc-4.7.diff                        |    9 +++++++--
 .../patches/qt-multiarch-plugin-path-compat.diff   |   11 ++++++++---
 debian/patches/qt_atomic_sparc64.patch             |    4 ++--
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/debian/patches/QTBUG-24718_Fix_a_crash_in_cursorToX_when_new_block_is_added.patch b/debian/patches/QTBUG-24718_Fix_a_crash_in_cursorToX_when_new_block_is_added.patch
index 2b27b14..9a7701a 100644
--- a/debian/patches/QTBUG-24718_Fix_a_crash_in_cursorToX_when_new_block_is_added.patch
+++ b/debian/patches/QTBUG-24718_Fix_a_crash_in_cursorToX_when_new_block_is_added.patch
@@ -13,11 +13,11 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at nokia.com>
 Bug: https://bugreports.qt-project.org/browse/QTBUG-24718
 ---
  src/gui/text/qtextlayout.cpp |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 1 file changed, 4 insertions(+)
 
 --- a/src/gui/text/qtextlayout.cpp
 +++ b/src/gui/text/qtextlayout.cpp
-@@ -2508,6 +2508,10 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const
+@@ -2508,6 +2508,10 @@ qreal QTextLine::cursorToX(int *cursorPo
      int pos = *cursorPos;
      int itm;
      const HB_CharAttributes *attributes = eng->attributes();
diff --git a/debian/patches/gcc-4.7.diff b/debian/patches/gcc-4.7.diff
index cfafb34..11ece85 100644
--- a/debian/patches/gcc-4.7.diff
+++ b/debian/patches/gcc-4.7.diff
@@ -5,9 +5,14 @@ Origin: vendor
 Forwarded: no
 Last-Update: 2012-04-29
 
+---
+ src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h      |    4 +---
+ src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h |    3 +--
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
-@@ -57,9 +57,7 @@
+@@ -57,9 +57,7 @@ namespace JSC {
      
      class JSGlobalObject : public JSVariableObject {
      protected:
@@ -20,7 +25,7 @@ Last-Update: 2012-04-29
              // pointer to this struct. Adding a vtable pointer would force the
 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
-@@ -32,8 +32,7 @@
+@@ -32,8 +32,7 @@ namespace JSC{
      
      class JSStaticScopeObject : public JSVariableObject {
      protected:
diff --git a/debian/patches/qt-multiarch-plugin-path-compat.diff b/debian/patches/qt-multiarch-plugin-path-compat.diff
index bd72a6a..a1a6c16 100644
--- a/debian/patches/qt-multiarch-plugin-path-compat.diff
+++ b/debian/patches/qt-multiarch-plugin-path-compat.diff
@@ -10,6 +10,11 @@ Author: Steve Langasek <steve.langasek at ubuntu.com>
 Author: Felix Geyer <debfx-pkg at fobos.de>
 Last-Update: 2012-04-25
 
+---
+ src/corelib/kernel/qcoreapplication.cpp    |   17 +++++++++++++++++
+ src/declarative/qml/qdeclarativeimport.cpp |   16 ++++++++++++++++
+ 2 files changed, 33 insertions(+)
+
 --- a/src/corelib/kernel/qcoreapplication.cpp
 +++ b/src/corelib/kernel/qcoreapplication.cpp
 @@ -2398,6 +2398,23 @@ QStringList QCoreApplication::libraryPat
@@ -36,9 +41,9 @@ Last-Update: 2012-04-25
  #endif
  
          // If QCoreApplication is not yet instantiated,
---- a/src/declarative/qml/qdeclarativeimport.cpp	2012-03-14 15:01:13.000000000 +0100
-+++ b/src/declarative/qml/qdeclarativeimport.cpp	2012-04-17 15:13:10.811520930 +0200
-@@ -751,6 +751,22 @@
+--- a/src/declarative/qml/qdeclarativeimport.cpp
++++ b/src/declarative/qml/qdeclarativeimport.cpp
+@@ -751,6 +751,22 @@ QDeclarativeImportDatabase::QDeclarative
          addImportPath(installImportsPath);
      }
  #else
diff --git a/debian/patches/qt_atomic_sparc64.patch b/debian/patches/qt_atomic_sparc64.patch
index 71ba96b..c49acb9 100644
--- a/debian/patches/qt_atomic_sparc64.patch
+++ b/debian/patches/qt_atomic_sparc64.patch
@@ -4,12 +4,12 @@ Bug: https://bugreports.qt-project.org/browse/QTBUG-22479
 Bug-Debian: http://bugs.debian.org/647265
 
 ---
- qatomic_sparc.h |   18 ++++++++++--------
+ src/corelib/arch/qatomic_sparc.h |   18 ++++++++++--------
  1 file changed, 10 insertions(+), 8 deletions(-)
 
 --- a/src/corelib/arch/qatomic_sparc.h
 +++ b/src/corelib/arch/qatomic_sparc.h
-@@ -127,17 +127,19 @@
+@@ -127,17 +127,19 @@ extern "C" {
      Q_CORE_EXPORT int q_atomic_fetch_and_add_acquire_int(volatile int *ptr, int value);
      Q_CORE_EXPORT int q_atomic_fetch_and_add_release_int(volatile int *ptr, int value);
  

-- 
Qt 4 packaging