[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.2-5-4-g45e7ee9

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 45e7ee93ef997a592027ce14c2b534a6044e7242
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Jun 6 03:20:10 2010 +0300

    Expand 96_webkit_no_gc_sections.diff to cover mips(el) as well.
    
    Hopefully, this will make linker less memory demanding and solve out-of-memory
    condition on buildds.
---
 debian/changelog                             |    3 +++
 debian/patches/96_webkit_no_gc_sections.diff |    8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6491f46..8e22d37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qt4-x11 (4:4.6.2-6) UNRELEASED; urgency=low
 
+  * Expand 96_webkit_no_gc_sections.diff to cover mips(el) as well. Hopefully,
+    this will make linker less memory demanding and solve out-of-memory
+    condition on buildds.
 
  -- Modestas Vainius <modax at debian.org>  Sun, 06 Jun 2010 03:16:11 +0300
 
diff --git a/debian/patches/96_webkit_no_gc_sections.diff b/debian/patches/96_webkit_no_gc_sections.diff
index 998b25d..cb0c57f 100644
--- a/debian/patches/96_webkit_no_gc_sections.diff
+++ b/debian/patches/96_webkit_no_gc_sections.diff
@@ -1,11 +1,11 @@
 Description: Don't link QtWebkit with --gc-sections on powerpc and s390
- This works around a binutils bug that results in a segfault on powerpc
- and an internal link error on s390.
+ This works around a binutils bug that results in a segfault on powerpc,
+ an internal link error on s390, and OOM condition on mipsel.
 Author: Steve Langasek <steve.langasek at ubuntu.com>
 Author: Modestas Vainius <modax at debian.org>
 Origin: vendor
 Forwarded: no
-Last-Update: 2010-04-11 (s390 added)
+Last-Update: 2010-05-31 (mipsel added)
 
 --- a/src/3rdparty/webkit/WebCore/WebCore.pro
 +++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -14,7 +14,7 @@ Last-Update: 2010-04-11 (s390 added)
  
  unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections 
 -unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
-+unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):QMAKE_LFLAGS += -Wl,--gc-sections
++unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):QMAKE_LFLAGS += -Wl,--gc-sections
  
  CONFIG(release):!CONFIG(QTDIR_build) {
      contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols

-- 
Qt 4 Debian packaging