[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.2-2-10-gcee259b

[Modestas Vainius]

The following commit has been merged in the master branch:
commit cee259bfc81ad858781ddb0ba4a4cfad6db01146
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Apr 11 19:11:46 2010 +0300

    Revert 848afe6176f7a1595727116498595b78799c6f8a and implement proper solution.
    
    * Revert previous s390 specific change as it did not solve FTBFS.
    * Do not build with -ffunction-sections on s390. This should actually
      workaround FTBFS on s390 caused by internal linker error which is due to
      miscompilation of UString.o and others.
---
 debian/changelog                                |    4 +++
 debian/patches/91_s390_no_webkit_debugging.diff |   23 ----------------
 debian/patches/91_s390_webkit_ftbfs_fixes.diff  |   32 +++++++++++++++++++++++
 debian/patches/series                           |    2 +-
 4 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c4784e5..de8d5da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qt4-x11 (4:4.6.2-4~pre1) UNRELEASED; urgency=low
 
+  * Revert previous s390 specific change as it did not solve FTBFS.
+  * Do not build with -ffunction-sections on s390. This should actually
+    workaround FTBFS on s390 caused by internal linker error which is due to
+    miscompilation of UString.o and others.
 
  -- Modestas Vainius <modax at debian.org>  Sun, 11 Apr 2010 19:06:59 +0300
 
diff --git a/debian/patches/91_s390_no_webkit_debugging.diff b/debian/patches/91_s390_no_webkit_debugging.diff
deleted file mode 100644
index 3dc23fc..0000000
--- a/debian/patches/91_s390_no_webkit_debugging.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-author: Sune Vuorela <sune at debian.org>
-
-Don't do debugging symbols for webkit on s390, it is too big for the linker.
-Thanks to Oswald Buddenhagen for the hint.
-
-Debian bug 528485
-
---- a/src/3rdparty/webkit/WebKit.pri
-+++ b/src/3rdparty/webkit/WebKit.pri
-@@ -43,6 +43,13 @@ CONFIG(release, debug|release) {
-     DEFINES += NDEBUG
- }
- 
-+arch=$$system(dpkg-architecture -qDEB_BUILD_ARCH)
-+equals(arch, s390) {
-+	message("S/390 workaround: is not building with -g, but with -gstabs")
-+	QMAKE_CXXFLAGS -= -g
-+}
-+
-+
- BASE_DIR = $$PWD
- INCLUDEPATH += $$PWD/WebKit/qt/Api
- QMAKE_LFLAGS += -Wl,--version-script,$$BASE_DIR/symbols.filter
diff --git a/debian/patches/91_s390_webkit_ftbfs_fixes.diff b/debian/patches/91_s390_webkit_ftbfs_fixes.diff
new file mode 100644
index 0000000..db2405a
--- /dev/null
+++ b/debian/patches/91_s390_webkit_ftbfs_fixes.diff
@@ -0,0 +1,32 @@
+Author: Sune Vuorela <sune at debian.org>
+Author: Modestas Vainius <modax at debian.org>
+Description: workaround webkit FTBFSes on s390
+ * Build s390 debugging symbols with -gstabs instead of with -g to reduce
+   linker memory usage. Thanks to Oswald Buddenhagen for the hint.
+ * Do not build webkit with -ffunction-sections on s390 as it triggers internal
+   linker error with "gcc (Debian 4.4.3-7) 4.4.3" / "ld 2.20.1-system.20100303"
+   (there are problems with at least UString.o and some more).
+Bug-Debian: http://bugs.debian.org/528485
+Origin: vendor
+Forwarded: no
+Last-Update: 2010-04-11 (-ffunction-sections removal)
+
+--- a/src/3rdparty/webkit/WebKit.pri
++++ b/src/3rdparty/webkit/WebKit.pri
+@@ -43,6 +43,16 @@ CONFIG(release, debug|release) {
+     DEFINES += NDEBUG
+ }
+ 
++arch=$$system(dpkg-architecture -qDEB_BUILD_ARCH)
++equals(arch, s390) {
++	message("S/390 workaround: do not build with -g, but with -gstabs")
++	QMAKE_CXXFLAGS -= -g
++	QMAKE_CXXFLAGS += -gstabs
++	message("S/390 workaround: do not build with -ffunction-sections")
++	QMAKE_CXXFLAGS -= -ffunction-sections
++}
++
++
+ BASE_DIR = $$PWD
+ INCLUDEPATH += $$PWD/WebKit/qt/Api
+ QMAKE_LFLAGS += -Wl,--version-script,$$BASE_DIR/symbols.filter
diff --git a/debian/patches/series b/debian/patches/series
index f94270a..5dcaf2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -38,7 +38,7 @@
 81_hurd_architecture.diff
 82_hurd_SA_SIGINFO.diff
 89_powerpc_opts.diff
-91_s390_no_webkit_debugging.diff
+91_s390_webkit_ftbfs_fixes.diff
 92_armel_gcc43_valist_compat.diff
 95_sparc_platform_definition.diff
 96_powerpc_no_gc_sections.diff

-- 
Qt 4 Debian packaging