diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-05-21 05:38:28 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-05-21 05:38:28 +0000 |
| commit | 64698d84b70e77de4d99cf359322dcb3b0d73d3d (patch) | |
| tree | aafb634fd616c1fbddab1fc7037b859908e9515a /media-gfx | |
| parent | Always enable dbus support wrt #363257 by Diego Elio Pettenò. (diff) | |
| download | gentoo-2-64698d84b70e77de4d99cf359322dcb3b0d73d3d.tar.gz gentoo-2-64698d84b70e77de4d99cf359322dcb3b0d73d3d.tar.bz2 gentoo-2-64698d84b70e77de4d99cf359322dcb3b0d73d3d.zip | |
Use -lmozjs instead of -ljs and force at least spidermonkey >= 1.9 wrt #361663 by Ian Stakenvicius.
(Portage version: 2.2.0_alpha33/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/freewrl/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/freewrl/freewrl-1.22.10-r1.ebuild | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog index 78da8bc3b835..1c594229afb5 100644 --- a/media-gfx/freewrl/ChangeLog +++ b/media-gfx/freewrl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/freewrl # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.32 2011/04/02 14:29:43 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.33 2011/05/21 05:38:28 ssuominen Exp $ + + 21 May 2011; Samuli Suominen <ssuominen@gentoo.org> + freewrl-1.22.10-r1.ebuild: + Use -lmozjs instead of -ljs and force at least spidermonkey >= 1.9 wrt + #361663 by Ian Stakenvicius. *freewrl-1.22.10-r1 (02 Apr 2011) diff --git a/media-gfx/freewrl/freewrl-1.22.10-r1.ebuild b/media-gfx/freewrl/freewrl-1.22.10-r1.ebuild index 2946be4f1d39..52ed7c18504b 100644 --- a/media-gfx/freewrl/freewrl-1.22.10-r1.ebuild +++ b/media-gfx/freewrl/freewrl-1.22.10-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.10-r1.ebuild,v 1.2 2011/04/03 19:39:54 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.10-r1.ebuild,v 1.3 2011/05/21 05:38:28 ssuominen Exp $ EAPI="2" @@ -29,7 +29,7 @@ COMMONDEPEND="x11-libs/libXau >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) - dev-lang/spidermonkey" + >=dev-lang/spidermonkey-1.9" DEPEND="${COMMONDEPEND} >=dev-util/pkgconfig-0.22 java? ( >=virtual/jdk-1.4 )" @@ -64,7 +64,7 @@ src_configure() { myconf="${myconf} --disable-mozilla-js --disable-xulrunner-js --disable-firefox-js --disable-seamonkey-js" # spidermonkey has no pkg-config, so override ./configure JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX" - JAVASCRIPT_ENGINE_LIBS="-ljs" + JAVASCRIPT_ENGINE_LIBS="-lmozjs" if has_version dev-lang/spidermonkey[threadsafe] ; then JAVASCRIPT_ENGINE_CFLAGS="${JAVASCRIPT_ENGINE_CFLAGS} -DJS_THREADSAFE $(pkg-config --cflags nspr)" JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) ${JAVASCRIPT_ENGINE_LIBS}" |