From: "Dion Moult" <moult@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/phantomjs/, www-client/phantomjs/files/
Date: Sat, 26 Sep 2015 23:41:29 +0000 (UTC) [thread overview]
Message-ID: <1443310099.29576cc6a591b109f32119dd8e2240dd863b9d05.moult@gentoo> (raw)
commit: 29576cc6a591b109f32119dd8e2240dd863b9d05
Author: Dion Moult <moult <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 26 23:28:19 2015 +0000
Commit: Dion Moult <moult <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 23:28:19 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29576cc6
www-client/phantomjs: Add GCC compilation patch
Package-Manager: portage-2.2.15
.../phantomjs/files/phantomjs-gcc5-compile-fix.patch | 14 ++++++++++++++
www-client/phantomjs/phantomjs-2.0.0.ebuild | 1 +
2 files changed, 15 insertions(+)
diff --git a/www-client/phantomjs/files/phantomjs-gcc5-compile-fix.patch b/www-client/phantomjs/files/phantomjs-gcc5-compile-fix.patch
new file mode 100644
index 0000000..7191050
--- /dev/null
+++ b/www-client/phantomjs/files/phantomjs-gcc5-compile-fix.patch
@@ -0,0 +1,14 @@
+--- a/src/qt/qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp 2015-01-24 08:19:52.000000000 +0600
++++ b/src/qt/qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp 2015-09-24 18:18:45.598322592 +0600
+@@ -1909,6 +1909,11 @@
+ }
+ }
+
++// 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();
diff --git a/www-client/phantomjs/phantomjs-2.0.0.ebuild b/www-client/phantomjs/phantomjs-2.0.0.ebuild
index 6b6a81d..e52d78f 100644
--- a/www-client/phantomjs/phantomjs-2.0.0.ebuild
+++ b/www-client/phantomjs/phantomjs-2.0.0.ebuild
@@ -33,6 +33,7 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}/phantomjs-python3-udis86-itab.patch"
+ epatch "${FILESDIR}/phantomjs-gcc5-compile-fix.patch"
# Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
sed -i \
reply other threads:[~2015-09-26 23:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1443310099.29576cc6a591b109f32119dd8e2240dd863b9d05.moult@gentoo \
--to=moult@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox