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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 3413182bf7b4b005ab82cb35fab0acdf7afd72c7
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Oct 1 14:20:23 2014 -0300

    Workaround for the linking issues on most platforms.
---
 debian/changelog                            |  4 ++++
 debian/patches/fix_non64linking_issue.patch | 25 +++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e5f798a..f5ce6d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 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.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 01 Oct 2014 14:18:25 -0300
 
 qtwebkit (2.3.4.dfsg-1) unstable; urgency=medium
diff --git a/debian/patches/fix_non64linking_issue.patch b/debian/patches/fix_non64linking_issue.patch
new file mode 100644
index 0000000..9129355
--- /dev/null
+++ b/debian/patches/fix_non64linking_issue.patch
@@ -0,0 +1,25 @@
+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 04652c9..8052c05 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@ hide_wtf_symbols.diff
 hide_jsc_symbols.diff
 fix_nonlinux_glibc_linkage.diff
 reduce_memory_usage.patch
+fix_non64linking_issue.patch

-- 
QtWebKit packaging