[Gsrc-commit] /srv/bzr/gsrc/trunk r1277: fix classpath build

[Brandon Invergo]

------------------------------------------------------------
revno: 1277
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Thu 2012-11-22 21:39:12 +0100
message:
  fix classpath build
added:
  gnu/classpath/files/
  gnu/classpath/files/classpath-0.99-fix-build.diff
modified:
  gnu/classpath/Makefile
  gnu/classpath/config.mk
  gnu/classpath/sha256sums

=== modified file 'gnu/classpath/Makefile'
--- a/gnu/classpath/Makefile    2012-10-27 23:43:13 +0000
+++ b/gnu/classpath/Makefile    2012-11-22 20:39:12 +0000
@@ -9,6 +9,7 @@
 MASTER_SUBDIR = classpath/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
+PATCHFILES = $(DISTNAME)-fix-build.diff
 
 BUILDDEPS = 
 LIBDEPS = 

=== modified file 'gnu/classpath/config.mk'
--- a/gnu/classpath/config.mk   2012-10-27 23:43:13 +0000
+++ b/gnu/classpath/config.mk   2012-11-22 20:39:12 +0000
@@ -1,4 +1,4 @@
 ## Configuration options for classpath ##
 
-CONFIGURE_OPTS ?= 
+CONFIGURE_OPTS ?= --with-antlr-jar=/usr/share/java/antlr2.jar
 BUILD_OPTS ?=

=== added directory 'gnu/classpath/files'
=== added file 'gnu/classpath/files/classpath-0.99-fix-build.diff'
--- a/gnu/classpath/files/classpath-0.99-fix-build.diff 1970-01-01 00:00:00 
+0000
+++ b/gnu/classpath/files/classpath-0.99-fix-build.diff 2012-11-22 20:39:12 
+0000
@@ -0,0 +1,52 @@
+diff -x config.log -x config.status -ru 
work/classpath-0.99/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c 
work/classpath-0.99/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
+--- 
work/classpath-0.99/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c     
   2007-04-25 16:53:04.000000000 +0200
++++ 
work/classpath-0.99/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c     
   2012-11-22 21:26:59.934499703 +0100
+@@ -59,14 +59,14 @@
+   java_awt_font_HANGING_BASELINE = 2
+ };
+ 
+-static PangoFT2FontMap *ft2_map = NULL;
++static PangoFontMap *ft2_map = NULL;
+ 
+ JNIEXPORT void JNICALL
+ Java_gnu_java_awt_peer_gtk_GdkFontPeer_initStaticState 
+   (JNIEnv *env, jclass clazz __attribute__((unused)))
+ {
+   gtkpeer_init_font_IDs(env);
+-  ft2_map = PANGO_FT2_FONT_MAP(pango_ft2_font_map_new());
++  ft2_map = PANGO_FONT_MAP(pango_ft2_font_map_new());
+ }
+ 
+ JNIEXPORT void JNICALL
+@@ -287,7 +287,7 @@
+   pango_font_description_set_size (pfont->desc, size * PANGO_SCALE);
+   
+   /* Create new context */
+-  pfont->ctx = pango_ft2_font_map_create_context (ft2_map);
++  pfont->ctx = pango_font_map_create_context (ft2_map);
+   g_assert (pfont->ctx != NULL);
+   
+   pango_context_set_font_description (pfont->ctx, pfont->desc);
+diff -x config.log -x config.status -ru 
work/classpath-0.99/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c 
work/classpath-0.99/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
+--- work/classpath-0.99/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c   
2007-09-11 11:48:50.000000000 +0200
++++ work/classpath-0.99/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c   
2012-11-22 21:28:03.027849856 +0100
+@@ -313,7 +313,7 @@
+ JNIEXPORT void JNICALL
+ Java_gnu_java_awt_peer_gtk_GtkImage_freePixbuf(JNIEnv *env, jobject obj)
+ {
+-  gdk_pixbuf_unref (cp_gtk_image_get_pixbuf (env, obj));
++  g_object_unref (cp_gtk_image_get_pixbuf (env, obj));
+ }
+ 
+ /**
+diff -x config.log -x config.status -ru 
work/classpath-0.99/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c 
work/classpath-0.99/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
+--- work/classpath-0.99/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c 
2010-08-10 22:52:35.000000000 +0200
++++ work/classpath-0.99/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c 
2012-11-22 21:29:04.631200345 +0100
+@@ -273,7 +273,6 @@
+           global_lock = (*env)->NewGlobalRef(env, lock);
+           gdk_threads_set_lock_functions(&jni_lock_cb, &jni_unlock_cb);
+         }
+-      g_thread_init(NULL);
+     }
+   else
+     {

=== modified file 'gnu/classpath/sha256sums'
--- a/gnu/classpath/sha256sums  2012-08-20 19:18:58 +0000
+++ b/gnu/classpath/sha256sums  2012-11-22 20:39:12 +0000
@@ -1,2 +1,3 @@
 f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8  
download/classpath-0.99.tar.gz
+1346302220440bfeb264a3b53c1a29b1bffd7fd2d46228259186cbd7ff1b9055  
download/classpath-0.99-fix-build.diff
 11357c20fe77668519bcc2689415e30a151ca61217e816c01c93c60cd81a8f67  
download/classpath-0.99.tar.gz.sig