[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.0-1-37-g829510c

[Didier Raboud]

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

The following commit has been merged in the experimental branch:
commit e1952025cc42f2ad7983bd19ac07203a70ee1960
Author: Pino Toscano <pino at debian.org>
Date:   Wed Apr 25 14:30:27 2012 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 870ccc9..083211f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,10 @@ qt4-x11 (4:4.8.1-0r1) UNRELEASED; urgency=low
   * Merge the 4:4.7.4-3 unstable release: drop fix-format.diff, merged
     upstream.
 
+  [ Pino Toscano ]
+  * Fix atomic support on sparc64, by Aurelien Jarno (thanks!);
+    patch qt_atomic_sparc64.patch. (Closes: #647265)
+
  -- Fathi Boudra <fabo at debian.org>  Wed, 04 Jan 2012 22:15:56 +0200
 
 qt4-x11 (4:4.8.0-1) experimental; urgency=low
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 ad6849b..de7c2ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -47,3 +47,4 @@ blacklist-diginotar-cert.diff
 openssl_no_ssl2.patch
 Remove_QtHelp_dependency_on_QtXml.patch
 CVE-2011-3922.patch
+qt_atomic_sparc64.patch

-- 
Qt 4 packaging