[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.2-4-7-g6aa353b

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 0cdc5d0fc8d0553713289fa7c808938af0e5c36a
Author: Fathi Boudra <fabo at debian.org>
Date:   Wed Apr 21 13:08:23 2010 +0300

    Refresh patches
---
 .../0003_s390_fix_atomic_ops_related_crashes.diff  |    5 -----
 debian/patches/0180-window-role.diff               |   14 +++++++-------
 debian/patches/50_kfreebsd_build_fix.diff          |    2 +-
 debian/patches/51_kfreebsd_strnstr_build_fix.diff  |    2 +-
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/debian/patches/0003_s390_fix_atomic_ops_related_crashes.diff b/debian/patches/0003_s390_fix_atomic_ops_related_crashes.diff
index 4331807..ac0c01c 100644
--- a/debian/patches/0003_s390_fix_atomic_ops_related_crashes.diff
+++ b/debian/patches/0003_s390_fix_atomic_ops_related_crashes.diff
@@ -17,8 +17,6 @@ Origin: upstream, http://qt.gitorious.org/qt/qt/commit/cdf4701f442149546043b155c
  src/corelib/arch/qatomic_s390.h |   16 ++++++----------
  1 files changed, 6 insertions(+), 10 deletions(-)
 
-diff --git a/src/corelib/arch/qatomic_s390.h b/src/corelib/arch/qatomic_s390.h
-index 21f5037..273c17b 100644
 --- a/src/corelib/arch/qatomic_s390.h
 +++ b/src/corelib/arch/qatomic_s390.h
 @@ -366,11 +366,9 @@ template <typename T>
@@ -61,6 +59,3 @@ index 21f5037..273c17b 100644
  #endif
  }
  
--- 
-1.6.1
-
diff --git a/debian/patches/0180-window-role.diff b/debian/patches/0180-window-role.diff
index 5467826..29833f5 100644
--- a/debian/patches/0180-window-role.diff
+++ b/debian/patches/0180-window-role.diff
@@ -86,10 +86,12 @@ Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refuse
          }
  
          // set client leader property
-@@ -2919,6 +2923,17 @@ void QWidgetPrivate::setWindowRole()
+@@ -2917,6 +2921,17 @@ void QWidgetPrivate::setWindowRole()
+     XChangeProperty(X11->display, q->internalWinId(),
+                     ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
                      (unsigned char *)windowRole.constData(), windowRole.length());
- }
- 
++}
++
 +void QWidgetPrivate::checkWindowRole()
 +{
 +    Q_Q(QWidget);
@@ -99,8 +101,6 @@ Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refuse
 +    XChangeProperty(X11->display, q->internalWinId(),
 +                    ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
 +                    (unsigned char *)windowRole.constData(), windowRole.length());
-+}
-+
+ }
+ 
  Q_GLOBAL_STATIC(QX11PaintEngine, qt_widget_paintengine)
- QPaintEngine *QWidget::paintEngine() const
- {
diff --git a/debian/patches/50_kfreebsd_build_fix.diff b/debian/patches/50_kfreebsd_build_fix.diff
index 6cfa05b..fdb4eee 100644
--- a/debian/patches/50_kfreebsd_build_fix.diff
+++ b/debian/patches/50_kfreebsd_build_fix.diff
@@ -28,7 +28,7 @@ Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
  #elif defined(__QNXNTO__)
 --- a/src/corelib/plugin/qlibrary.cpp
 +++ b/src/corelib/plugin/qlibrary.cpp
-@@ -295,13 +295,13 @@ static bool qt_parse_pattern(const char 
+@@ -295,13 +295,13 @@ static bool qt_parse_pattern(const char
  
  #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_SYMBIAN) && !defined(QT_NO_PLUGIN_CHECK)
  
diff --git a/debian/patches/51_kfreebsd_strnstr_build_fix.diff b/debian/patches/51_kfreebsd_strnstr_build_fix.diff
index 7184ebd..de86dec 100644
--- a/debian/patches/51_kfreebsd_strnstr_build_fix.diff
+++ b/debian/patches/51_kfreebsd_strnstr_build_fix.diff
@@ -12,7 +12,7 @@ Bug: https://bugs.webkit.org/show_bug.cgi?id=33903
 +#if defined(__linux__) || defined(__GLIBC__)
  #define WTF_PLATFORM_LINUX 1
  #endif
-
+ 
 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
 @@ -68,7 +68,7 @@

-- 
Qt 4 Debian packaging