[SCM] qt5webkit packaging branch, master, updated. f585e89c73964b5778a3503ff28182a1ac87b7bc

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit f585e89c73964b5778a3503ff28182a1ac87b7bc
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Jun 3 10:42:05 2013 +0300

    Drop save_memory.diff, not useful in its current form.
    
    It wasn't logically applied on memory limited architectures (! operator),
    so at this point apparently the switches are not needed. The other
    patches are sufficient to keep memory from running out.
---
 debian/changelog                |    6 ++++++
 debian/patches/save_memory.diff |   11 -----------
 debian/patches/series           |    1 -
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a1b2f42..37c274c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qtwebkit-opensource-src (5.0.2-2) UNRELEASED; urgency=low
+
+  * Drop save_memory.diff, not useful in its current form
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 03 Jun 2013 10:40:04 +0300
+
 qtwebkit-opensource-src (5.0.2-1) experimental; urgency=low
 
   * Initial release. (Closes: #697509)
diff --git a/debian/patches/save_memory.diff b/debian/patches/save_memory.diff
deleted file mode 100644
index b35cda0..0000000
--- a/debian/patches/save_memory.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Source/WebCore/WebCore.pri	2013-01-28 09:36:19.710876255 +0000
-+++ b/Source/WebCore/WebCore.pri	2013-01-28 09:39:12.902867759 +0000
-@@ -298,6 +298,8 @@
- }
- unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-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
-+unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--no-keep-memory
-+unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--reduce-memory-overheads
- linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
- 
- unix|win32-g++* {
diff --git a/debian/patches/series b/debian/patches/series
index 9d19f3a..68f3936 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@ stabs_format_debug_info.diff
 no_gc_sections.diff
 hurd.diff
 webkit_qt_hide_symbols.diff
-save_memory.diff

-- 
qt5webkit packaging