[mingw-qt5-qtwebkit] Fix FTBFS against gcc 5 (QTBUG-44829)
Erik van Pienbroek
epienbro at fedoraproject.org
Mon Mar 23 20:33:32 UTC 2015
commit 91d7a8869c9a7727f900b37b84a3aa91b6016721
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Mon Mar 23 21:33:29 2015 +0100
Fix FTBFS against gcc 5 (QTBUG-44829)
0001-Fix-g-5.0-build.patch | 36 ++++++++++++++++++++++++++++++++++++
mingw-qt5-qtwebkit.spec | 7 +++++++
2 files changed, 43 insertions(+)
---
diff --git a/0001-Fix-g-5.0-build.patch b/0001-Fix-g-5.0-build.patch
new file mode 100644
index 0000000..5d68b67
--- /dev/null
+++ b/0001-Fix-g-5.0-build.patch
@@ -0,0 +1,36 @@
+From 650c6ee8e76bb574d3a1bea09e2494992d8f070e Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen at theqtcompany.com>
+Date: Fri, 6 Mar 2015 11:20:13 +0100
+Subject: [PATCH] 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.
+
+Task-number: QTBUG-44829
+Change-Id: Ib0adbd9273bd1cef01e5863bc8aaa9c373022792
+Reviewed-by: Andras Becsi <andras.becsi at theqtcompany.com>
+---
+ Source/JavaScriptCore/runtime/JSObject.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/Source/JavaScriptCore/runtime/JSObject.cpp b/Source/JavaScriptCore/runtime/JSObject.cpp
+index 5637e20..bd55919 100644
+--- a/Source/JavaScriptCore/runtime/JSObject.cpp
++++ b/Source/JavaScriptCore/runtime/JSObject.cpp
+@@ -1909,6 +1909,11 @@ void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, un
+ }
+ }
+
++// 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)
+ {
+ VM& vm = exec->vm();
+--
+2.3.3
+
diff --git a/mingw-qt5-qtwebkit.spec b/mingw-qt5-qtwebkit.spec
index ec66746..8d3f497 100644
--- a/mingw-qt5-qtwebkit.spec
+++ b/mingw-qt5-qtwebkit.spec
@@ -119,6 +119,11 @@ Patch5: revert-qt4-unicode-removal.patch
# in the Qt5WebKit.dll shared library)
Patch6: qt5-qtwebkit-workaround-build-breakage-after-svn-commit-136242.patch
+# Fix gcc 5 compatibility
+# https://codereview.qt-project.org/#/c/107921/
+# https://bugreports.qt.io/browse/QTBUG-44829
+Patch7: 0001-Fix-g-5.0-build.patch
+
# smaller debuginfo s/-g/-g1/ (debian uses -gstabs) to avoid 4gb size limit
Patch10: qtwebkit-opensource-src-5.0.1-debuginfo.patch
@@ -173,6 +178,7 @@ Fedora Windows cross-compiler.
%patch4 -p1 -b .no_icu
%patch5 -p1 -b .qt4_unicode -R
%patch6 -p0 -b .export
+%patch7 -p1 -b .gcc5
%patch10 -p1 -b .debuginfo
%patch11 -p1 -b .no_icu -R
%patch12 -p1 -b .angle_git
@@ -249,6 +255,7 @@ mv $RPM_BUILD_ROOT%{mingw64_datadir}/qt5/bin/QtWebProcess.exe $RPM_BUILD_ROOT%{m
* Sun Mar 22 2015 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.4.1-1
- Update to 5.4.1
- Fix URLs visited during private browsing showing up in WebpageIcons.db (RHBZ #1204798 #1204799)
+- Fix FTBFS against gcc 5 (QTBUG-44829)
* Mon Dec 29 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.4.0-1
- Update to 5.4.0
More information about the scm-commits
mailing list