compile gtk28

(Portage version: 2.0.53_rc6)

3 files changed, 56 insertions, 3 deletions

diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index 739d8611bdb4..8ceae415d0d8 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.40 2005/10/17 21:23:47 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.41 2005/10/28 16:31:00 axxo Exp $
+
+  28 Oct 2005; Thomas Matthijs <axxo@gentoo.org> +files/gtk28.patch,
+  gnu-classpath-0.18.ebuild:
+  compile with gtk 2.8
 
   17 Oct 2005; Thomas Matthijs <axxo@gentoo.org> gnu-classpath-0.18.ebuild:
   Depend on gtk =2.6*, since it doesnt build with 2.8
diff --git a/dev-java/gnu-classpath/files/gtk28.patch b/dev-java/gnu-classpath/files/gtk28.patch
new file mode 100644
index 000000000000..62616827515f
--- /dev/null
+++ b/dev-java/gnu-classpath/files/gtk28.patch
@@ -0,0 +1,39 @@
+--- classpath/classpath/native/jni/gtk-peer/Makefile.am	2005/08/22 10:36:141.29
++++ classpath/classpath/native/jni/gtk-peer/Makefile.am	2005/10/21 19:26:531.30
+@@ -54,10 +54,12 @@
+ libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \
+        $(top_builddir)/native/jni/classpath/jcl.lo
+ 
+-AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @CAIRO_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ -lXtst
++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_CFLAGS@
+
+--- classpath/classpath/configure.ac	2005/10/06 06:24:111.111
++++ classpath/classpath/configure.ac	2005/10/21 19:26:531.112
+@@ -373,12 +373,17 @@
+ 
+   if test "x${enable_gtk_cairo}" = xyes; then
+     PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0)
+-    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
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.18.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.18.ebuild
index c9040d5297e4..dabce0d106ec 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.18.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.18.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/gnu-classpath/gnu-classpath-0.18.ebuild,v 1.4 2005/10/17 21:23:47 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.18.ebuild,v 1.5 2005/10/28 16:31:00 axxo Exp $
+
+inherit eutils autotools
 
 MY_P=${P/gnu-/}
 DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java programming language"
@@ -18,7 +20,7 @@ KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~ppc64"
 IUSE="examples gtk xml2"
 
 #cairo? ( >=x11-libs/cairo-0.5.0 )
-RDEPEND="gtk? ( =x11-libs/gtk+-2.6*
+RDEPEND="gtk? ( >=x11-libs/gtk+-2.6*
 				>=dev-libs/glib-2.0 )
 		 xml2? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
 
@@ -28,6 +30,14 @@ DEPEND="app-arch/zip
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/gtk28.patch
+	eautoconf
+}
+
 src_compile() {
 	# Note: This is written in a way to easily support GCJ and other compilers
 	# at a later point. Currently Gentoo uses mainly GCJ 3.3 (from the