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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 0b1dad4dbb756c7e573f049d3708153b14f601b0
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Sep 29 17:25:29 2014 -0300

    Remove nonlinux_enable_glib_support.patch.
    
    It doesn't applies anymore.
---
 debian/changelog                                  |  2 ++
 debian/patches/nonlinux_enable_glib_support.patch | 21 ---------------------
 debian/patches/series                             |  1 -
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3fd8335..530133c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ qtwebkit (2.3.4.dfsg-1) UNRELEASED; urgency=medium
   * Update glibc_hurd_mkspecs.diff. I removed the first part of the patch
     because now the source uses unix* which should work. The rest was just a
     refresh.
+  * Remove nonlinux_enable_glib_support.patch. It now doesn't applies and the
+    gstreamer stuff is setted up in other places.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 28 Sep 2014 11:20:39 -0300
 
diff --git a/debian/patches/nonlinux_enable_glib_support.patch b/debian/patches/nonlinux_enable_glib_support.patch
deleted file mode 100644
index 68bd001..0000000
--- a/debian/patches/nonlinux_enable_glib_support.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
-
----
- Source/WTF/WTF.pri |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- 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 266c903..3f29982 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,4 +16,3 @@ hide_wtf_symbols.diff
 hide_jsc_symbols.diff
 fix_nonlinux_glibc_linkage.diff
 reduce_memory_usage.patch
-nonlinux_enable_glib_support.patch

-- 
QtWebKit packaging