[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.6.0-1-12-g2ce0fb3

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit 2ce0fb39478cf2048f4c529848ceb46c5d4fb597
Author: Fathi Boudra <fabo at kde.org>
Date:   Mon Jan 11 12:32:31 2010 +0100

    Add 96_powerpc_no_gc_sections.diff: Don't pass -Wl,--gc-sections on powerpc
    when building libQtWebKit.so; works around a binutils bug that results in a
    segfault. Thanks to Steve Langasek.
---
 debian/changelog                              |    3 +++
 debian/patches/96_powerpc_no_gc_sections.diff |   16 ++++++++++++++++
 debian/patches/series                         |    1 +
 3 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6545bfb..7024b9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ qt4-x11 (4:4.6.0-2) UNRELEASED; urgency=low
   * Update debian/rules:
     - Use linux-g++-64 as platform_arg on required architectures (amd64, ia64
       and sparc64).
+  * Add 96_powerpc_no_gc_sections.diff: Don't pass -Wl,--gc-sections on powerpc
+    when building libQtWebKit.so; works around a binutils bug that results in a
+    segfault. Thanks to Steve Langasek.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 13 Dec 2009 18:43:29 +0200
 
diff --git a/debian/patches/96_powerpc_no_gc_sections.diff b/debian/patches/96_powerpc_no_gc_sections.diff
new file mode 100644
index 0000000..e8cf4c8
--- /dev/null
+++ b/debian/patches/96_powerpc_no_gc_sections.diff
@@ -0,0 +1,16 @@
+Description: Don't pass -Wl,--gc-sections on powerpc when building
+             libQtWebKit.so;
+             works around a binutils bug that results in a segfault.
+Author: Steve Langasek <steve.langasek at ubuntu.com>
+
+--- a/src/3rdparty/webkit/WebCore/WebCore.pro
++++ b/src/3rdparty/webkit/WebCore/WebCore.pro
+@@ -51,7 +51,7 @@
+ }
+ 
+ unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections 
+-unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
++unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):QMAKE_LFLAGS += -Wl,--gc-sections
+ 
+ CONFIG(release):!CONFIG(QTDIR_build) {
+     contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
diff --git a/debian/patches/series b/debian/patches/series
index bc2c17f..94a0979 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -34,6 +34,7 @@
 89_powerpc_opts.diff
 91_s390_-gstabs.diff
 92_armel_gcc43_valist_compat.diff
+96_powerpc_no_gc_sections.diff
 93_jsvalue64_on_ia64.diff
 94_fix_crash_in_qdbuspendingreply_qdbusreply.diff
 95_sparc_platform_definition.diff

-- 
Qt 4 Debian packaging