[SCM] Qt 4 packaging branch, experimental, updated. debian/4.7.4-1-48-g361be8b

[Fathi Boudra]

The following commit has been merged in the experimental branch:
commit 361be8b0875e55ca3dcd8a326c28eec129433a77
Author: Fathi Boudra <fabo at debian.org>
Date:   Thu Dec 29 12:05:03 2011 +0200

    Add add_missing_method_for_QBasicAtomicPointer_on_s390.patch
---
 debian/changelog                                   |    1 +
 ...ng_method_for_QBasicAtomicPointer_on_s390.patch |   26 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4365a74..b56d90c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ qt4-x11 (4:4.8.0-0multiarch1) UNRELEASED; urgency=low
     - QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch
     - QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_
       gnome-shell.patch
+    - add_missing_method_for_QBasicAtomicPointer_on_s390.patch
   * Update debian/compat: bump to 9 for multiarch.
   * Update debian/control:
     - mark Qt libraries as Multi-Arch.
diff --git a/debian/patches/add_missing_method_for_QBasicAtomicPointer_on_s390.patch b/debian/patches/add_missing_method_for_QBasicAtomicPointer_on_s390.patch
new file mode 100644
index 0000000..c791e41
--- /dev/null
+++ b/debian/patches/add_missing_method_for_QBasicAtomicPointer_on_s390.patch
@@ -0,0 +1,26 @@
+Description: add missing method for QBasicAtomicPointer on s390(x)
+Author: Dan Horák <dan[at]dannu.cz>
+
+---
+ src/corelib/arch/qatomic_s390.h |   10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/src/corelib/arch/qatomic_s390.h
++++ b/src/corelib/arch/qatomic_s390.h
+@@ -400,6 +400,16 @@ Q_INLINE_TEMPLATE T* QBasicAtomicPointer
+ 
+ 
+ template <typename T>
++Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd)
++{
++#ifndef __s390x__
++    return (T *)__CS_OLD_LOOP(&_q_value, valueToAdd * sizeof(T), "ar", "", "bcr 15,0
");
++#else
++    return (T *)__CSG_OLD_LOOP(&_q_value, valueToAdd * sizeof(T), "agr", "", "bcr 15,0
");
++#endif
++}
++
++template <typename T>
+ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd)
+ {
+     return fetchAndAddOrdered(valueToAdd);
diff --git a/debian/patches/series b/debian/patches/series
index 1b65d57..87007ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -41,3 +41,4 @@ powerpc_designer_gstabs.diff
 qt-multiarch-plugin-path-compat.diff
 fix_ftbfs_format-security.patch
 fix_qvfb_build.patch
+add_missing_method_for_QBasicAtomicPointer_on_s390.patch

-- 
Qt 4 packaging