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

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Wed Sep 3 12:22:27 UTC 2014


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

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

    Refresh no_gc_sections.diff.
---
 debian/changelog                   | 1 +
 debian/patches/no_gc_sections.diff | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6b40e6a..3e95cf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qtwebkit (2.3.2.dfsg-2) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Refresh no_gc_sections.diff.
   * Update patches from qtwebkit-opensource-src, we are having the same
     codebase here.
     - Updated no_gc_sections.diff.
diff --git a/debian/patches/no_gc_sections.diff b/debian/patches/no_gc_sections.diff
index ffe5ec1..ea5d111 100644
--- a/debian/patches/no_gc_sections.diff
+++ b/debian/patches/no_gc_sections.diff
@@ -14,7 +14,7 @@ Last-Update: 2013-02-07 (add i686)
 
 --- a/Source/WebCore/WebCore.pri
 +++ b/Source/WebCore/WebCore.pri
-@@ -301,7 +301,7 @@ mac {
+@@ -339,7 +339,7 @@ mac {
      unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections
  }
  unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections
@@ -22,4 +22,4 @@ Last-Update: 2013-02-07 (add i686)
 +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
  
- enable_fast_mobile_scrolling: DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1
+ unix|win32-g++* {

-- 
QtWebKit packaging



More information about the pkg-kde-commits mailing list