summarylogtreecommitdiffstats
path: root/0001-Fix-g-5-build-see-qtwebkit-Source-JavaScriptCore-run.patch
diff options
context:
space:
mode:
authoraur2016-03-22 11:49:39 +0100
committeraur2016-03-22 11:49:39 +0100
commitf418d50022d84e33d386fe2bcaab667c319eceda (patch)
tree27e63837d43ea37feda2d82dab3175c600da0784 /0001-Fix-g-5-build-see-qtwebkit-Source-JavaScriptCore-run.patch
parentb6f4064f95efba89cb564fb56d697944b014a5a5 (diff)
downloadaur-f418d50022d84e33d386fe2bcaab667c319eceda.tar.gz
[5.1.1-3] disable ssl, patch qtwebkit
Diffstat (limited to '0001-Fix-g-5-build-see-qtwebkit-Source-JavaScriptCore-run.patch')
-rw-r--r--0001-Fix-g-5-build-see-qtwebkit-Source-JavaScriptCore-run.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/0001-Fix-g-5-build-see-qtwebkit-Source-JavaScriptCore-run.patch b/0001-Fix-g-5-build-see-qtwebkit-Source-JavaScriptCore-run.patch
new file mode 100644
index 000000000000..4d004677c7fe
--- /dev/null
+++ b/0001-Fix-g-5-build-see-qtwebkit-Source-JavaScriptCore-run.patch
@@ -0,0 +1,28 @@
+From 548715948276124472a63343515ff9eb3f01ec28 Mon Sep 17 00:00:00 2001
+From: aur <aur>
+Date: Tue, 10 Nov 2015 17:59:28 +0100
+Subject: [PATCH] Fix g++ >= 5 build, see
+ qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp
+
+---
+ qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp b/qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp
+index e6f95bd..61baed8 100644
+--- a/qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp
++++ b/qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp
+@@ -1922,6 +1922,10 @@ void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, un
+ }
+ }
+
++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();
+--
+2.6.2
+