* [gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/gjs/, dev-libs/gjs/files/
@ 2011-07-28 9:05 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-07-28 9:05 UTC (permalink / raw
To: gentoo-commits
commit: 554bfda7290919564752566ac567df952c8c2a6a
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Thu Jul 28 08:11:32 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Jul 28 08:11:32 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=554bfda7
dev-libs/gjs: add 1.29.15 with optional spidermonkey support
Add new gnome-3.1.x version, now with optional support for building
against spidermonkey-1.8.5 instead of xulrunner. Requires a patch to
make the choice of javascript engine non-automagic (see
https://bugzilla.gnome.org/show_bug.cgi?id=655479).
gjs-1.29.15 passes tests with either choice of javascript engine.
Note: --enable-systemtap installs things in ${D}/${D}, leading to QA
failures. Need to figure out what's going on there.
---
.../files/gjs-1.29.15-automagic-spidermonkey.patch | 126 ++++++++++++++++++++
.../gjs/{gjs-9999.ebuild => gjs-1.29.15.ebuild} | 31 ++++--
dev-libs/gjs/gjs-9999.ebuild | 31 ++++--
3 files changed, 170 insertions(+), 18 deletions(-)
diff --git a/dev-libs/gjs/files/gjs-1.29.15-automagic-spidermonkey.patch b/dev-libs/gjs/files/gjs-1.29.15-automagic-spidermonkey.patch
new file mode 100644
index 0000000..5dd4321
--- /dev/null
+++ b/dev-libs/gjs/files/gjs-1.29.15-automagic-spidermonkey.patch
@@ -0,0 +1,126 @@
+From 57e3cd2303f8d36ae232ec3df986d986f1457361 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Thu, 28 Jul 2011 03:40:49 -0400
+Subject: [PATCH] Make choice of javascript package non-automagic
+
+Add a --with-js-package configure flag to allow selecting which
+javascript package to build against, e.g. to force building against
+xulrunner on a system that happens to have spidermonkey installed.
+
+By default, the behavior is the same as before (first check for
+mozjs185, then for mozilla-js).
+
+Addresses bug
+---
+ configure.ac | 84 +++++++++++++++++++++++++++++++++------------------------
+ 1 files changed, 49 insertions(+), 35 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3b74bc6..38213e3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -91,52 +91,66 @@ m4_define(gobject_required_version, 2.18.0)
+ AC_CHECK_HEADERS([malloc.h])
+ AC_CHECK_FUNCS(mallinfo)
+
+-# First, try separate mozjs185 release
+-AC_MSG_CHECKING([for standalone mozjs185])
+-PKG_CHECK_EXISTS([mozjs185], JS_PACKAGE=mozjs185,)
+-if test x$JS_PACKAGE != x; then
+- FIREFOX_JS_LIBDIR=
+- MOZJS_IS_STANDALONE=yes
+- AC_MSG_RESULT([yes])
+- PKG_CHECK_MODULES(JS, $JS_PACKAGE)
+-else
+- AC_MSG_RESULT([no])
+-fi
++AC_ARG_WITH([js-package],
++ AS_HELP_STRING([--with-js-package[=@<:@auto/mozjs185/mozilla-js@:>@]],
++ [Choose JavaScript package: 'mozjs185' (i.e. spidermonkey), 'mozilla-js' (i.e. xulrunner or firefox), or 'auto' (detect automatically)]),
++ [with_js_package=$withval],
++ [with_js_package="auto"])
+
+-# If we didn't find mozjs185 (the standalone spidermonkey), look for mozilla-js
+-if test x$JS_PACKAGE = x; then
+- AC_MSG_CHECKING([for mozilla-js 1.9.2])
+- PKG_CHECK_EXISTS([mozilla-js >= 1.9.2], JS_PACKAGE=mozilla-js,)
++# First, try separate mozjs185 release
++if test $with_js_package = mozjs185 -o $with_js_package = auto; then
++ AC_MSG_CHECKING([for standalone mozjs185])
++ PKG_CHECK_EXISTS([mozjs185], JS_PACKAGE=mozjs185,)
+ if test x$JS_PACKAGE != x; then
++ FIREFOX_JS_LIBDIR=
++ MOZJS_IS_STANDALONE=yes
+ AC_MSG_RESULT([yes])
++ PKG_CHECK_MODULES(JS, $JS_PACKAGE)
+ else
+- AC_MSG_ERROR([Could not find mozilla-js 1.9.2])
++ AC_MSG_RESULT([no])
+ fi
++fi
+
+- PKG_CHECK_MODULES(JS, $JS_PACKAGE)
+-
+- ## some flavors of Firefox .pc only set sdkdir, not libdir
+- FIREFOX_JS_SDKDIR=`$PKG_CONFIG --variable=sdkdir $JS_PACKAGE`
+- FIREFOX_JS_LIBDIR=`$PKG_CONFIG --variable=libdir $JS_PACKAGE`
+-
+- ## Ubuntu does not set libdir in mozilla-js.pc
+- if test x"$FIREFOX_JS_LIBDIR" = x; then
+- ## Ubuntu returns xulrunner-devel as the sdkdir, but for the
+- ## libdir we want the runtime location on the target system,
+- ## so can't use -devel.
+- ## The library is in the non-devel directory also.
+- ## Don't ask me why it's in two places.
+- FIREFOX_JS_LIBDIR=`echo "$FIREFOX_JS_SDKDIR" | sed -e 's/-devel//g'`
+- if ! test -d "$FIREFOX_JS_LIBDIR"; then
+- FIREFOX_JS_LIBDIR=
++if test $with_js_package = mozilla-js -o $with_js_package = auto; then
++ # If we didn't find mozjs185 (the standalone spidermonkey), look for mozilla-js
++ if test x$JS_PACKAGE = x; then
++ AC_MSG_CHECKING([for mozilla-js 1.9.2])
++ PKG_CHECK_EXISTS([mozilla-js >= 1.9.2], JS_PACKAGE=mozilla-js,)
++ if test x$JS_PACKAGE != x; then
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_ERROR([Could not find mozilla-js 1.9.2])
++ fi
++
++ PKG_CHECK_MODULES(JS, $JS_PACKAGE)
++
++ ## some flavors of Firefox .pc only set sdkdir, not libdir
++ FIREFOX_JS_SDKDIR=`$PKG_CONFIG --variable=sdkdir $JS_PACKAGE`
++ FIREFOX_JS_LIBDIR=`$PKG_CONFIG --variable=libdir $JS_PACKAGE`
++
++ ## Ubuntu does not set libdir in mozilla-js.pc
++ if test x"$FIREFOX_JS_LIBDIR" = x; then
++ ## Ubuntu returns xulrunner-devel as the sdkdir, but for the
++ ## libdir we want the runtime location on the target system,
++ ## so can't use -devel.
++ ## The library is in the non-devel directory also.
++ ## Don't ask me why it's in two places.
++ FIREFOX_JS_LIBDIR=`echo "$FIREFOX_JS_SDKDIR" | sed -e 's/-devel//g'`
++ if ! test -d "$FIREFOX_JS_LIBDIR"; then
++ FIREFOX_JS_LIBDIR=
++ fi
+ fi
+- fi
+
+- if test x"$FIREFOX_JS_LIBDIR" = x; then
+- AC_MSG_ERROR([Could not figure out where the Firefox JavaScript library lives])
++ if test x"$FIREFOX_JS_LIBDIR" = x; then
++ AC_MSG_ERROR([Could not figure out where the Firefox JavaScript library lives])
++ fi
+ fi
+ fi
+
++if test x$JS_PACKAGE = x; then
++ AC_MSG_ERROR([No appropriate JavaScript package found])
++fi
++
+ echo "Using JS_PACKAGE: $JS_PACKAGE"
+ echo "Using JS_CFLAGS: $JS_CFLAGS"
+ echo "Using JS_LIBS: $JS_LIBS"
+--
+1.7.6
+
diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-1.29.15.ebuild
similarity index 60%
copy from dev-libs/gjs/gjs-9999.ebuild
copy to dev-libs/gjs/gjs-1.29.15.ebuild
index 184e21c..93f6ece 100644
--- a/dev-libs/gjs/gjs-9999.ebuild
+++ b/dev-libs/gjs/gjs-1.29.15.ebuild
@@ -1,9 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.29.0.ebuild,v 1.1 2011/06/14 13:19:59 nirbheek Exp $
EAPI="3"
GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="xz"
GNOME2_LA_PUNT="yes"
PYTHON_DEPEND="2"
@@ -17,38 +18,50 @@ HOMEPAGE="http://live.gnome.org/Gjs"
LICENSE="MIT MPL-1.1 LGPL-2 GPL-2"
SLOT="0"
-IUSE="examples test"
-
-if [[ ${PV} == 9999 ]]; then
+IUSE="examples spidermonkey test"
+if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~x86"
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-0.10.1
+ >=dev-libs/gobject-introspection-1.29.15
dev-libs/dbus-glib
sys-libs/readline
x11-libs/cairo
- >=net-libs/xulrunner-2.0:1.9"
+ spidermonkey? ( =dev-lang/spidermonkey-1.8.5* )
+ !spidermonkey? ( >=net-libs/xulrunner-2.0:1.9 )"
DEPEND="${RDEPEND}
sys-devel/gettext
>=dev-util/pkgconfig-0.9
- !dev-lang/spidermonkey"
-# HACK HACK: gjs-tests picks up /usr/lib/libmozjs.so with spidermonkey installed
+ !<dev-lang/spidermonkey-1.8.5"
+# HACK HACK: gjs-tests picks up /usr/lib/libmozjs.so with old spidermonkey installed
-src_prepare() {
+pkg_setup() {
# AUTHORS, ChangeLog are empty
DOCS="NEWS README"
# FIXME: add systemtap/dtrace support, like in glib:2
+ # FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
# XXX: Do NOT enable coverage, completely useless for portage installs
G2CONF="${G2CONF}
--disable-systemtap
--disable-dtrace
--disable-coverage"
+ if use spidermonkey; then
+ G2CONF="${G2CONF} --with-js-package=mozjs185"
+ else
+ G2CONF="${G2CONF} --with-js-package=mozilla-js"
+ fi
+}
+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
diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-9999.ebuild
index 184e21c..93f6ece 100644
--- a/dev-libs/gjs/gjs-9999.ebuild
+++ b/dev-libs/gjs/gjs-9999.ebuild
@@ -1,9 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.29.0.ebuild,v 1.1 2011/06/14 13:19:59 nirbheek Exp $
EAPI="3"
GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="xz"
GNOME2_LA_PUNT="yes"
PYTHON_DEPEND="2"
@@ -17,38 +18,50 @@ HOMEPAGE="http://live.gnome.org/Gjs"
LICENSE="MIT MPL-1.1 LGPL-2 GPL-2"
SLOT="0"
-IUSE="examples test"
-
-if [[ ${PV} == 9999 ]]; then
+IUSE="examples spidermonkey test"
+if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~x86"
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-0.10.1
+ >=dev-libs/gobject-introspection-1.29.15
dev-libs/dbus-glib
sys-libs/readline
x11-libs/cairo
- >=net-libs/xulrunner-2.0:1.9"
+ spidermonkey? ( =dev-lang/spidermonkey-1.8.5* )
+ !spidermonkey? ( >=net-libs/xulrunner-2.0:1.9 )"
DEPEND="${RDEPEND}
sys-devel/gettext
>=dev-util/pkgconfig-0.9
- !dev-lang/spidermonkey"
-# HACK HACK: gjs-tests picks up /usr/lib/libmozjs.so with spidermonkey installed
+ !<dev-lang/spidermonkey-1.8.5"
+# HACK HACK: gjs-tests picks up /usr/lib/libmozjs.so with old spidermonkey installed
-src_prepare() {
+pkg_setup() {
# AUTHORS, ChangeLog are empty
DOCS="NEWS README"
# FIXME: add systemtap/dtrace support, like in glib:2
+ # FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
# XXX: Do NOT enable coverage, completely useless for portage installs
G2CONF="${G2CONF}
--disable-systemtap
--disable-dtrace
--disable-coverage"
+ if use spidermonkey; then
+ G2CONF="${G2CONF} --with-js-package=mozjs185"
+ else
+ G2CONF="${G2CONF} --with-js-package=mozilla-js"
+ fi
+}
+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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/gjs/, dev-libs/gjs/files/
@ 2011-07-30 17:47 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-07-30 17:47 UTC (permalink / raw
To: gentoo-commits
commit: 64b69bd9afeaa5f6a3d9237657dff143fe8f5953
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sat Jul 30 17:22:35 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Jul 30 17:46:57 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=64b69bd9
dev-libs/gjs: 1.29.15 → 1.29.15-r1, install gi headers again
Add a patch from upstream git to install gi/ headers again, making it
theoretically possible to build libpeas with gjs support (however,
libpeas-1.1.1 will still need some configure and makefile patching
before its gjs support can be re-enabled).
---
| 60 ++++++++++++++++++++
.../{gjs-1.29.15.ebuild => gjs-1.29.15-r1.ebuild} | 4 +
2 files changed, 64 insertions(+), 0 deletions(-)
--git a/dev-libs/gjs/files/gjs-1.29.15-install-gi-headers.patch b/dev-libs/gjs/files/gjs-1.29.15-install-gi-headers.patch
new file mode 100644
index 0000000..6536122
--- /dev/null
+++ b/dev-libs/gjs/files/gjs-1.29.15-install-gi-headers.patch
@@ -0,0 +1,60 @@
+From 4217cb5e07519ea41fdff9b906b93ce6946c109e Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Sat, 30 Jul 2011 15:40:25 +0000
+Subject: Install gi/ headers again
+
+libpeas currently requires these; we were installing them before, and
+since we export almost all of our internals in for gjs-module.pc, might
+as well keep doing these for now.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=655482
+---
+diff --git a/Makefile.am b/Makefile.am
+index edf0c25..b088289 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -36,7 +36,20 @@ nobase_gjs_module_include_HEADERS = \
+ gjs/importer.h \
+ gjs/jsapi-util.h \
+ gjs/mem.h \
+- gjs/native.h
++ gjs/native.h \
++ gi/ns.h \
++ gi/object.h \
++ gi/foreign.h \
++ gi/param.h \
++ gi/repo.h \
++ gi/union.h \
++ gi/value.h \
++ gi/arg.h \
++ gi/boxed.h \
++ gi/closure.h \
++ gi/enumeration.h \
++ gi/function.h \
++ gi/keep-alive.h
+
+ noinst_HEADERS += \
+ gjs/jsapi-private.h \
+@@ -108,20 +121,7 @@ libgjs_la_SOURCES = \
+
+ # For historical reasons, some files live in gi/
+ libgjs_la_SOURCES += \
+- gi/arg.h \
+- gi/boxed.h \
+- gi/closure.h \
+- gi/enumeration.h \
+- gi/function.h \
+- gi/keep-alive.h \
+ gi/gjs_gi_trace.h \
+- gi/ns.h \
+- gi/object.h \
+- gi/foreign.h \
+- gi/param.h \
+- gi/repo.h \
+- gi/union.h \
+- gi/value.h \
+ gi/arg.c \
+ gi/boxed.c \
+ gi/closure.c \
+--
+cgit v0.9
diff --git a/dev-libs/gjs/gjs-1.29.15.ebuild b/dev-libs/gjs/gjs-1.29.15-r1.ebuild
similarity index 94%
rename from dev-libs/gjs/gjs-1.29.15.ebuild
rename to dev-libs/gjs/gjs-1.29.15-r1.ebuild
index 9bd562c..1a2fc2d 100644
--- a/dev-libs/gjs/gjs-1.29.15.ebuild
+++ b/dev-libs/gjs/gjs-1.29.15-r1.ebuild
@@ -63,6 +63,10 @@ src_prepare() {
# Make spidermonkey detection non-automagic
# https://bugzilla.gnome.org/show_bug.cgi?id=655479
epatch "${FILESDIR}/${P}-automagic-spidermonkey.patch"
+
+ # Install gi/ headers again, help unbreak libpeas; will be in next release
+ epatch "${FILESDIR}/${P}-install-gi-headers.patch"
+
[[ ${PV} != 9999 ]] && eautoreconf
gnome2_src_prepare
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/gjs/, dev-libs/gjs/files/
@ 2011-07-30 19:01 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-07-30 19:01 UTC (permalink / raw
To: gentoo-commits
commit: a16cbdc803bc9f5f8347d501a18d03741204cc0b
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sat Jul 30 18:59:37 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Jul 30 18:59:37 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a16cbdc8
dev-libs/gjs/files: 1.29.15-r1 → 1.29.16
Version bump incorporating the spidermonkey and gi header patches.
---
.../files/gjs-1.29.15-automagic-spidermonkey.patch | 126 --------------------
| 60 ---------
.../{gjs-1.29.15-r1.ebuild => gjs-1.29.16.ebuild} | 11 +--
3 files changed, 1 insertions(+), 196 deletions(-)
diff --git a/dev-libs/gjs/files/gjs-1.29.15-automagic-spidermonkey.patch b/dev-libs/gjs/files/gjs-1.29.15-automagic-spidermonkey.patch
deleted file mode 100644
index 5dd4321..0000000
--- a/dev-libs/gjs/files/gjs-1.29.15-automagic-spidermonkey.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 57e3cd2303f8d36ae232ec3df986d986f1457361 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Thu, 28 Jul 2011 03:40:49 -0400
-Subject: [PATCH] Make choice of javascript package non-automagic
-
-Add a --with-js-package configure flag to allow selecting which
-javascript package to build against, e.g. to force building against
-xulrunner on a system that happens to have spidermonkey installed.
-
-By default, the behavior is the same as before (first check for
-mozjs185, then for mozilla-js).
-
-Addresses bug
----
- configure.ac | 84 +++++++++++++++++++++++++++++++++------------------------
- 1 files changed, 49 insertions(+), 35 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3b74bc6..38213e3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -91,52 +91,66 @@ m4_define(gobject_required_version, 2.18.0)
- AC_CHECK_HEADERS([malloc.h])
- AC_CHECK_FUNCS(mallinfo)
-
--# First, try separate mozjs185 release
--AC_MSG_CHECKING([for standalone mozjs185])
--PKG_CHECK_EXISTS([mozjs185], JS_PACKAGE=mozjs185,)
--if test x$JS_PACKAGE != x; then
-- FIREFOX_JS_LIBDIR=
-- MOZJS_IS_STANDALONE=yes
-- AC_MSG_RESULT([yes])
-- PKG_CHECK_MODULES(JS, $JS_PACKAGE)
--else
-- AC_MSG_RESULT([no])
--fi
-+AC_ARG_WITH([js-package],
-+ AS_HELP_STRING([--with-js-package[=@<:@auto/mozjs185/mozilla-js@:>@]],
-+ [Choose JavaScript package: 'mozjs185' (i.e. spidermonkey), 'mozilla-js' (i.e. xulrunner or firefox), or 'auto' (detect automatically)]),
-+ [with_js_package=$withval],
-+ [with_js_package="auto"])
-
--# If we didn't find mozjs185 (the standalone spidermonkey), look for mozilla-js
--if test x$JS_PACKAGE = x; then
-- AC_MSG_CHECKING([for mozilla-js 1.9.2])
-- PKG_CHECK_EXISTS([mozilla-js >= 1.9.2], JS_PACKAGE=mozilla-js,)
-+# First, try separate mozjs185 release
-+if test $with_js_package = mozjs185 -o $with_js_package = auto; then
-+ AC_MSG_CHECKING([for standalone mozjs185])
-+ PKG_CHECK_EXISTS([mozjs185], JS_PACKAGE=mozjs185,)
- if test x$JS_PACKAGE != x; then
-+ FIREFOX_JS_LIBDIR=
-+ MOZJS_IS_STANDALONE=yes
- AC_MSG_RESULT([yes])
-+ PKG_CHECK_MODULES(JS, $JS_PACKAGE)
- else
-- AC_MSG_ERROR([Could not find mozilla-js 1.9.2])
-+ AC_MSG_RESULT([no])
- fi
-+fi
-
-- PKG_CHECK_MODULES(JS, $JS_PACKAGE)
--
-- ## some flavors of Firefox .pc only set sdkdir, not libdir
-- FIREFOX_JS_SDKDIR=`$PKG_CONFIG --variable=sdkdir $JS_PACKAGE`
-- FIREFOX_JS_LIBDIR=`$PKG_CONFIG --variable=libdir $JS_PACKAGE`
--
-- ## Ubuntu does not set libdir in mozilla-js.pc
-- if test x"$FIREFOX_JS_LIBDIR" = x; then
-- ## Ubuntu returns xulrunner-devel as the sdkdir, but for the
-- ## libdir we want the runtime location on the target system,
-- ## so can't use -devel.
-- ## The library is in the non-devel directory also.
-- ## Don't ask me why it's in two places.
-- FIREFOX_JS_LIBDIR=`echo "$FIREFOX_JS_SDKDIR" | sed -e 's/-devel//g'`
-- if ! test -d "$FIREFOX_JS_LIBDIR"; then
-- FIREFOX_JS_LIBDIR=
-+if test $with_js_package = mozilla-js -o $with_js_package = auto; then
-+ # If we didn't find mozjs185 (the standalone spidermonkey), look for mozilla-js
-+ if test x$JS_PACKAGE = x; then
-+ AC_MSG_CHECKING([for mozilla-js 1.9.2])
-+ PKG_CHECK_EXISTS([mozilla-js >= 1.9.2], JS_PACKAGE=mozilla-js,)
-+ if test x$JS_PACKAGE != x; then
-+ AC_MSG_RESULT([yes])
-+ else
-+ AC_MSG_ERROR([Could not find mozilla-js 1.9.2])
-+ fi
-+
-+ PKG_CHECK_MODULES(JS, $JS_PACKAGE)
-+
-+ ## some flavors of Firefox .pc only set sdkdir, not libdir
-+ FIREFOX_JS_SDKDIR=`$PKG_CONFIG --variable=sdkdir $JS_PACKAGE`
-+ FIREFOX_JS_LIBDIR=`$PKG_CONFIG --variable=libdir $JS_PACKAGE`
-+
-+ ## Ubuntu does not set libdir in mozilla-js.pc
-+ if test x"$FIREFOX_JS_LIBDIR" = x; then
-+ ## Ubuntu returns xulrunner-devel as the sdkdir, but for the
-+ ## libdir we want the runtime location on the target system,
-+ ## so can't use -devel.
-+ ## The library is in the non-devel directory also.
-+ ## Don't ask me why it's in two places.
-+ FIREFOX_JS_LIBDIR=`echo "$FIREFOX_JS_SDKDIR" | sed -e 's/-devel//g'`
-+ if ! test -d "$FIREFOX_JS_LIBDIR"; then
-+ FIREFOX_JS_LIBDIR=
-+ fi
- fi
-- fi
-
-- if test x"$FIREFOX_JS_LIBDIR" = x; then
-- AC_MSG_ERROR([Could not figure out where the Firefox JavaScript library lives])
-+ if test x"$FIREFOX_JS_LIBDIR" = x; then
-+ AC_MSG_ERROR([Could not figure out where the Firefox JavaScript library lives])
-+ fi
- fi
- fi
-
-+if test x$JS_PACKAGE = x; then
-+ AC_MSG_ERROR([No appropriate JavaScript package found])
-+fi
-+
- echo "Using JS_PACKAGE: $JS_PACKAGE"
- echo "Using JS_CFLAGS: $JS_CFLAGS"
- echo "Using JS_LIBS: $JS_LIBS"
---
-1.7.6
-
diff --git a/dev-libs/gjs/files/gjs-1.29.15-install-gi-headers.patch b/dev-libs/gjs/files/gjs-1.29.15-install-gi-headers.patch
deleted file mode 100644
index 6536122..0000000
--- a/dev-libs/gjs/files/gjs-1.29.15-install-gi-headers.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 4217cb5e07519ea41fdff9b906b93ce6946c109e Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Sat, 30 Jul 2011 15:40:25 +0000
-Subject: Install gi/ headers again
-
-libpeas currently requires these; we were installing them before, and
-since we export almost all of our internals in for gjs-module.pc, might
-as well keep doing these for now.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=655482
----
-diff --git a/Makefile.am b/Makefile.am
-index edf0c25..b088289 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -36,7 +36,20 @@ nobase_gjs_module_include_HEADERS = \
- gjs/importer.h \
- gjs/jsapi-util.h \
- gjs/mem.h \
-- gjs/native.h
-+ gjs/native.h \
-+ gi/ns.h \
-+ gi/object.h \
-+ gi/foreign.h \
-+ gi/param.h \
-+ gi/repo.h \
-+ gi/union.h \
-+ gi/value.h \
-+ gi/arg.h \
-+ gi/boxed.h \
-+ gi/closure.h \
-+ gi/enumeration.h \
-+ gi/function.h \
-+ gi/keep-alive.h
-
- noinst_HEADERS += \
- gjs/jsapi-private.h \
-@@ -108,20 +121,7 @@ libgjs_la_SOURCES = \
-
- # For historical reasons, some files live in gi/
- libgjs_la_SOURCES += \
-- gi/arg.h \
-- gi/boxed.h \
-- gi/closure.h \
-- gi/enumeration.h \
-- gi/function.h \
-- gi/keep-alive.h \
- gi/gjs_gi_trace.h \
-- gi/ns.h \
-- gi/object.h \
-- gi/foreign.h \
-- gi/param.h \
-- gi/repo.h \
-- gi/union.h \
-- gi/value.h \
- gi/arg.c \
- gi/boxed.c \
- gi/closure.c \
---
-cgit v0.9
diff --git a/dev-libs/gjs/gjs-1.29.15-r1.ebuild b/dev-libs/gjs/gjs-1.29.16.ebuild
similarity index 84%
rename from dev-libs/gjs/gjs-1.29.15-r1.ebuild
rename to dev-libs/gjs/gjs-1.29.16.ebuild
index 1a2fc2d..224c103 100644
--- a/dev-libs/gjs/gjs-1.29.15-r1.ebuild
+++ b/dev-libs/gjs/gjs-1.29.16.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
@@ -60,15 +60,6 @@ pkg_setup() {
}
src_prepare() {
- # Make spidermonkey detection non-automagic
- # https://bugzilla.gnome.org/show_bug.cgi?id=655479
- epatch "${FILESDIR}/${P}-automagic-spidermonkey.patch"
-
- # Install gi/ headers again, help unbreak libpeas; will be in next release
- epatch "${FILESDIR}/${P}-install-gi-headers.patch"
-
- [[ ${PV} != 9999 ]] && eautoreconf
-
gnome2_src_prepare
python_convert_shebangs 2 "${S}"/scripts/make-tests
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-07-30 19:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-28 9:05 [gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/gjs/, dev-libs/gjs/files/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2011-07-30 17:47 Alexandre Restovtsev
2011-07-30 19:01 Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox