diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2005-10-28 16:57:54 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2005-10-28 16:57:54 +0000 |
| commit | 63a2ba9c1475420191a767b8e85f03f0e4c73dbd (patch) | |
| tree | 14adca38f6c37ac4e37e2389299878da63ec7835 /dev-java | |
| parent | Added USE_DESTDIR declaration (bug #110016) (diff) | |
| download | gentoo-2-63a2ba9c1475420191a767b8e85f03f0e4c73dbd.tar.gz gentoo-2-63a2ba9c1475420191a767b8e85f03f0e4c73dbd.tar.bz2 gentoo-2-63a2ba9c1475420191a767b8e85f03f0e4c73dbd.zip | |
compile with gtk28
(Portage version: 2.0.53_rc6)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/sablevm/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/sablevm/files/gtk28.patch | 36 | ||||
| -rw-r--r-- | dev-java/sablevm/sablevm-1.11.3.ebuild | 13 |
3 files changed, 52 insertions, 3 deletions
diff --git a/dev-java/sablevm/ChangeLog b/dev-java/sablevm/ChangeLog index 70e56d7d4969..c2f7f0d6f3a6 100644 --- a/dev-java/sablevm/ChangeLog +++ b/dev-java/sablevm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/sablevm # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sablevm/ChangeLog,v 1.20 2005/10/17 21:22:35 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sablevm/ChangeLog,v 1.21 2005/10/28 16:57:54 axxo Exp $ + + 28 Oct 2005; Thomas Matthijs <axxo@gentoo.org> +files/gtk28.patch, + sablevm-1.11.3.ebuild: + compile with gtk28 17 Oct 2005; Thomas Matthijs <axxo@gentoo.org> sablevm-1.11.3.ebuild: Depend on gtk =2.6*, since it doesnt build with 2.8 diff --git a/dev-java/sablevm/files/gtk28.patch b/dev-java/sablevm/files/gtk28.patch new file mode 100644 index 000000000000..85972448a13e --- /dev/null +++ b/dev-java/sablevm/files/gtk28.patch @@ -0,0 +1,36 @@ +--- configure.ac 2005-03-24 22:00:40.000000000 +0100 ++++ configure.ac 2005-10-28 18:48:16.000000000 +0200 +@@ -325,12 +325,16 @@ + if test "x${enable_gtk_cairo}" = xyes + then + PKG_CHECK_MODULES(CAIRO, cairo) +- PKG_CHECK_MODULES(PANGOFT2, pangoft2) + fi ++ PKG_CHECK_MODULES(PANGOFT2, pangoft2) ++ PKG_CHECK_MODULES(FREETYPE2, freetype2) ++ + AC_SUBST(CAIRO_LIBS) + AC_SUBST(CAIRO_CFLAGS) + AC_SUBST(PANGOFT2_LIBS) + AC_SUBST(PANGOFT2_CFLAGS) ++ AC_SUBST(FREETYPE2_LIBS) ++ AC_SUBST(FREETYPE2_CFLAGS) + fi + + CLASSPATH_WITH_JAVAH +--- native/jni/gtk-peer/Makefile.am 2005-03-24 21:58:00.000000000 +0100 ++++ native/jni/gtk-peer/Makefile.am 2005-10-28 18:51:45.000000000 +0200 +@@ -53,10 +53,11 @@ + + libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo + +-AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @CAIRO_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ ++AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @CAIRO_LIBS@ @PANGOFT2_LIBS@ \ ++ @FREETYPE2_LIBS@ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ -lX11 -lXtst + AM_CPPFLAGS = @CLASSPATH_INCLUDES@ + + # Just the WARNING_CFLAGS. We cannot use the strict flags since the gtk + # headers contain broken prototypes (by design, see gtkitemfactory.h). + AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ \ +- @GTK_CFLAGS@ @CAIRO_CFLAGS@ @PANGOFT2_CFLAGS@ ++ @GTK_CFLAGS@ @CAIRO_CFLAGS@ @PANGOFT2_CFLAGS@ @FREETYPE2_CFLAGS@ @X_FLAGS@ diff --git a/dev-java/sablevm/sablevm-1.11.3.ebuild b/dev-java/sablevm/sablevm-1.11.3.ebuild index 82513a849902..8346ab20e652 100644 --- a/dev-java/sablevm/sablevm-1.11.3.ebuild +++ b/dev-java/sablevm/sablevm-1.11.3.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sablevm/sablevm-1.11.3.ebuild,v 1.6 2005/10/17 21:18:57 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sablevm/sablevm-1.11.3.ebuild,v 1.7 2005/10/28 16:57:54 axxo Exp $ + +inherit eutils autotools DESCRIPTION="A robust, clean, extremely portable, efficient, and specification-compliant Java virtual machine." HOMEPAGE="http://sablevm.org/" @@ -19,13 +21,20 @@ DEPEND=">=dev-libs/libffi-1.20 >=dev-libs/popt-1.7 >=dev-java/jikes-1.19 gtk? ( - =x11-libs/gtk+-2.6* + >=x11-libs/gtk+-2.4 >=media-libs/libart_lgpl-2.1 )" RDEPEND="${DEPEND}" S=${WORKDIR} +src_unpack() { + unpack ${A} + cd ${WORKDIR}/sablevm-classpath-${PV} + epatch ${FILESDIR}/gtk28.patch + eautoconf +} + src_compile() { export LDFLAGS="$LDFLAGS -L/usr/lib/libffi" CPPFLAGS="$CPPFLAGS -I/usr/include/libffi" |