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

[Lisandro Damián Nicanor Pérez]

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

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

    Remove gstreamer-1.0.diff.
    
    Applied uptream.
---
 debian/changelog                  |  1 +
 debian/patches/gstreamer-1.0.diff | 78 ---------------------------------------
 debian/patches/series             |  1 -
 3 files changed, 1 insertion(+), 79 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 72dd123..be9e291 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ qtwebkit (2.3.4.dfsg-1) UNRELEASED; urgency=medium
     - upstream_changeset_119798.diff
     - double_conversion_correct_double_operations.patch
     - ppc64el.patch
+    - gstreamer-1.0.diff
   * Refresh patches.
   * 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
diff --git a/debian/patches/gstreamer-1.0.diff b/debian/patches/gstreamer-1.0.diff
deleted file mode 100644
index 3ac2790..0000000
--- a/debian/patches/gstreamer-1.0.diff
+++ /dev/null
@@ -1,78 +0,0 @@
---- a/Source/WebCore/WebCore.pri
-+++ b/Source/WebCore/WebCore.pri
-@@ -184,8 +184,10 @@
- 
- contains(DEFINES, WTF_USE_GSTREAMER=1) {
-     DEFINES += ENABLE_GLIB_SUPPORT=1
--    PKGCONFIG += glib-2.0 gio-2.0 gstreamer-0.10 gstreamer-app-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gstreamer-plugins-base-0.10 gstreamer-video-0.10
--}
-+    DEFINES += GST_API_VERSION=1.0
-+    DEFINES += GST_API_VERSION_1
-+    PKGCONFIG += glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-app-1.0 gstreamer-base-1.0 gstreamer-pbutils-1.0 gstreamer-plugins-base-1.0 gstreamer-video-1.0 gstreamer-audio-1.0
-+ }
- 
- contains(DEFINES, ENABLE_VIDEO=1) {
-     contains(DEFINES, WTF_USE_QTKIT=1) {
-@@ -220,7 +222,7 @@
-     contains(DEFINES, WTF_USE_GSTREAMER=1) {
-         DEFINES += WTF_USE_WEBAUDIO_GSTREAMER=1
-         INCLUDEPATH += $$SOURCE_DIR/platform/audio/gstreamer
--        PKGCONFIG += gstreamer-audio-0.10 gstreamer-fft-0.10
-+        PKGCONFIG += gstreamer-audio-1.0 gstreamer-fft-1.0
-     }
- }
- 
---- a/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h
-+++ b/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h
-@@ -157,7 +157,7 @@
-     virtual void needTouchEvents(bool) { }
- #endif
-  
--#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA) || USE(QTKIT))
-+#if ENABLE(VIDEO) && ((USE(GSTREAMER) && !defined(GST_API_VERSION_1)) || USE(QT_MULTIMEDIA) || USE(QTKIT))
-     virtual bool supportsFullscreenForNode(const Node*);
-     virtual void enterFullscreenForNode(Node*);
-     virtual void exitFullscreenForNode(Node*);
---- a/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h
-+++ b/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h
-@@ -106,10 +106,10 @@
- private:
-     ChromeClientQt* m_chromeClient;
-     HTMLVideoElement* m_videoElement;
--#if USE(QT_MULTIMEDIA)
-+#if USE(QT_MULTIMEDIA) && !defined(GST_API_VERSION_1)
-     QWebFullScreenVideoHandler* m_FullScreenVideoHandler;
- #endif
--#if USE(GSTREAMER)
-+#if USE(GSTREAMER) && !defined(GST_API_VERSION_1)
-     GStreamerFullScreenVideoHandler* m_FullScreenVideoHandlerGStreamer;
- #endif
- #if USE(QTKIT)
---- a/Tools/qmake/mkspecs/features/features.prf
-+++ b/Tools/qmake/mkspecs/features/features.prf
-@@ -186,7 +186,7 @@
-             DEFINES += WTF_USE_QTKIT=1
-         }
-     } else: 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 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'): {
-+        !contains(QT_CONFIG, no-pkg-config):packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") {
-             DEFINES += ENABLE_VIDEO=1
-             DEFINES += WTF_USE_GSTREAMER=1
-         } else {
---- a/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowPrivate.h
-+++ b/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowPrivate.h
-@@ -29,6 +29,7 @@
- #include <QWidget>
- #endif
- 
-+#if ENABLE(VIDEO) && USE(GSTREAMER) && !defined(GST_API_VERSION_1)
- namespace WebCore {
- 
- class HTMLVideoElement;
-@@ -65,5 +66,6 @@
- 
- } // namespace WebCore
- 
-+#endif /* #if ENABLE(VIDEO) && USE(GSTREAMER) && !defined(GST_API_VERSION_1) */
- 
- #endif // PlatformVideoWindowPrivate_h
diff --git a/debian/patches/series b/debian/patches/series
index 7dd12cb..3b12352 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,7 +12,6 @@ glibc_hurd_mkspecs.diff
 hurd.diff
 webkit_qt_hide_symbols.diff
 ignore-unused-local-typedefs_error.diff
-gstreamer-1.0.diff
 hide_wtf_symbols.diff
 hide_jsc_symbols.diff
 fix_nonlinux_glibc_linkage.diff

-- 
QtWebKit packaging