[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 fb657afc1453ff2e5dad50bd21486f46db0e7eec
Author: Modestas Vainius <modax at debian.org>
Date:   Sat May 7 02:34:28 2011 +0300

    Drop 89_powerpc_opts.diff patch.
    
    No longer needed with gcc 4.4 or later.
---
 debian/changelog                    |    1 +
 debian/patches/89_powerpc_opts.diff |   14 --------------
 debian/patches/series               |    1 -
 3 files changed, 1 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b076366..92231e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ qt4-x11 (4:4.7.3-1) UNRELEASED; urgency=low
     (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.
 
  -- Fathi Boudra <fabo at debian.org>  Wed, 04 May 2011 13:08:38 +0300
 
diff --git a/debian/patches/89_powerpc_opts.diff b/debian/patches/89_powerpc_opts.diff
deleted file mode 100644
index 9a0bcfb..0000000
--- a/debian/patches/89_powerpc_opts.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-powerpc needs -O2 -fno-optimize-sibling-calls for qstring.cpp, not just -O2.
-Not needed long-term as the relevant g++ bug is fixed in GCC 4.4.
-
---- a/mkspecs/linux-g++/qmake.conf
-+++ b/mkspecs/linux-g++/qmake.conf
-@@ -12,3 +12,8 @@ QMAKE_INCREMENTAL_STYLE = sublib
- include(../common/g++.conf)
- include(../common/linux.conf)
- load(qt_config)
-+
-+equals(QT_ARCH, powerpc) {
-+    QMAKE_CFLAGS_RELEASE   += -fno-optimize-sibling-calls
-+    QMAKE_CXXFLAGS_RELEASE += -fno-optimize-sibling-calls
-+}
diff --git a/debian/patches/series b/debian/patches/series
index 83664d8..10aed1d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,7 +28,6 @@ buildable_appchooser_states_demos.patch
 70_hppa_ldcw_fix.diff
 71_hppa_unaligned_access_fix_458133.diff
 80_hurd_max_path.diff
-89_powerpc_opts.diff
 92_armel_gcc43_valist_compat.diff
 x-0003-Use-GCC-intrinsics-for-armv6-atomic-operations.patch
 94_armv6_uname_entry.diff

-- 
Qt 4 packaging