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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 8d8fa70958af1823040095fd6e4b8e6200770b63
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Sep 11 16:09:36 2014 -0300

    Add Steven Chamberlain's nonlinux_enable_glib_support.patch.
---
 debian/changelog                                  |  2 ++
 debian/patches/nonlinux_enable_glib_support.patch | 25 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9e367bd..69fcedf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtwebkit (2.3.2.dfsg-4) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Also disable JIT on hppa and add support for it in Platform.h trough
     hppa_support.patch (Closes: #760759).
+  * Add Steven Chamberlain's nonlinux_enable_glib_support.patch to use glibc in
+    kFreeBSD-* and Hurd (Closes: #760727). Thanks *a lot* to everyone involved.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 07 Sep 2014 15:22:09 -0300
 
diff --git a/debian/patches/nonlinux_enable_glib_support.patch b/debian/patches/nonlinux_enable_glib_support.patch
new file mode 100644
index 0000000..0c180cd
--- /dev/null
+++ b/debian/patches/nonlinux_enable_glib_support.patch
@@ -0,0 +1,25 @@
+From: Steven Chamberlain <steven at pyro.eu.org>
+Description: properly support GStreamer on non-Linux platforms
+ GStreamer is enabled when building on GNU/kFreeBSD and Hurd, but support
+ for it was not enabled in the WTF component
+Bug-Debian: http://bugs.debian.org/760727
+
+---
+ debian/patches/kfreebsd.diff |   11 +++++++++++
+ 1 file changed, 11 insertions(+)
+ create mode 100644 debian/patches/kfreebsd.diff
+
+--- /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
++ }
diff --git a/debian/patches/series b/debian/patches/series
index fcc6a01..7115890 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ bound_cpu_usage.patch
 x32_support.patch
 arm64.patch
 hppa_support.patch
+nonlinux_enable_glib_support.patch

-- 
QtWebKit packaging