[SCM] Qt 4 packaging branch, master, updated. debian/4.7.4-3-3-gaf42a8a

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit af42a8a3a92832a2e2c46b594f3e5bf228c03f6d
Author: Pino Toscano <pino at debian.org>
Date:   Tue Apr 24 12:09:03 2012 +0200

    fix atomic support on sparc64 (#647265)
    
    patch qt_atomic_sparc64.patch by Aurelien Jarno
---
 debian/changelog                       |    2 +
 debian/patches/qt_atomic_sparc64.patch |   39 ++++++++++++++++++++++++++++++++
 debian/patches/series                  |    1 +
 3 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3c11c50..24a94b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qt4-x11 (4:4.7.4-4) UNRELEASED; urgency=low
 
   [ Pino Toscano ]
   * Fix build failures with GCC 4.7; patch gcc-4.7.diff. (Closes: #667911)
+  * Fix atomic support on sparc64, by Aurelien Jarno (thanks!);
+    patch qt_atomic_sparc64.patch. (Closes: #647265)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 17 Apr 2012 01:55:05 +0200
 
diff --git a/debian/patches/qt_atomic_sparc64.patch b/debian/patches/qt_atomic_sparc64.patch
new file mode 100644
index 0000000..71ba96b
--- /dev/null
+++ b/debian/patches/qt_atomic_sparc64.patch
@@ -0,0 +1,39 @@
+Author: Aurelien Jarno <aurel32 at debian.org>
+Description: Fix atomic support on sparc64
+Bug: https://bugreports.qt-project.org/browse/QTBUG-22479
+Bug-Debian: http://bugs.debian.org/647265
+
+---
+ 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 @@
+     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);
+ 
+-    Q_CORE_EXPORT int q_atomic_test_and_set_ptr(volatile void *ptr, void *expected, void *newval);
++    Q_CORE_EXPORT int q_atomic_test_and_set_ptr(volatile void *ptr,
++                                                const void *expected,
++                                                const void *newval);
+     Q_CORE_EXPORT int q_atomic_test_and_set_acquire_ptr(volatile void *ptr,
+-                                                        void *expected,
+-                                                        void *newval);
++                                                        const void *expected,
++                                                        const void *newval);
+     Q_CORE_EXPORT int q_atomic_test_and_set_release_ptr(volatile void *ptr,
+-                                                        void *expected,
+-                                                        void *newval);
++                                                        const void *expected,
++                                                        const void *newval);
+ 
+-    Q_CORE_EXPORT void *q_atomic_set_ptr(volatile void *ptr, void *newval);
+-    Q_CORE_EXPORT void *q_atomic_fetch_and_store_acquire_ptr(volatile void *ptr, void *newval);
+-    Q_CORE_EXPORT void *q_atomic_fetch_and_store_release_ptr(volatile void *ptr, void *newval);
++    Q_CORE_EXPORT void *q_atomic_set_ptr(volatile void *ptr, const void *newval);
++    Q_CORE_EXPORT void *q_atomic_fetch_and_store_acquire_ptr(volatile void *ptr, const void *newval);
++    Q_CORE_EXPORT void *q_atomic_fetch_and_store_release_ptr(volatile void *ptr, const void *newval);
+ 
+     Q_CORE_EXPORT void *q_atomic_fetch_and_add_ptr(volatile void *ptr, int value);
+     Q_CORE_EXPORT void *q_atomic_fetch_and_add_acquire_ptr(volatile void *ptr, int value);
diff --git a/debian/patches/series b/debian/patches/series
index 1d7ec06..9eb99d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -56,3 +56,4 @@ Remove_QtHelp_dependency_on_QtXml.patch
 CVE-2011-3922.patch
 fix-format.diff
 gcc-4.7.diff
+qt_atomic_sparc64.patch

-- 
Qt 4 packaging