[SCM] QtWebKit packaging branch, experimental, updated. debian/2.2.1-7-42-g782f170

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit f908f71044104abb34df10532047277b439fc3e9
Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
Date:   Sun Jun 8 23:47:17 2014 +0200

    Add build-patch for gstreamer-1.0.
---
 debian/changelog                  |  8 ++--
 debian/patches/gstreamer-1.0.diff | 78 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0afe3ce..6bb394d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,9 +13,11 @@ qtwebkit (2.3.2-0) UNRELEASED; urgency=medium
     - remove stabs_format_debug_info.diff, flags set in debian/rules
   * Switch to building with ./Tools/Scripts/build-webkit as recommended
     by upstream
-  * Build with gstreamer-1.x, bump build dependencies
-    - libgstreamer-plugins-base1.0-dev
-    - libgstreamer1.0-dev
+  * Build with gstreamer-1.x:
+    - bump build dependencies to
+      - libgstreamer-plugins-base1.0-dev
+      - libgstreamer1.0-dev
+    - add patch gstreamer-1.0.diff
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 07 Jun 2014 21:18:08 +0200
 
diff --git a/debian/patches/gstreamer-1.0.diff b/debian/patches/gstreamer-1.0.diff
new file mode 100644
index 0000000..3ac2790
--- /dev/null
+++ b/debian/patches/gstreamer-1.0.diff
@@ -0,0 +1,78 @@
+--- 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 2692fd1..39af31a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ hurd.diff
 webkit_qt_hide_symbols.diff
 ignore-unused-local-typedefs_error.diff
 ignore-new_gcc_warnings.diff
+gstreamer-1.0.diff

-- 
QtWebKit packaging