[SCM] QtWebKit packaging branch, master, updated. debian/2.2.1-7-53-g03fb5cb

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 2a344fe533d41220b95408522a5643e08962742b
Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
Date:   Sun Jun 8 22:06:52 2014 +0200

    Remove patch: stabs_format_debug_info.diff
    
    Flags are already set in debian/rules.
---
 debian/changelog                            |  1 +
 debian/patches/series                       |  1 -
 debian/patches/stabs_format_debug_info.diff | 31 -----------------------------
 3 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dc71f57..752ab75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ qtwebkit (2.3.2-0) UNRELEASED; urgency=medium
     - add build fix: upstream_changeset_119798.patch
     - remove 01_lflags_as-needed.diff
       and set --as-needed linker flag, to avoid useless linking, in debian/rules
+    - remove stabs_format_debug_info.diff, flags set in debian/rules
   * Switch to building with ./Tools/Scripts/build-webkit as recommended
     by upstream
 
diff --git a/debian/patches/series b/debian/patches/series
index 4086e2c..2692fd1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,6 @@ upstream_changeset_119798.diff
 03_hide_std_symbols.diff
 04_enable_debug_information.diff
 05_sparc_unaligned_access.diff
-stabs_format_debug_info.diff
 no_gc_sections.diff
 #linux_amd64_no_overcommit.diff
 defines_qt_webkit.diff
diff --git a/debian/patches/stabs_format_debug_info.diff b/debian/patches/stabs_format_debug_info.diff
deleted file mode 100644
index 0d38be6..0000000
--- a/debian/patches/stabs_format_debug_info.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: build s390, armel, mips*, sh4 and m68k debugging symbols with -gstabs
- -g exhausts memory on these arches. Thanks to Oswald Buddenhagen for the hint.
-Author: Sune Vuorela <sune at debian.org>
-Author: Modestas Vainius <modax at debian.org>
-Author: Nobuhiro Iwamatsu <iwamatsu at debian.org>
-Author: Pino Toscano <pino at debian.org>
-Bug-Debian: http://bugs.debian.org/528485
-Bug-Debian: http://bugs.debian.org/618325
-Bug-Debian: http://bugs.debian.org/694773
-Bug-Debian: http://bugs.debian.org/717685
-
----
- Source/WebKit.pri |    7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/Source/WebKit.pri
-+++ b/Source/WebKit.pri
-@@ -80,6 +80,13 @@ CONFIG(release, debug|release) {
-     DEFINES += NDEBUG
- }
- 
-+equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, sh)|equals(QT_ARCH, m68k) {
-+	message("s390, armel, armhf, mipsel, sh and m68k workaround for QtWebkit: do not build with -g, but with -gstabs")
-+	QMAKE_CXXFLAGS -= -g
-+	QMAKE_CXXFLAGS += -gstabs
-+}
-+
-+
- INCLUDEPATH += \
-     $$PWD \
-     $$PWD/../include \

-- 
QtWebKit packaging