[SCM] QtWebKit packaging branch, master, updated. debian/2.3.4.dfsg-1-4-g2ccc318

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 2ccc318fbe718e32d462c440de682ab00821bea6
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Oct 2 11:11:56 2014 -0300

    Replace the patch with one from upstream.
    
    Thanks Allan for the time to fix this bug!
---
 debian/changelog                                   |  4 +-
 ...forms_when_building_against_gstreamer_1.0.patch | 44 ++++++++++++++++++++++
 debian/patches/fix_non64linking_issue.patch        | 25 ------------
 debian/patches/series                              |  2 +-
 4 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bd55787..a0dc3a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 qtwebkit (2.3.4.dfsg-2) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
-  * Add fix_non64linking_issue.patch to workaround the linking issues in most
-    platforms (Closes: #763507).
+  * Add fix_linking_issue_[...]_gstreamer_1.0.patch to workaround the linking
+    issues in most platforms (Closes: #763507).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 01 Oct 2014 14:18:25 -0300
 
diff --git a/debian/patches/fix_linking_issue_on_some_platforms_when_building_against_gstreamer_1.0.patch b/debian/patches/fix_linking_issue_on_some_platforms_when_building_against_gstreamer_1.0.patch
new file mode 100644
index 0000000..e8c0c64
--- /dev/null
+++ b/debian/patches/fix_linking_issue_on_some_platforms_when_building_against_gstreamer_1.0.patch
@@ -0,0 +1,44 @@
+commit 69e71ace804a4055eff64b581e6b7bb465abf1a8
+Author: Allan Sandfeld Jensen <allan.jensen at digia.com>
+Date:   Thu Oct 2 15:53:24 2014 +0200
+
+    Fix linking issue on some platforms when building against gstreamer 1.0
+    
+    We need ifdefs if PlatformVideoWindowPrivate.h so that moc does not
+    generate
+    code references methods not build because they are ifdef'ed out in
+    PlatformVideoWindowQt.cpp.
+
+diff --git a/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowPrivate.h b/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowPrivate.h
+index 8e28feb..e243771 100644
+--- a/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowPrivate.h
++++ b/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowPrivate.h
+@@ -19,6 +19,8 @@
+ 
+ #ifndef PlatformVideoWindowPrivate_h
+ #define PlatformVideoWindowPrivate_h
++// We do not use ENABLE or USE because moc does not expand these macros.
++#if defined(WTF_USE_GSTREAMER) && WTF_USE_GSTREAMER && !defined(GST_API_VERSION_1)
+ 
+ #include <QEvent>
+ #include <QTimer>
+@@ -65,5 +67,6 @@ private:
+ 
+ } // namespace WebCore
+ 
++#endif // USE(GSTREAMER) && !defined(GST_API_VERSION_1)
+ 
+ #endif // PlatformVideoWindowPrivate_h
+diff --git a/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp b/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp
+index 3b244c6..c488e02 100644
+--- a/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp
++++ b/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp
+@@ -30,7 +30,7 @@
+ #include "HTMLVideoElement.h"
+ #include "Node.h"
+ 
+-#if USE(GSTREAMER)
++#if USE(GSTREAMER) && !defined(GST_API_VERSION_1)
+ #include "GStreamerGWorld.h"
+ #include "PlatformVideoWindowPrivate.h"
+ #endif
diff --git a/debian/patches/fix_non64linking_issue.patch b/debian/patches/fix_non64linking_issue.patch
deleted file mode 100644
index 9129355..0000000
--- a/debian/patches/fix_non64linking_issue.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: work around FTBFS on non 64 bits platforms.
-Author: Erwin Rol <info at erwinrol.com>
-
----
- Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowPrivate.h |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowPrivate.h
-+++ b/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowPrivate.h
-@@ -29,6 +29,8 @@
- #include <QWidget>
- #endif
- 
-+#if ENABLE(VIDEO) && USE(GSTREAMER) && !defined(GST_API_VERSION_1)
-+
- namespace WebCore {
- 
- class HTMLVideoElement;
-@@ -65,5 +67,6 @@ private:
- 
- } // 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 8052c05..3889e65 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 # upstream patches
 jsobject_ensure_indexingtype_should_handle_InterceptsGetOwn.patch
+fix_linking_issue_on_some_platforms_when_building_against_gstreamer_1.0.patch
 
 # debian patches
 02_add_nostrip_for_debug_packages.diff
@@ -17,4 +18,3 @@ hide_wtf_symbols.diff
 hide_jsc_symbols.diff
 fix_nonlinux_glibc_linkage.diff
 reduce_memory_usage.patch
-fix_non64linking_issue.patch

-- 
QtWebKit packaging