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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 9196594ab0342a7f4f5768930af5f7705358663f
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Aug 3 21:28:49 2015 -0300

    Backport explicit_template_instantiation.patch
    
    Fixes build with GCC5.
---
 debian/changelog                                   |  4 ++++
 .../patches/explicit_template_instantiation.patch  | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1aa397d..154822c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtwebkit (2.3.4.dfsg-4) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Backport explicit_template_instantiation.patch to fix a build issue with
+    gcc5.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 02 Aug 2015 21:45:48 -0300
 
 qtwebkit (2.3.4.dfsg-3) unstable; urgency=medium
diff --git a/debian/patches/explicit_template_instantiation.patch b/debian/patches/explicit_template_instantiation.patch
new file mode 100644
index 0000000..21e01de
--- /dev/null
+++ b/debian/patches/explicit_template_instantiation.patch
@@ -0,0 +1,26 @@
+Description: Fix build with GCC5
+Author:     Allan Sandfeld Jensen <allan.jensen at theqtcompany.com>
+Description: Fix g++ 5.0 build
+ A non-inline template needs to be explicitly instantiated if used
+ outside the object where it is declared.
+ .
+ Patch suggested by Khem Raj and originally part of Qt5's Webkit module,
+ backported to this version of webkit.
+Task-number: QTBUG-44829
+Last-Update: 2015-08-02
+Forwarded: not-needed
+
+--- a/Source/JavaScriptCore/runtime/JSObject.cpp
++++ b/Source/JavaScriptCore/runtime/JSObject.cpp
+@@ -1922,6 +1922,11 @@ void JSObject::putByIndexBeyondVectorLen
+     }
+ }
+ 
++// Used in JSArray.cpp so we must instantiate explicit
++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
++
+ void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
+ {
+     JSGlobalData& globalData = exec->globalData();
diff --git a/debian/patches/series b/debian/patches/series
index 45b8f10..79f5097 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,4 @@ hide_wtf_symbols.diff
 hide_jsc_symbols.diff
 fix_nonlinux_glibc_linkage.diff
 reduce_memory_usage.patch
+explicit_template_instantiation.patch

-- 
QtWebKit packaging