1 |
commit: 29576cc6a591b109f32119dd8e2240dd863b9d05 |
2 |
Author: Dion Moult <moult <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 26 23:28:19 2015 +0000 |
4 |
Commit: Dion Moult <moult <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 26 23:28:19 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29576cc6 |
7 |
|
8 |
www-client/phantomjs: Add GCC compilation patch |
9 |
|
10 |
Package-Manager: portage-2.2.15 |
11 |
|
12 |
.../phantomjs/files/phantomjs-gcc5-compile-fix.patch | 14 ++++++++++++++ |
13 |
www-client/phantomjs/phantomjs-2.0.0.ebuild | 1 + |
14 |
2 files changed, 15 insertions(+) |
15 |
|
16 |
diff --git a/www-client/phantomjs/files/phantomjs-gcc5-compile-fix.patch b/www-client/phantomjs/files/phantomjs-gcc5-compile-fix.patch |
17 |
new file mode 100644 |
18 |
index 0000000..7191050 |
19 |
--- /dev/null |
20 |
+++ b/www-client/phantomjs/files/phantomjs-gcc5-compile-fix.patch |
21 |
@@ -0,0 +1,14 @@ |
22 |
+--- a/src/qt/qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp 2015-01-24 08:19:52.000000000 +0600 |
23 |
++++ b/src/qt/qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp 2015-09-24 18:18:45.598322592 +0600 |
24 |
+@@ -1909,6 +1909,11 @@ |
25 |
+ } |
26 |
+ } |
27 |
+ |
28 |
++// Used in JSArray.cpp so we must instantiate explicit |
29 |
++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value); |
30 |
++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value); |
31 |
++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value); |
32 |
++ |
33 |
+ void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage) |
34 |
+ { |
35 |
+ VM& vm = exec->vm(); |
36 |
|
37 |
diff --git a/www-client/phantomjs/phantomjs-2.0.0.ebuild b/www-client/phantomjs/phantomjs-2.0.0.ebuild |
38 |
index 6b6a81d..e52d78f 100644 |
39 |
--- a/www-client/phantomjs/phantomjs-2.0.0.ebuild |
40 |
+++ b/www-client/phantomjs/phantomjs-2.0.0.ebuild |
41 |
@@ -33,6 +33,7 @@ DEPEND="${RDEPEND} |
42 |
|
43 |
src_prepare() { |
44 |
epatch "${FILESDIR}/phantomjs-python3-udis86-itab.patch" |
45 |
+ epatch "${FILESDIR}/phantomjs-gcc5-compile-fix.patch" |
46 |
|
47 |
# Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache |
48 |
sed -i \ |