[SCM] qt5webkit packaging branch, experimental, updated. debian/5.1.1-1-6-g85d90f8

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Tue Dec 17 17:38:50 UTC 2013


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

The following commit has been merged in the experimental branch:
commit 85d90f87bb33767a9a1f2470a7349664e6a78ab8
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Dec 17 14:38:33 2013 -0300

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

diff --git a/debian/changelog b/debian/changelog
index a8d3ec7..544ec8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ qtwebkit-opensource-src (5.2.0-1) UNRELEASED; urgency=low
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
   * Bump Qt build dependencies.
-  * Refresh 05_sparc_unaligned_access.diff.
+  * Refresh 05_sparc_unaligned_access.diff and no_gc_sections.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 17 Dec 2013 11:23:02 -0300
 
diff --git a/debian/patches/no_gc_sections.diff b/debian/patches/no_gc_sections.diff
index 4f26e9a..4785e58 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
-@@ -289,7 +289,7 @@ mac {
+@@ -299,7 +299,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
  
- contains(DEFINES, ENABLE_OPENCL=1) {
+ enable_fast_mobile_scrolling: DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1

-- 
qt5webkit packaging



More information about the pkg-kde-commits mailing list