[SCM] QtWebKit packaging branch, master, updated. debian/2.3.2.dfsg-1-2-g70d37f2

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 70d37f235346d89952692882da310741b776e021
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Sep 3 09:13:19 2014 -0300

    Update no_gc_sections.diff from qtwebkit-opensource-src.
---
 debian/changelog                   |  5 +++++
 debian/patches/no_gc_sections.diff | 11 ++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index af2c26c..6b40e6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 qtwebkit (2.3.2.dfsg-2) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Update patches from qtwebkit-opensource-src, we are having the same
+    codebase here.
+    - Updated no_gc_sections.diff.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 03 Sep 2014 09:04:23 -0300
 
 qtwebkit (2.3.2.dfsg-1) unstable; urgency=medium
diff --git a/debian/patches/no_gc_sections.diff b/debian/patches/no_gc_sections.diff
index 897d0d7..ffe5ec1 100644
--- a/debian/patches/no_gc_sections.diff
+++ b/debian/patches/no_gc_sections.diff
@@ -1,11 +1,12 @@
-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>
 Author: Modestas Vainius <modax at debian.org>
+Author: Timo Jyrinki <timo at debian.org>
 Origin: vendor
 Forwarded: no
-Last-Update: 2011-03-28 (mips* and arm* added)
+Last-Update: 2013-02-07 (add i686)
 
 ---
  Source/WebCore/WebCore.pri |    2 +-
@@ -13,12 +14,12 @@ Last-Update: 2011-03-28 (mips* and arm* added)
 
 --- a/Source/WebCore/WebCore.pri
 +++ b/Source/WebCore/WebCore.pri
-@@ -339,7 +339,7 @@
+@@ -301,7 +301,7 @@ mac {
      unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections
  }
  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++* {
+ enable_fast_mobile_scrolling: DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1

-- 
QtWebKit packaging