summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2015-07-16 14:57:19 +0000
committerIan Stakenvicius <axs@gentoo.org>2015-07-16 14:57:19 +0000
commitbbc79a4430d0e9a46698659f5fec59be872912cb (patch)
tree7a7e18eb8d480de4938249dcaf0241c0e28c5bd1 /dev-lang/spidermonkey
parentStable on alpha, bug 551972 (diff)
downloadgentoo-2-bbc79a4430d0e9a46698659f5fec59be872912cb.tar.gz
gentoo-2-bbc79a4430d0e9a46698659f5fec59be872912cb.tar.bz2
gentoo-2-bbc79a4430d0e9a46698659f5fec59be872912cb.zip
patched to fix bug 552786 , revbumped direct to stable so that anyone with perl-5.22 gets a rebuild
(Portage version: 2.2.18/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 009C547C2B6559ED!)
Diffstat (limited to 'dev-lang/spidermonkey')
-rw-r--r--dev-lang/spidermonkey/ChangeLog13
-rw-r--r--dev-lang/spidermonkey/files/spidermonkey-perl-defined-array-check.patch11
-rw-r--r--dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild4
-rw-r--r--dev-lang/spidermonkey/spidermonkey-1.8.7-r3.ebuild5
-rw-r--r--dev-lang/spidermonkey/spidermonkey-17.0.0-r4.ebuild (renamed from dev-lang/spidermonkey/spidermonkey-17.0.0-r3.ebuild)5
-rw-r--r--dev-lang/spidermonkey/spidermonkey-24.2.0-r3.ebuild (renamed from dev-lang/spidermonkey/spidermonkey-24.2.0-r2.ebuild)4
6 files changed, 36 insertions, 6 deletions
diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog
index e1448e98eb3e..05d36c15b652 100644
--- a/dev-lang/spidermonkey/ChangeLog
+++ b/dev-lang/spidermonkey/ChangeLog
@@ -1,6 +1,17 @@
# ChangeLog for dev-lang/spidermonkey
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.163 2015/04/08 08:22:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.164 2015/07/16 14:57:19 axs Exp $
+
+*spidermonkey-24.2.0-r3 (16 Jul 2015)
+*spidermonkey-17.0.0-r4 (16 Jul 2015)
+
+ 16 Jul 2015; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+ +files/spidermonkey-perl-defined-array-check.patch,
+ +spidermonkey-17.0.0-r4.ebuild, +spidermonkey-24.2.0-r3.ebuild,
+ -spidermonkey-17.0.0-r3.ebuild, -spidermonkey-24.2.0-r2.ebuild,
+ spidermonkey-1.8.5-r4.ebuild, spidermonkey-1.8.7-r3.ebuild:
+ patched to fix bug 552786 , revbumped direct to stable so that anyone with
+ perl-5.22 gets a rebuild
08 Apr 2015; Michał Górny <mgorny@gentoo.org> spidermonkey-1.8.2.15-r2.ebuild,
spidermonkey-1.8.5-r4.ebuild, spidermonkey-1.8.7-r3.ebuild,
diff --git a/dev-lang/spidermonkey/files/spidermonkey-perl-defined-array-check.patch b/dev-lang/spidermonkey/files/spidermonkey-perl-defined-array-check.patch
new file mode 100644
index 000000000000..c3996ae82bb3
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-perl-defined-array-check.patch
@@ -0,0 +1,11 @@
+--- a/js/src/config/milestone.pl 2013-02-11 17:33:22.000000000 -0500
++++ b/js/src/config/milestone.pl 2015-07-15 10:44:31.676153600 -0400
+@@ -55,7 +55,7 @@
+ #
+ my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE);
+
+-if (defined(@TEMPLATE_FILE)) {
++if (@TEMPLATE_FILE) {
+ my $TFILE;
+
+ foreach $TFILE (@TEMPLATE_FILE) {
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
index ebcc28a5b77f..b3e33a28da12 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild,v 1.22 2015/04/08 08:22:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild,v 1.23 2015/07/16 14:57:19 axs Exp $
EAPI="5"
WANT_AUTOCONF="2.1"
@@ -56,6 +56,8 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-1.8.5-ia64-static-strings.patch
# https://bugs.gentoo.org/show_bug.cgi?id=431560
epatch "${FILESDIR}"/${PN}-1.8.5-isfinite.patch
+ # https://bugs.gentoo.org/show_bug.cgi?id=552786
+ epatch "${FILESDIR}"/${PN}-perl-defined-array-check.patch
epatch_user
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.7-r3.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.7-r3.ebuild
index ed540fe5212e..b565f9377056 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.7-r3.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.7-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.7-r3.ebuild,v 1.8 2015/04/08 08:22:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.7-r3.ebuild,v 1.9 2015/07/16 14:57:19 axs Exp $
EAPI="5"
WANT_AUTOCONF="2.1"
@@ -51,7 +51,8 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-1.8.7-x32.patch
# https://bugs.gentoo.org/show_bug.cgi?id=439260
epatch "${FILESDIR}"/${P}-symbol-versions.patch
-
+ # https://bugs.gentoo.org/show_bug.cgi?id=552786
+ epatch "${FILESDIR}"/${PN}-perl-defined-array-check.patch
epatch_user
cd "${BUILDDIR}" || die
diff --git a/dev-lang/spidermonkey/spidermonkey-17.0.0-r3.ebuild b/dev-lang/spidermonkey/spidermonkey-17.0.0-r4.ebuild
index 4659448935a8..7e26a76ad77d 100644
--- a/dev-lang/spidermonkey/spidermonkey-17.0.0-r3.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-17.0.0-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-17.0.0-r3.ebuild,v 1.8 2015/04/08 08:22:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-17.0.0-r4.ebuild,v 1.1 2015/07/16 14:57:19 axs Exp $
EAPI="5"
WANT_AUTOCONF="2.1"
@@ -45,6 +45,9 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-${SLOT}-js-config-shebang.patch
epatch "${FILESDIR}"/${PN}-${SLOT}-ia64-mmap.patch
epatch "${FILESDIR}"/${PN}-17.0.0-fix-file-permissions.patch
+ # https://bugs.gentoo.org/show_bug.cgi?id=552786
+ epatch "${FILESDIR}"/${PN}-perl-defined-array-check.patch
+
# Remove obsolete jsuword bug #506160
sed -i -e '/jsuword/d' "${BUILDDIR}"/jsval.h ||die "sed failed"
epatch_user
diff --git a/dev-lang/spidermonkey/spidermonkey-24.2.0-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-24.2.0-r3.ebuild
index 45efd3f67f6a..8e6bb84cc76b 100644
--- a/dev-lang/spidermonkey/spidermonkey-24.2.0-r2.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-24.2.0-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-24.2.0-r2.ebuild,v 1.13 2015/04/08 08:22:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-24.2.0-r3.ebuild,v 1.1 2015/07/16 14:57:19 axs Exp $
EAPI="5"
WANT_AUTOCONF="2.1"
@@ -44,6 +44,8 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-${SLOT}-system-icu.patch
epatch "${FILESDIR}"/${PN}-24.2.0-fix-file-permissions.patch
epatch "${FILESDIR}"/${PN}-${SLOT}-upward-growing-stack.patch
+ # https://bugs.gentoo.org/show_bug.cgi?id=552786
+ epatch "${FILESDIR}"/${PN}-perl-defined-array-check.patch
epatch_user
if [[ ${CHOST} == *-freebsd* ]]; then