[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit bdd54cfc38d66028f971435b31a64dd59dfbc261
Author: Modestas Vainius <modax at debian.org>
Date:   Sun May 8 12:47:33 2011 +0300

    Solve #625825 differently by requiring g++-4.6 4.6.0-7~ on armel.
    
    Build depend on g++-4.6 (>= 4.6.0-7~) [armel] and make libqt4-dev break g++-4.6
    (<< 4.6.0-7~). (Closes: #625825)
---
 debian/changelog                                   |    6 +--
 debian/control                                     |    4 +-
 .../arm_qbasicatomicint_disable_vol_bitfields.diff |   50 --------------------
 debian/patches/series                              |    1 -
 4 files changed, 4 insertions(+), 57 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 55ff28a..5deea30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,10 +13,8 @@ qt4-x11 (4:4.7.3-1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.2: no changes needed.
   * Drop blacklist_fraudulent_comodo_certificates.diff patch, upstream.
   * Refresh patches.
-  * Add arm_qbasicatomicint_disable_vol_bitfields.diff patch which disables
-    -fstrict-volatile-bitfields for QBasicAtomicInt::fetchAndStoreOrdered(int)
-    method on arm. This should fix FTBFSes triggered by this inline function.
-    (Closes: #625825)
+  * Build depend on g++-4.6 (>= 4.6.0-7~) [armel] and make libqt4-dev break
+    g++-4.6 (<< 4.6.0-7~). (Closes: #625825)
   * Drop 91_s390_use_gstabs.diff patch. It's no longer needed as webkit is not
     built from Qt sources anymore.
   * Drop 89_powerpc_opts.diff patch. No longer needed with gcc 4.4 or later.
diff --git a/debian/control b/debian/control
index 410111b..e836e9b 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 7.4.13), pkg-kde-tools (>= 0.6.4), flex,
  libxext-dev, libxft-dev, libxi-dev, libxinerama-dev, libxmu-dev,
  libxrandr-dev, libxrender-dev, libxslt1-dev, libxt-dev, libxtst-dev,
  libxv-dev, zlib1g-dev, freetds-dev, libssl-dev,
- g++ (>= 4:4.5) [s390]
+ g++ (>= 4:4.5) [s390], g++-4.6 (>= 4.6.0-7~) [armel]
 Standards-Version: 3.9.2
 Homepage: http://qt.nokia.com/
 Vcs-Git: git://git.debian.org/pkg-kde/qt/qt4-x11.git
@@ -411,7 +411,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (= ${binary:Version}),
  libqt4-help (= ${binary:Version}), libqt4-test (= ${binary:Version}),
  libqt4-declarative (= ${binary:Version}), qt4-qmake (= ${binary:Version})
 Recommends: libqt4-opengl-dev (= ${binary:Version}), libqtwebkit-dev (>= 2.0~)
-Breaks: libqtwebkit-dev (<< 2.0~), libqt4-opengl-dev (<< 4.4.0-2)
+Breaks: libqtwebkit-dev (<< 2.0~), libqt4-opengl-dev (<< 4.4.0-2), g++-4.6 (<< 4.6.0-7~) [armel]
 Replaces: libqtwebkit-dev (<< 2.0~), libqt4-opengl-dev (<< 4.4.0-2)
 Suggests: qt4-dev-tools, qt4-doc, libmysqlclient-dev, libsqlite0-dev, libsqlite3-dev, libpq-dev, unixodbc-dev, firebird2.1-dev
 Description: Qt 4 development files
diff --git a/debian/patches/arm_qbasicatomicint_disable_vol_bitfields.diff b/debian/patches/arm_qbasicatomicint_disable_vol_bitfields.diff
deleted file mode 100644
index 0f0ca37..0000000
--- a/debian/patches/arm_qbasicatomicint_disable_vol_bitfields.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Modestas Vainius <modax at debian.org>
-Subject: Fix compilation of some QBasicAtomicInt methods with gcc 4.6
-Bug-Debian: http://bugs.debian.org/625825
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gcc-4.5/+bug/675347
-Forwarded: not-needed
-Origin: vendor
-Last-Update: 2011-05-07
-
--fstrict-volatile-bitfields flag, which is enabled by default on arm* since gcc
-4.6, triggers a FTBFS in QBasicAtomicInt::fetchAndStoreOrdered(int) (asm code)
-[1]. While it's believed to be a gcc issue (see Ubuntu bug), workaround it in
-Qt itself by disabling strict-volatile-bitfields optimazation flag for this
-function on arm*. Hackish but it should do it until gcc is fixed.
-
-[1] In file included from /usr/include/qt4/QtCore/qatomic_arch.h:54:0,
-                 from /usr/include/qt4/QtCore/qbasicatomic.h:227,
-                 from /usr/include/qt4/QtCore/qatomic.h:46,
-                 from /usr/include/qt4/QtCore/QAtomicInt:1,
-                 from qatomic.cpp:1:
-/usr/include/qt4/QtCore/qatomic_arm.h: In function 'int main(int, char**)':
-/usr/include/qt4/QtCore/qatomic_arm.h:232:35: error: output number 1 not directly addressable
-/usr/include/qt4/QtCore/qatomic_arm.h:232:35: error: output number 1 not directly addressable
-
-
---- a/src/corelib/thread/qbasicatomic.h
-+++ b/src/corelib/thread/qbasicatomic.h
-@@ -94,6 +94,14 @@ public:
-         return *this;
-     }
- 
-+// Debian: disable -fstrict-volatile-bitfields for some functions on arm* due
-+// to the bug in gcc 4.6 (#625825)
-+#if defined(QT_ARCH_ARM) && defined(Q_CC_GNU) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 6)
-+#define DEBIAN_QATOMIC_ARM_NO_VOL_BITF __attribute((optimize("no-strict-volatile-bitfields")))
-+#else
-+#define DEBIAN_QATOMIC_ARM_NO_VOL_BITF
-+#endif
-+
-     // Atomic API, implemented in qatomic_XXX.h
- 
-     static bool isReferenceCountingNative();
-@@ -116,7 +124,7 @@ public:
-     int fetchAndStoreRelaxed(int newValue);
-     int fetchAndStoreAcquire(int newValue);
-     int fetchAndStoreRelease(int newValue);
--    int fetchAndStoreOrdered(int newValue);
-+    int fetchAndStoreOrdered(int newValue) DEBIAN_QATOMIC_ARM_NO_VOL_BITF;
- 
-     static bool isFetchAndAddNative();
-     static bool isFetchAndAddWaitFree();
diff --git a/debian/patches/series b/debian/patches/series
index 703392b..29af310 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -37,5 +37,4 @@ x-0003-Use-GCC-intrinsics-for-armv6-atomic-operations.patch
 powerpcspe.diff
 sh.diff
 kfreebsd_monotonic_clock.diff
-arm_qbasicatomicint_disable_vol_bitfields.diff
 powerpc_designer_gstabs.diff

-- 
Qt 4 packaging