[SCM] QtWebKit packaging branch, qt5, updated. debian/2.2.1-5-10-g1f13366

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=commitdiff;h=e25a0cd

The following commit has been merged in the qt5 branch:
commit e25a0cde0358fc9dbeb74594d645c45a77ffc5db
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Feb 26 06:02:19 2013 +0000

    Expand no_gc_sections and stabs_format_debug_info to 32-bit x86.
    
    i386 started OOM:ing with 5.0.1, so expanding the use of memory saving
    patches to it.
---
 debian/patches/no_gc_sections.diff          |    6 +++---
 debian/patches/stabs_format_debug_info.diff |   12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/patches/no_gc_sections.diff b/debian/patches/no_gc_sections.diff
index f4bd8fa..72cb91a 100644
--- a/debian/patches/no_gc_sections.diff
+++ b/debian/patches/no_gc_sections.diff
@@ -1,4 +1,4 @@
-Description: do not pass -Wl,--gc-sections on powerpc, s390, arm* and mips* when building
+Description: do not pass -Wl,--gc-sections on powerpc, s390, arm*, mips*, iX86 when building
              libQtWebKit.so; works around a binutils bug that results in a
              segfault on powerpc, internal link error on s390 and OOM on armel/mipsel.
 Author: Steve Langasek <vorlon at debian.org>
@@ -6,7 +6,7 @@ Author: Modestas Vainius <modax at debian.org>
 Author: Timo Jyrinki <timo at debian.org>
 Origin: vendor
 Forwarded: no
-Last-Update: 2013-01-28 (Qt 5)
+Last-Update: 2013-02-07 (add i686)
 
 ---
  Source/WebCore/WebCore.pri |    2 +-
@@ -19,7 +19,7 @@ Last-Update: 2013-01-28 (Qt 5)
  }
  unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections
 -unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
-+unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--gc-sections
++unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):!equals(QT_ARCH, i386):!equals(QT_ARCH, i686):QMAKE_LFLAGS += -Wl,--gc-sections
  linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
  
  unix|win32-g++* {
diff --git a/debian/patches/stabs_format_debug_info.diff b/debian/patches/stabs_format_debug_info.diff
index 2e5666e..ab68f70 100644
--- a/debian/patches/stabs_format_debug_info.diff
+++ b/debian/patches/stabs_format_debug_info.diff
@@ -1,19 +1,19 @@
-Description: build s390, armel, mips* debugging symbols with -gstabs
+Description: build s390, armel, mips*, iX86 debugging symbols with -gstabs
  -g exhausts memory on these arches. Thanks to Oswald Buddenhagen for the hint.
 Author: Sune Vuorela <sune at debian.org>
 Author: Modestas Vainius <modax at debian.org>
 Author: Timo Jyrinki <timo at debian.org>
 Bug-Debian: http://bugs.debian.org/528485
 Bug-Debian: http://bugs.debian.org/618325
-Last-Update: 2013-01-28 (Qt 5)
+Last-Update: 2013-02-07 (add iX86)
  
 --- a/Source/WebKit/WebKit1.pri.old	2012-12-18 19:04:41.000000000 +0000
 +++ b/Source/WebKit/WebKit1.pri	2013-01-25 06:51:32.133738485 +0000
 @@ -8,5 +8,11 @@
  SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebKit
  
-+equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips) {
-+    message("s390, armel, armhf, mipsel workaround for QtWebkit: do not build with -g, but with -gstabs")
++equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686) {
++    message("s390, armel, armhf, mipsel, i386 workaround for QtWebkit: do not build with -g, but with -gstabs")
 +    QMAKE_CXXFLAGS -= -g
 +    QMAKE_CXXFLAGS += -gstabs
 +}
@@ -27,8 +27,8 @@ Last-Update: 2013-01-28 (Qt 5)
  
  WEBKIT2_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebKit2/$${GENERATED_SOURCES_DESTDIR}
  
-+equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips) {
-+    message("s390, armel, armhf, mipsel workaround for QtWebkit: do not build with -g, but with -gstabs")
++equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686) {
++    message("s390, armel, armhf, mipsel, i686 workaround for QtWebkit: do not build with -g, but with -gstabs")
 +    QMAKE_CXXFLAGS -= -g
 +    QMAKE_CXXFLAGS += -gstabs
 +}

-- 
QtWebKit packaging