[SCM] qt5webkit packaging branch, master, updated. debian/5.1.0-1-2-gceb919c

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit ceb919c8ad4b36959de63b006756f8bb9b34770d
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Jul 25 16:58:23 2013 -0300

    Use -gstabs instead of -g in i386 and m68k.
---
 debian/changelog                            |    3 +++
 debian/patches/stabs_format_debug_info.diff |   17 +++++++++--------
 debian/rules                                |    2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 11f296f..ed2f936 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtwebkit-opensource-src (5.1.0-2) UNRELEASED; urgency=low
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Make i386 and m68k build with -gstabs instead of -g (Closes: #717686).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 25 Jul 2013 16:40:45 -0300
 
 qtwebkit-opensource-src (5.1.0-1) experimental; urgency=low
diff --git a/debian/patches/stabs_format_debug_info.diff b/debian/patches/stabs_format_debug_info.diff
index ab68f70..c9ad56d 100644
--- a/debian/patches/stabs_format_debug_info.diff
+++ b/debian/patches/stabs_format_debug_info.diff
@@ -7,12 +7,13 @@ Bug-Debian: http://bugs.debian.org/528485
 Bug-Debian: http://bugs.debian.org/618325
 Last-Update: 2013-02-07 (add iX86)
  
---- a/Source/WebKit/WebKit1.pri.old	2012-12-18 19:04:41.000000000 +0000
-+++ b/Source/WebKit/WebKit1.pri	2013-01-25 06:51:32.133738485 +0000
-@@ -8,5 +8,11 @@
+--- a/Source/WebKit/WebKit1.pri
++++ b/Source/WebKit/WebKit1.pri
+@@ -7,6 +7,12 @@
+ 
  SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebKit
  
-+equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686) {
++equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, m68k) {
 +    message("s390, armel, armhf, mipsel, i386 workaround for QtWebkit: do not build with -g, but with -gstabs")
 +    QMAKE_CXXFLAGS -= -g
 +    QMAKE_CXXFLAGS += -gstabs
@@ -21,13 +22,13 @@ Last-Update: 2013-02-07 (add iX86)
  INCLUDEPATH += \
      $$SOURCE_DIR/qt/Api \
      $$SOURCE_DIR/qt/WebCoreSupport \
---- a/Source/WebKit2/WebKit2.pri.old	2012-12-18 19:04:26.000000000 +0000
-+++ b/Source/WebKit2/WebKit2.pri	2013-01-25 06:52:07.301737594 +0000
-@@ -9,6 +9,12 @@
+--- a/Source/WebKit2/WebKit2.pri
++++ b/Source/WebKit2/WebKit2.pri
+@@ -9,6 +9,12 @@ SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/
  
  WEBKIT2_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebKit2/$${GENERATED_SOURCES_DESTDIR}
  
-+equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686) {
++equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, m68k) {
 +    message("s390, armel, armhf, mipsel, i686 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 96e461b..ae06859 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ export QT_SELECT := qt5
 # See also: stabs_format_debug_info.diff
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-ifneq (,$(filter $(DEB_HOST_ARCH),s390 s390x armel armhf mips mipsel))
+ifneq (,$(filter $(DEB_HOST_ARCH),s390 s390x armel armhf mips mipsel i386 m68k))
     export DEB_CFLAGS_MAINT_STRIP := -g
     export DEB_CFLAGS_MAINT_APPEND := -gstabs
     export DEB_CXXFLAGS_MAINT_STRIP := -g

-- 
qt5webkit packaging