diff options
| author |   Ian Stakenvicius <axs@gentoo.org> | 2012-06-28 19:12:02 +0000 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2012-06-28 19:12:02 +0000 |
| commit | 39fe625eed7e248b8ab65287a3cb3c85984db93f (patch) | |
| tree | 016900a6d26514b08511aee8cdd4f8b3723556f9 /media-gfx/freewrl | |
| parent | [bump] dev-perl/Cache-Memcached-1.300.0 (diff) | |
| download | gentoo-2-39fe625eed7e248b8ab65287a3cb3c85984db93f.tar.gz gentoo-2-39fe625eed7e248b8ab65287a3cb3c85984db93f.tar.bz2 gentoo-2-39fe625eed7e248b8ab65287a3cb3c85984db93f.zip | |
patched in support for spidermonkey-1.8.7
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/freewrl')
| -rw-r--r-- | media-gfx/freewrl/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch | 10 | ||||
| -rw-r--r-- | media-gfx/freewrl/freewrl-1.22.13.ebuild | 13 |
3 files changed, 25 insertions, 4 deletions
diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog index 2cf99d879260..7fcf827e18ac 100644 --- a/media-gfx/freewrl/ChangeLog +++ b/media-gfx/freewrl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/freewrl # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.44 2012/06/13 18:05:51 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.45 2012/06/28 19:12:02 axs Exp $ + + 28 Jun 2012; Ian Stakenvicius <axs@gentoo.org> freewrl-1.22.13.ebuild, + +files/freewrl-1.22.13-mozjs187-config.patch: + patched in support for spidermonkey-1.8.7 13 Jun 2012; Ian Stakenvicius <axs@gentoo.org> freewrl-1.22.13.ebuild: updated ebuild to use new upstream tarball, fixes minor build system issue diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch b/media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch new file mode 100644 index 000000000000..645a2315c161 --- /dev/null +++ b/media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch @@ -0,0 +1,10 @@ +--- a/configure.ac 2012-06-13 13:17:43.000000000 -0400 ++++ b/configure.ac 2012-06-18 15:34:59.000000000 -0400 +@@ -192,6 +192,7 @@ + AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[spidermonkey],[>=],[1.7.0]) + ;; + *) ++ AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[mozjs187]) + AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[mozjs185]) + AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[mozilla-js],[>=],[1.9]) + AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[xulrunner-js],[>=],[1.8]) diff --git a/media-gfx/freewrl/freewrl-1.22.13.ebuild b/media-gfx/freewrl/freewrl-1.22.13.ebuild index 87af83e2f165..a662018b1ae0 100644 --- a/media-gfx/freewrl/freewrl-1.22.13.ebuild +++ b/media-gfx/freewrl/freewrl-1.22.13.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.13.ebuild,v 1.3 2012/06/13 18:05:51 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.13.ebuild,v 1.4 2012/06/28 19:12:02 axs Exp $ EAPI=4 -inherit nsplugins eutils flag-o-matic java-pkg-opt-2 multilib +inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib DESCRIPTION="VRML97 and X3D compliant browser, library, and web-browser plugin" HOMEPAGE="http://freewrl.sourceforge.net/" @@ -44,6 +44,13 @@ RDEPEND="${COMMONDEPEND} java? ( >=virtual/jre-1.4 ) sox? ( media-sound/sox )" +src_prepare() { + if has_version ">=dev-lang/spidermonkey-1.8.7" ; then + epatch "${FILESDIR}"/${P}-mozjs187-config.patch + eautoreconf + fi +} + src_configure() { local myconf="--enable-fontconfig --without-expat @@ -69,7 +76,7 @@ src_configure() { myconf+=" --disable-${x}" done else - for x in mozjs185 mozilla-js xulrunner-js firefox-js seamonkey-js; do + for x in mozjs187 mozjs185 mozilla-js xulrunner-js firefox-js seamonkey-js; do myconf+=" --disable-${x}" done # spidermonkey pre-1.8.5 has no pkg-config, so override ./configure |