* [gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/gjs/
@ 2011-07-28 22:51 Alexandre Restovtsev
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-07-28 22:51 UTC (permalink / raw
To: gentoo-commits
commit: a4bd4ad4d1d28d287979b06610cb24bfd79efa51
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Thu Jul 28 22:48:38 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Jul 28 22:48:38 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a4bd4ad4
dev-libs/gjs: automagic spidermonkey patch now in upstream git
---
dev-libs/gjs/gjs-1.29.15.ebuild | 2 +-
dev-libs/gjs/gjs-9999.ebuild | 5 -----
2 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/dev-libs/gjs/gjs-1.29.15.ebuild b/dev-libs/gjs/gjs-1.29.15.ebuild
index 93f6ece..01b7230 100644
--- a/dev-libs/gjs/gjs-1.29.15.ebuild
+++ b/dev-libs/gjs/gjs-1.29.15.ebuild
@@ -61,7 +61,7 @@ pkg_setup() {
src_prepare() {
# Make spidermonkey detection non-automagic
# https://bugzilla.gnome.org/show_bug.cgi?id=655479
- epatch "${FILESDIR}/${PN}-1.29.15-automagic-spidermonkey.patch"
+ epatch "${FILESDIR}/${P}-automagic-spidermonkey.patch"
[[ ${PV} != 9999 ]] && eautoreconf
gnome2_src_prepare
diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-9999.ebuild
index 93f6ece..100223c 100644
--- a/dev-libs/gjs/gjs-9999.ebuild
+++ b/dev-libs/gjs/gjs-9999.ebuild
@@ -59,11 +59,6 @@ pkg_setup() {
}
src_prepare() {
- # Make spidermonkey detection non-automagic
- # https://bugzilla.gnome.org/show_bug.cgi?id=655479
- epatch "${FILESDIR}/${PN}-1.29.15-automagic-spidermonkey.patch"
- [[ ${PV} != 9999 ]] && eautoreconf
-
gnome2_src_prepare
python_convert_shebangs 2 "${S}"/scripts/make-tests
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/gjs/
@ 2011-07-29 17:58 Alexandre Restovtsev
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-07-29 17:58 UTC (permalink / raw
To: gentoo-commits
commit: 17991a6c48b8763ebec53b22447352cd84bc1835
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Fri Jul 29 17:55:45 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Jul 29 17:55:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=17991a6c
dev-libs/gjs: limit spidermonkey blocker to 1.8.2*
gjs can build with xulrunner (and run, and pass tests) on a system that
has spidermonkey-1.7.x installed since 1.7 installs libjs.so instead of
libmozjs.so. Thanks to _AxS_ for pointing this out in #gentoo-desktop.
---
dev-libs/gjs/gjs-1.29.15.ebuild | 9 +++++----
dev-libs/gjs/gjs-9999.ebuild | 9 +++++----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/dev-libs/gjs/gjs-1.29.15.ebuild b/dev-libs/gjs/gjs-1.29.15.ebuild
index 01b7230..65f2c9a 100644
--- a/dev-libs/gjs/gjs-1.29.15.ebuild
+++ b/dev-libs/gjs/gjs-1.29.15.ebuild
@@ -34,12 +34,13 @@ RDEPEND=">=dev-libs/glib-2.18:2
sys-libs/readline
x11-libs/cairo
spidermonkey? ( =dev-lang/spidermonkey-1.8.5* )
- !spidermonkey? ( >=net-libs/xulrunner-2.0:1.9 )"
+ !spidermonkey? (
+ >=net-libs/xulrunner-2.0:1.9
+ !=dev-lang/spidermonkey-1.8.2* )"
DEPEND="${RDEPEND}
sys-devel/gettext
- >=dev-util/pkgconfig-0.9
- !<dev-lang/spidermonkey-1.8.5"
-# HACK HACK: gjs-tests picks up /usr/lib/libmozjs.so with old spidermonkey installed
+ >=dev-util/pkgconfig-0.9"
+# HACK HACK: gjs-tests picks up /usr/lib/libmozjs.so with spidermonkey-1.8.2* installed
pkg_setup() {
# AUTHORS, ChangeLog are empty
diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-9999.ebuild
index 100223c..5484633 100644
--- a/dev-libs/gjs/gjs-9999.ebuild
+++ b/dev-libs/gjs/gjs-9999.ebuild
@@ -34,12 +34,13 @@ RDEPEND=">=dev-libs/glib-2.18:2
sys-libs/readline
x11-libs/cairo
spidermonkey? ( =dev-lang/spidermonkey-1.8.5* )
- !spidermonkey? ( >=net-libs/xulrunner-2.0:1.9 )"
+ !spidermonkey? (
+ >=net-libs/xulrunner-2.0:1.9
+ !=dev-lang/spidermonkey-1.8.2* )"
DEPEND="${RDEPEND}
sys-devel/gettext
- >=dev-util/pkgconfig-0.9
- !<dev-lang/spidermonkey-1.8.5"
-# HACK HACK: gjs-tests picks up /usr/lib/libmozjs.so with old spidermonkey installed
+ >=dev-util/pkgconfig-0.9"
+# HACK HACK: gjs-tests picks up /usr/lib/libmozjs.so with spidermonkey-1.8.2* installed
pkg_setup() {
# AUTHORS, ChangeLog are empty
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/gjs/
@ 2011-07-29 20:28 Alexandre Restovtsev
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-07-29 20:28 UTC (permalink / raw
To: gentoo-commits
commit: 357e6b8112a7eddca4bcca3412e995834dee4454
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Fri Jul 29 19:01:07 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Jul 29 19:01:07 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=357e6b81
dev-libs/gjs: switch from spidermonkey to xulrunner USE flag
Control the choice of javascript engine with the "xulrunner" USE flag
instead of "spidermonkey". First, xulrunner is already a global USE
flag; second, spidermonkey is preferred by upstream; third, apparently
xulrunner in gentoo will be going away at some point in the future.
Since spidermonkey-1.8.5 is currently masked (and breaks lots of stuff),
make the xulrunner flag default + for now. When this ebuild is moved to
gx86, the xulrunner flag should be forced on with package.use.force until
the new spidermonkey is unmasked.
---
dev-libs/gjs/gjs-1.29.15.ebuild | 14 +++++++-------
dev-libs/gjs/gjs-9999.ebuild | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dev-libs/gjs/gjs-1.29.15.ebuild b/dev-libs/gjs/gjs-1.29.15.ebuild
index 65f2c9a..9bd562c 100644
--- a/dev-libs/gjs/gjs-1.29.15.ebuild
+++ b/dev-libs/gjs/gjs-1.29.15.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://live.gnome.org/Gjs"
LICENSE="MIT MPL-1.1 LGPL-2 GPL-2"
SLOT="0"
-IUSE="examples spidermonkey test"
+IUSE="examples test +xulrunner"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -33,10 +33,10 @@ RDEPEND=">=dev-libs/glib-2.18:2
dev-libs/dbus-glib
sys-libs/readline
x11-libs/cairo
- spidermonkey? ( =dev-lang/spidermonkey-1.8.5* )
- !spidermonkey? (
+ xulrunner? (
>=net-libs/xulrunner-2.0:1.9
- !=dev-lang/spidermonkey-1.8.2* )"
+ !=dev-lang/spidermonkey-1.8.2* )
+ !xulrunner? ( =dev-lang/spidermonkey-1.8.5* )"
DEPEND="${RDEPEND}
sys-devel/gettext
>=dev-util/pkgconfig-0.9"
@@ -52,10 +52,10 @@ pkg_setup() {
--disable-systemtap
--disable-dtrace
--disable-coverage"
- if use spidermonkey; then
- G2CONF="${G2CONF} --with-js-package=mozjs185"
- else
+ if use xulrunner; then
G2CONF="${G2CONF} --with-js-package=mozilla-js"
+ else
+ G2CONF="${G2CONF} --with-js-package=mozjs185"
fi
}
diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-9999.ebuild
index 5484633..bdab10a 100644
--- a/dev-libs/gjs/gjs-9999.ebuild
+++ b/dev-libs/gjs/gjs-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://live.gnome.org/Gjs"
LICENSE="MIT MPL-1.1 LGPL-2 GPL-2"
SLOT="0"
-IUSE="examples spidermonkey test"
+IUSE="examples test xulrunner"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -33,10 +33,10 @@ RDEPEND=">=dev-libs/glib-2.18:2
dev-libs/dbus-glib
sys-libs/readline
x11-libs/cairo
- spidermonkey? ( =dev-lang/spidermonkey-1.8.5* )
- !spidermonkey? (
+ xulrunner? (
>=net-libs/xulrunner-2.0:1.9
- !=dev-lang/spidermonkey-1.8.2* )"
+ !=dev-lang/spidermonkey-1.8.2* )
+ !xulrunner? ( =dev-lang/spidermonkey-1.8.5* )"
DEPEND="${RDEPEND}
sys-devel/gettext
>=dev-util/pkgconfig-0.9"
@@ -52,10 +52,10 @@ pkg_setup() {
--disable-systemtap
--disable-dtrace
--disable-coverage"
- if use spidermonkey; then
- G2CONF="${G2CONF} --with-js-package=mozjs185"
- else
+ if use xulrunner; then
G2CONF="${G2CONF} --with-js-package=mozilla-js"
+ else
+ mG2CONF="${G2CONF} --with-js-package=mozjs185"
fi
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/gjs/
@ 2011-08-30 21:55 Alexandre Restovtsev
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-08-30 21:55 UTC (permalink / raw
To: gentoo-commits
commit: 4761b4a1de772a32211e549ba6e4c442d51337a3
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Aug 30 20:43:36 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Aug 30 20:43:36 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4761b4a1
dev-libs/gjs: 1.29.16 → 1.29.17
Version bump, a few changes and bugfixes.
---
.../gjs/{gjs-1.29.16.ebuild => gjs-1.29.17.ebuild} | 2 +-
dev-libs/gjs/gjs-9999.ebuild | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-libs/gjs/gjs-1.29.16.ebuild b/dev-libs/gjs/gjs-1.29.17.ebuild
similarity index 97%
rename from dev-libs/gjs/gjs-1.29.16.ebuild
rename to dev-libs/gjs/gjs-1.29.17.ebuild
index 224c103..1effcfa 100644
--- a/dev-libs/gjs/gjs-1.29.16.ebuild
+++ b/dev-libs/gjs/gjs-1.29.17.ebuild
@@ -28,7 +28,7 @@ fi
# Things are untested and broken with anything other than xulrunner-2.0
# or spidermonkey-1.8.5
RDEPEND=">=dev-libs/glib-2.18:2
- >=dev-libs/gobject-introspection-1.29.15
+ >=dev-libs/gobject-introspection-1.29.16
dev-libs/dbus-glib
sys-libs/readline
diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-9999.ebuild
index bdab10a..1effcfa 100644
--- a/dev-libs/gjs/gjs-9999.ebuild
+++ b/dev-libs/gjs/gjs-9999.ebuild
@@ -8,7 +8,7 @@ GNOME_TARBALL_SUFFIX="xz"
GNOME2_LA_PUNT="yes"
PYTHON_DEPEND="2"
-inherit autotools eutils gnome2 python virtualx
+inherit gnome2 python virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -18,7 +18,7 @@ HOMEPAGE="http://live.gnome.org/Gjs"
LICENSE="MIT MPL-1.1 LGPL-2 GPL-2"
SLOT="0"
-IUSE="examples test xulrunner"
+IUSE="examples test +xulrunner"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -28,7 +28,7 @@ fi
# Things are untested and broken with anything other than xulrunner-2.0
# or spidermonkey-1.8.5
RDEPEND=">=dev-libs/glib-2.18:2
- >=dev-libs/gobject-introspection-1.29.15
+ >=dev-libs/gobject-introspection-1.29.16
dev-libs/dbus-glib
sys-libs/readline
@@ -55,7 +55,7 @@ pkg_setup() {
if use xulrunner; then
G2CONF="${G2CONF} --with-js-package=mozilla-js"
else
- mG2CONF="${G2CONF} --with-js-package=mozjs185"
+ G2CONF="${G2CONF} --with-js-package=mozjs185"
fi
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/gjs/
@ 2011-09-26 2:51 Alexandre Restovtsev
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-09-26 2:51 UTC (permalink / raw
To: gentoo-commits
commit: 3d7359e768a9b9510504324e5dfa1b75ad4f33d1
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Sep 26 02:05:38 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Sep 26 02:05:38 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3d7359e7
dev-libs/gjs: 1.29.17 → 1.29.18
Version bump with garbage collection improvements.
---
.../gjs/{gjs-1.29.17.ebuild => gjs-1.29.18.ebuild} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/dev-libs/gjs/gjs-1.29.17.ebuild b/dev-libs/gjs/gjs-1.29.18.ebuild
similarity index 100%
rename from dev-libs/gjs/gjs-1.29.17.ebuild
rename to dev-libs/gjs/gjs-1.29.18.ebuild
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/gjs/
@ 2011-09-28 1:20 Alexandre Restovtsev
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-09-28 1:20 UTC (permalink / raw
To: gentoo-commits
commit: b13939539eb0284869c1826eea9c06d3e5d016f3
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Sep 28 01:18:14 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Sep 28 01:18:14 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b1393953
dev-libs/gjs: 1.29.18 → 1.30.0
---
.../gjs/{gjs-1.29.18.ebuild => gjs-1.30.0.ebuild} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/dev-libs/gjs/gjs-1.29.18.ebuild b/dev-libs/gjs/gjs-1.30.0.ebuild
similarity index 100%
rename from dev-libs/gjs/gjs-1.29.18.ebuild
rename to dev-libs/gjs/gjs-1.30.0.ebuild
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-09-28 1:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-28 1:20 [gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/gjs/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2011-09-26 2:51 Alexandre Restovtsev
2011-08-30 21:55 Alexandre Restovtsev
2011-07-29 20:28 Alexandre Restovtsev
2011-07-29 17:58 Alexandre Restovtsev
2011-07-28 22:51 Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox