[SCM] QtWebKit packaging branch, master, updated. debian/2.2.1-6-2-gcdd07ea

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit cdd07eaca1c55c1b2a648a861cbb488c626fe67f
Author: Pino Toscano <pino at debian.org>
Date:   Tue Oct 1 19:15:22 2013 +0200

    fix build on sh4 (#694773)
    
    use -gstabs instead of -g
---
 debian/changelog                            |    2 ++
 debian/patches/stabs_format_debug_info.diff |    8 +++++---
 debian/rules                                |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index da5767c..93dbac0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtwebkit (2.2.1-7) UNRELEASED; urgency=low
 
+  [ Nobuhiro Iwamatsu ]
+  * Fix build on Renesas sh4, using -gstabs instead of -g. (Closes: #694773)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 01 Oct 2013 19:02:49 +0200
 
diff --git a/debian/patches/stabs_format_debug_info.diff b/debian/patches/stabs_format_debug_info.diff
index 1606e7d..5007b4a 100644
--- a/debian/patches/stabs_format_debug_info.diff
+++ b/debian/patches/stabs_format_debug_info.diff
@@ -1,9 +1,11 @@
-Description: build s390, armel, mips* debugging symbols with -gstabs
+Description: build s390, armel, mips* and sh4 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>
 Bug-Debian: http://bugs.debian.org/528485
 Bug-Debian: http://bugs.debian.org/618325
+Bug-Debian: http://bugs.debian.org/694773
 
 ---
  Source/WebKit.pri |    7 +++++++
@@ -15,8 +17,8 @@ Bug-Debian: http://bugs.debian.org/618325
      DEFINES += NDEBUG
  }
  
-+equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips) {
-+	message("s390, armel, armhf, mipsel workaround for QtWebkit: do not build with -g, but with -gstabs")
++equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, sh) {
++	message("s390, armel, armhf, mipsel and sh workaround for QtWebkit: do not build with -g, but with -gstabs")
 +	QMAKE_CXXFLAGS -= -g
 +	QMAKE_CXXFLAGS += -gstabs
 +}
diff --git a/debian/rules b/debian/rules
index 19791a5..e65f1a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ QWEBVIEW_DIR=debian/plugins/qwebview
 # Filter -g from environment on troublesome arches. Replace it with -gstabs
 # See also: stabs_format_debug_info.diff
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-ifneq (,$(filter $(DEB_HOST_ARCH),s390 s390x armel armhf mips mipsel))
+ifneq (,$(filter $(DEB_HOST_ARCH),s390 s390x armel armhf mips mipsel sh4))
     export DEB_CFLAGS_MAINT_STRIP := -g
     export DEB_CFLAGS_MAINT_APPEND := -gstabs
     export DEB_CXXFLAGS_MAINT_STRIP := -g

-- 
QtWebKit packaging