summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2005-10-28 16:31:00 +0000
committerThomas Matthijs <axxo@gentoo.org>2005-10-28 16:31:00 +0000
commiteb93735632145e0a6533f1dbf26f1e80d671417e (patch)
tree1f7d683d491a3c9c1163711b4cfd421286ba2821 /dev-java/gnu-classpath/files
parentInitial release. Features vesafb-tng 1.0-rc1-r1 (diff)
downloadgentoo-2-eb93735632145e0a6533f1dbf26f1e80d671417e.tar.gz
gentoo-2-eb93735632145e0a6533f1dbf26f1e80d671417e.tar.bz2
gentoo-2-eb93735632145e0a6533f1dbf26f1e80d671417e.zip
compile gtk28
(Portage version: 2.0.53_rc6)
Diffstat (limited to 'dev-java/gnu-classpath/files')
-rw-r--r--dev-java/gnu-classpath/files/gtk28.patch39
1 files changed, 39 insertions, 0 deletions
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