aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2015-06-02 12:27:26 +0200
committerFlorian Bruhin <git@the-compiler.org>2015-06-02 12:27:26 +0200
commitdc02017c213e04e5dad7774200f4a31501e045e4 (patch)
tree71405b9fb5d887600f6008acffa83cbbabcc1a7c
parent0086b610d90bf0b8814e44ab136796a4f50c9ff1 (diff)
downloadqt-debug-pkgbuild-dc02017c213e04e5dad7774200f4a31501e045e4.tar.gz
qt-debug-pkgbuild-dc02017c213e04e5dad7774200f4a31501e045e4.zip
Add (non-Arch) patch to build with GCC 5
-rw-r--r--qt5/PKGBUILD8
-rw-r--r--qt5/inline.patch36
2 files changed, 42 insertions, 2 deletions
diff --git a/qt5/PKGBUILD b/qt5/PKGBUILD
index dfc11fb..e68c3d5 100644
--- a/qt5/PKGBUILD
+++ b/qt5/PKGBUILD
@@ -48,7 +48,8 @@ source=("http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgv
'0001-Try-to-ensure-that-fPIC-is-used-in-CMake-builds.patch'
'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop' 'glib-2.43.patch'
'qlockfile-deadlock.patch' 'qnam-corruption.patch' 'keypad-shortcuts.patch'
- 'CVE-2015-0295.patch' 'CVE-2015-1858_1859.patch' 'CVE-2015-1860.patch')
+ 'CVE-2015-0295.patch' 'CVE-2015-1858_1859.patch' 'CVE-2015-1860.patch'
+ 'inline.patch')
md5sums=('7afb5f9235d8d42b5b6e832442a32a5d'
'fb1459f325a15b15b18afeac51173a1d'
'ac8fa252868161c676d876b614e24436'
@@ -64,7 +65,8 @@ md5sums=('7afb5f9235d8d42b5b6e832442a32a5d'
'665439088fc7de52a97455c5eaf87889'
'871ab111d03a640b4d0250388a4307cc'
'b799130014294cb3c73fc46e7e8889db'
- '64bc4f7d5097438eb6c6f8042378b3a3')
+ '64bc4f7d5097438eb6c6f8042378b3a3'
+ '06dd155143866c827f90747ec52a5dd4')
prepare() {
cd ${_pkgfqn}
@@ -95,6 +97,8 @@ prepare() {
# http://lists.qt-project.org/pipermail/announce/2015-April/000067.html
(cd qtbase; patch -p1 -i "$srcdir/CVE-2015-1858_1859.patch"; patch -p1 -i "$srcdir/CVE-2015-1860.patch")
+ (cd qtwebkit; patch -p1 -i "$srcdir/inline.patch")
+
# Build qmake using Arch {C,LD}FLAGS
# This also sets default {C,CXX,LD}FLAGS for projects built using qmake
sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \
diff --git a/qt5/inline.patch b/qt5/inline.patch
new file mode 100644
index 0000000..81295d1
--- /dev/null
+++ b/qt5/inline.patch
@@ -0,0 +1,36 @@
+From 650c6ee8e76bb574d3a1bea09e2494992d8f070e Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
+Date: Fri, 6 Mar 2015 11:20:13 +0100
+Subject: 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@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();
+--
+cgit v0.11.0
+