diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2007-03-02 20:02:07 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-03-02 20:02:07 +0000 |
| commit | 1a2a1c90d16d628c76f741decdcf4f8eb729fa6b (patch) | |
| tree | 6f7e36059970192d16791c0ec081649ea13cca80 /dev-java/gnu-classpath | |
| parent | remove prepall (already called by install_qa_check) (diff) | |
| download | gentoo-2-1a2a1c90d16d628c76f741decdcf4f8eb729fa6b.tar.gz gentoo-2-1a2a1c90d16d628c76f741decdcf4f8eb729fa6b.tar.bz2 gentoo-2-1a2a1c90d16d628c76f741decdcf4f8eb729fa6b.zip | |
Fix compiling with latest versions of firefox or seamonkey. Fixes bug #168780.
(Portage version: 2.1.2-r12)
Diffstat (limited to 'dev-java/gnu-classpath')
| -rw-r--r-- | dev-java/gnu-classpath/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/gnu-classpath/files/0.93-nsplugin.patch | 28 | ||||
| -rw-r--r-- | dev-java/gnu-classpath/gnu-classpath-0.93.ebuild | 11 |
3 files changed, 42 insertions, 3 deletions
diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog index f7f50d361141..85fc26b7caec 100644 --- a/dev-java/gnu-classpath/ChangeLog +++ b/dev-java/gnu-classpath/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/gnu-classpath # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.69 2007/02/28 23:20:30 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.70 2007/03/02 20:02:07 betelgeuse Exp $ + + 02 Mar 2007; Petteri Räty <betelgeuse@gentoo.org> + +files/0.93-nsplugin.patch, gnu-classpath-0.93.ebuild: + Fix compiling with latest versions of firefox or seamonkey. Fixes bug #168780. 28 Feb 2007; Petteri Räty <betelgeuse@gentoo.org> gnu-classpath-0.93.ebuild: diff --git a/dev-java/gnu-classpath/files/0.93-nsplugin.patch b/dev-java/gnu-classpath/files/0.93-nsplugin.patch new file mode 100644 index 000000000000..1497a28d6c99 --- /dev/null +++ b/dev-java/gnu-classpath/files/0.93-nsplugin.patch @@ -0,0 +1,28 @@ +Index: configure.ac +=================================================================== +RCS file: /cvsroot/classpath/classpath/configure.ac,v +retrieving revision 1.195 +diff -u -r1.195 configure.ac +--- configure.ac 1 Mar 2007 00:26:08 -0000 1.195 ++++ configure.ac 2 Mar 2007 19:47:02 -0000 +@@ -590,16 +590,16 @@ + if test "x${COMPILE_PLUGIN}" = xyes; then + PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) + if test "x${MOZILLA_FOUND}" = xno; then +- PKG_CHECK_MODULES(MOZILLA, firefox-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) ++ PKG_CHECK_MODULES(MOZILLA, firefox-plugin firefox-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) + fi + if test "x${MOZILLA_FOUND}" = xno; then +- PKG_CHECK_MODULES(MOZILLA, xulrunner-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) ++ PKG_CHECK_MODULES(MOZILLA, xulrunner-plugin xulrunner-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) + fi + if test "x${MOZILLA_FOUND}" = xno; then +- PKG_CHECK_MODULES(MOZILLA, mozilla-firefox-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) ++ PKG_CHECK_MODULES(MOZILLA, mozilla-firefox-plugin mozilla-firefox-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) + fi + if test "x${MOZILLA_FOUND}" = xno; then +- PKG_CHECK_MODULES(MOZILLA, seamonkey-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) ++ PKG_CHECK_MODULES(MOZILLA, seamonkey-plugin seamonkey-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) + fi + PKG_CHECK_MODULES(GLIB, glib-2.0) + diff --git a/dev-java/gnu-classpath/gnu-classpath-0.93.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.93.ebuild index 466d0b9abaad..ecc7fe6102b4 100644 --- a/dev-java/gnu-classpath/gnu-classpath-0.93.ebuild +++ b/dev-java/gnu-classpath/gnu-classpath-0.93.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.93.ebuild,v 1.2 2007/02/28 23:20:30 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.93.ebuild,v 1.3 2007/03/02 20:02:07 betelgeuse Exp $ -inherit eutils flag-o-matic multilib +inherit autotools eutils flag-o-matic multilib MY_P=${P/gnu-/} DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java programming language" @@ -56,6 +56,13 @@ DEPEND="app-arch/zip S=${WORKDIR}/${MY_P} +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/0.93-nsplugin.patch" + eautoconf +} + src_compile() { unset CLASSPATH JAVA_HOME # We want to force use of jikes, because it is the only way to build |