From 767af325d2ad7a16a708ffcd6e6906df1815659f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Fri, 2 Mar 2007 20:02:07 +0000 Subject: [PATCH] Fix compiling with latest versions of firefox or seamonkey. Fixes bug #168780. Package-Manager: portage-2.1.2-r12 --- dev-java/gnu-classpath/ChangeLog | 6 +++- dev-java/gnu-classpath/Manifest | 26 +++++++++-------- .../gnu-classpath/files/0.93-nsplugin.patch | 28 +++++++++++++++++++ .../gnu-classpath/gnu-classpath-0.93.ebuild | 11 ++++++-- 4 files changed, 57 insertions(+), 14 deletions(-) create mode 100644 dev-java/gnu-classpath/files/0.93-nsplugin.patch 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 + +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 gnu-classpath-0.93.ebuild: diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest index f058e186b901..01b507b8502d 100644 --- a/dev-java/gnu-classpath/Manifest +++ b/dev-java/gnu-classpath/Manifest @@ -1,6 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX 0.93-nsplugin.patch 1518 RMD160 b82f191cd788dce09745ca17042499f278d0b695 SHA1 3e7f7e77b30aa330abafc7f2d6d1a4fe4ce7d801 SHA256 6919f6291d674a7ebabb6e31fd5e3416394287be00a0cec2dbc8365b70302d97 +MD5 446cf0aeef06341903793cc89894815c files/0.93-nsplugin.patch 1518 +RMD160 b82f191cd788dce09745ca17042499f278d0b695 files/0.93-nsplugin.patch 1518 +SHA256 6919f6291d674a7ebabb6e31fd5e3416394287be00a0cec2dbc8365b70302d97 files/0.93-nsplugin.patch 1518 DIST classpath-0.90.tar.gz 7930836 RMD160 e108fb537610ae993d1968d606aa43e6f804a402 SHA1 267dcd6345b90486cce17f1c73fbf33ee0d06f7c SHA256 4f2824c42062dea269e489c1acb2769c015bf78cdaa929ee75441d412f10a03b DIST classpath-0.92.tar.gz 9161101 RMD160 aba37c221768a6152ebb4440059199414e396668 SHA1 fab3d6d360f6e9d712fc999f3f085e9f9c8c641a SHA256 8bc678263b40635623995826a3c1f0ea177dba9cc29bfe6572cc8acdb182b0d0 DIST classpath-0.93.tar.gz 9534222 RMD160 4c72b68766e35adbb2c89170fbdf7f30dd788836 SHA1 336cae589ec91a4fe212c2149c57b51dab2ca002 SHA256 df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945 @@ -12,14 +16,14 @@ EBUILD gnu-classpath-0.92.ebuild 2732 RMD160 94c66774bed726ee3ad1779db058cec1560 MD5 e80bc0037a8cca17aa29d1b9e28d8f7c gnu-classpath-0.92.ebuild 2732 RMD160 94c66774bed726ee3ad1779db058cec1560ad45f gnu-classpath-0.92.ebuild 2732 SHA256 d18e1fb4fd84fa6aca838a6d60fbd080da9cfbbcc860f39cb75306d4febef92f gnu-classpath-0.92.ebuild 2732 -EBUILD gnu-classpath-0.93.ebuild 3291 RMD160 e71ac9df171f35dca612fdcf7748ff3aa32bcdc5 SHA1 31fb7d3883b17e3dbdbcac5abbba345cf47a81ad SHA256 b451aec8232322fae975048bad8267b5fce31fda615a9b24cf9205d7b11134fb -MD5 8ad253cb9c60ae524686d973af410955 gnu-classpath-0.93.ebuild 3291 -RMD160 e71ac9df171f35dca612fdcf7748ff3aa32bcdc5 gnu-classpath-0.93.ebuild 3291 -SHA256 b451aec8232322fae975048bad8267b5fce31fda615a9b24cf9205d7b11134fb gnu-classpath-0.93.ebuild 3291 -MISC ChangeLog 10098 RMD160 cc22e2130529dc6e6475b71125f04e956374aee0 SHA1 fb424f3ce9bc47afa6df24f859b7de748984959f SHA256 8d59f9ce4e85ac2b6c32f9f42a7645fe12eea3b9e675a1ab8b426edc7a1dd0f6 -MD5 afa557ab34a49e43bfb0c9f2abd32ca2 ChangeLog 10098 -RMD160 cc22e2130529dc6e6475b71125f04e956374aee0 ChangeLog 10098 -SHA256 8d59f9ce4e85ac2b6c32f9f42a7645fe12eea3b9e675a1ab8b426edc7a1dd0f6 ChangeLog 10098 +EBUILD gnu-classpath-0.93.ebuild 3396 RMD160 47d172cbe459aa7198e1f15e772c061a2e72c6dc SHA1 5750994f25df9a82e9ef1835a21135edb5f58cc6 SHA256 b20d7d327d10b1d633857545c46ba21ab198555bda4298bb30817a286e1236b9 +MD5 854d690e231279b01a63c8c627f4197e gnu-classpath-0.93.ebuild 3396 +RMD160 47d172cbe459aa7198e1f15e772c061a2e72c6dc gnu-classpath-0.93.ebuild 3396 +SHA256 b20d7d327d10b1d633857545c46ba21ab198555bda4298bb30817a286e1236b9 gnu-classpath-0.93.ebuild 3396 +MISC ChangeLog 10290 RMD160 148371884c647e0b653c4dc3e4d79cc214aadc3a SHA1 0215288dcaf925c592a38945eba8d10e47813c0f SHA256 d8949e30bb77ef46e1d0e81d652109c2ee0df2e2d371b15a938527bed054c462 +MD5 6741ef76232be2070768d8c1ea7e7ee9 ChangeLog 10290 +RMD160 148371884c647e0b653c4dc3e4d79cc214aadc3a ChangeLog 10290 +SHA256 d8949e30bb77ef46e1d0e81d652109c2ee0df2e2d371b15a938527bed054c462 ChangeLog 10290 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 @@ -36,7 +40,7 @@ SHA256 2562fa7add636fc55e25ba58ffb709dfb05fd875092754ca69c9596f4a239617 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFF5g5fcxLzpIGCsLQRArboAJ4pHIy1raYDHmYck8OrqaQtVOtqkgCfeIL/ -y5Bd1jHRCimG+VAEODxKdoo= -=Dr8T +iD8DBQFF6IE/cxLzpIGCsLQRApLxAJwO38NPxnmbDsBhgUHWoO03BiEK5wCfWGmg +CdKTmuv1uK4XxXH7ZVNqntM= +=nAP8 -----END PGP SIGNATURE----- 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 -- 2.26.2