[SCM] QtWebKit packaging branch, master, updated. debian/2.2.0-5-15-g6fdacef

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 6fdacefa4c273fd015f41bde7babbbf2d216bb18
Author: Pino Toscano <pino at debian.org>
Date:   Tue May 1 14:42:00 2012 +0200

    glibc_hurd_mkspecs.diff: extend to apply also to the hurd-g++ mkspec
---
 debian/changelog                       |    3 ++-
 debian/patches/glibc_hurd_mkspecs.diff |   11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 92301f8..e8a8f23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,8 @@ qtwebkit (2.2.1-2) UNRELEASED; urgency=low
   * Build with -gstabs on armhf instead of -g, like armel.
 
   [ Pino Toscano ]
-  * glibc_mkspec.diff: rename to glibc_hurd_mkspecs.diff.
+  * glibc_mkspec.diff: rename to glibc_hurd_mkspecs.diff, and extend to
+    apply also to the hurd-g++ mkspec.
 
  -- Fathi Boudra <fabo at debian.org>  Tue, 01 May 2012 15:07:39 +0300
 
diff --git a/debian/patches/glibc_hurd_mkspecs.diff b/debian/patches/glibc_hurd_mkspecs.diff
index f75b02c..797629c 100644
--- a/debian/patches/glibc_hurd_mkspecs.diff
+++ b/debian/patches/glibc_hurd_mkspecs.diff
@@ -1,10 +1,11 @@
 Author: Pino Toscano <pino at debian.org>
-Description: Use the glibc mkspec when necessary.
+Description: Use the glibc and hurd mkspecs when necessary.
  - wtf.pri: enable the glib support (needed to compile the GStreamer support)
  - WebKit.pri: add -Werror on non-Linux i386/amd64 archs, and -Wno-c++0x-compat
    for all the non-Linux ones
- This is Debian-specific, as upstream does not have the glibc-g++ mkspec.
-Last-Update: 2011-09-20
+ The glibc part is Debian-specific, as upstream does not have the glibc-g++
+ mkspec, while the hurd part could be upstreamed.
+Last-Update: 2012-05-01
 Origin: vendor
 Forwarded: not-needed
 
@@ -20,7 +21,7 @@ Forwarded: not-needed
      wtf/unicode/UTF8.cpp
  
 -linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
-+linux-*|glibc-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
++linux-*|glibc-*|hurd-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
      !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
          DEFINES += ENABLE_GLIB_SUPPORT=1
          PKGCONFIG += glib-2.0 gio-2.0
@@ -31,7 +32,7 @@ Forwarded: not-needed
  
  # Treat warnings as errors on x86/Linux/GCC
 -linux-g++* {
-+linux-g++*|glibc-* {
++linux-g++*|glibc-*|hurd-* {
      isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
  
      greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {

-- 
QtWebKit packaging