[SCM] QtWebKit packaging branch, master, updated. debian/2.3.2.dfsg-3-7-ga886151

[Felix Geyer]

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

The following commit has been merged in the master branch:
commit d3d3a0effc164ccbafa0d02e65514dc2614bd821
Author: Felix Geyer <fgeyer at debian.org>
Date:   Fri Sep 12 18:37:21 2014 +0200

    Fix up nonlinux_enable_glib_support.patch.
---
 debian/patches/nonlinux_enable_glib_support.patch | 30 ++++++++++-------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/debian/patches/nonlinux_enable_glib_support.patch b/debian/patches/nonlinux_enable_glib_support.patch
index 0c180cd..68bd001 100644
--- a/debian/patches/nonlinux_enable_glib_support.patch
+++ b/debian/patches/nonlinux_enable_glib_support.patch
@@ -5,21 +5,17 @@ Description: properly support GStreamer on non-Linux platforms
 Bug-Debian: http://bugs.debian.org/760727
 
 ---
- debian/patches/kfreebsd.diff |   11 +++++++++++
- 1 file changed, 11 insertions(+)
- create mode 100644 debian/patches/kfreebsd.diff
+ Source/WTF/WTF.pri |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
---- /dev/null
-+++ b/debian/patches/kfreebsd.diff
-@@ -0,0 +1,11 @@
-+--- a/Source/WTF/WTF.pri
-++++ b/Source/WTF/WTF.pri
-+@@ -24,7 +24,7 @@
-+     }
-+ }
-+ 
-+-linux-*:contains(DEFINES, WTF_USE_GSTREAMER=1) {
-++linux-*|glibc-*|hurd-*:contains(DEFINES, WTF_USE_GSTREAMER=1) {
-+     DEFINES += ENABLE_GLIB_SUPPORT=1
-+     PKGCONFIG += glib-2.0 gio-2.0
-+ }
+--- a/Source/WTF/WTF.pri
++++ b/Source/WTF/WTF.pri
+@@ -24,7 +24,7 @@
+     }
+ }
+ 
+-linux-*:contains(DEFINES, WTF_USE_GSTREAMER=1) {
++linux-*|glibc-*|hurd-*:contains(DEFINES, WTF_USE_GSTREAMER=1) {
+     DEFINES += ENABLE_GLIB_SUPPORT=1
+     PKGCONFIG += glib-2.0 gio-2.0
+ }

-- 
QtWebKit packaging