Revbump to backport fix for crash in TextMark. See GNOME bug #565745.

Package-Manager: portage-2.2_rc19/cvs/Linux 2.6.27-gentoo-r2 x86_64

4 files changed, 199 insertions, 4 deletions

diff --git a/dev-java/java-gnome/ChangeLog b/dev-java/java-gnome/ChangeLog
index 9d9cf6b22c47..56f50360f905 100644
--- a/dev-java/java-gnome/ChangeLog
+++ b/dev-java/java-gnome/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/java-gnome
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.72 2008/10/14 00:56:24 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.73 2008/12/27 08:13:11 serkan Exp $
+
+*java-gnome-4.0.9-r1 (27 Dec 2008)
+
+  27 Dec 2008; Serkan Kaba <serkan@gentoo.org>
+  +files/java-gnome-4.0.9-crashfix.patch, -java-gnome-4.0.9.ebuild,
+  +java-gnome-4.0.9-r1.ebuild:
+  Revbump to backport fix for crash in TextMark. See GNOME bug #565745.
 
   14 Oct 2008; Kenneth Prugh <ken69267@gentoo.org> java-gnome-4.0.9.ebuild:
   Fix multilib-strict
diff --git a/dev-java/java-gnome/Manifest b/dev-java/java-gnome/Manifest
index 489dda407f1a..2b3134c9a55c 100644
--- a/dev-java/java-gnome/Manifest
+++ b/dev-java/java-gnome/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX java-gnome-4.0.8-deprecated.patch 718 RMD160 cb1cf203daef208d5c9dfa5df8990df667d1e184 SHA1 c4fa56a8e9173d3b9beea58f3a42b72290e0e3e0 SHA256 0d492bb58380700a8db520ae45cb71371d05682b6c4330274303f100664a4be2
 AUX java-gnome-4.0.8-disable-doc-snapshots.patch 286 RMD160 dd28e098cb70bcbeb45041c497773f896915a5aa SHA1 b8461b94b074f30f4ac992ceff93a17858f585da SHA256 2758ce1ea16aeb7e896e458ca1e6f5c546c6919fbf40c39864ba6368f09ea6b7
+AUX java-gnome-4.0.9-crashfix.patch 5811 RMD160 d5d3040cc53d730b5d64fedf6c02134243a180aa SHA1 0a167b4337ee3f90b93ccfcd98e8707faf5fa9ef SHA256 072a93852b4cc91b923fdb3743405a0f2fe3957ad0844028b27c71e6fa409c03
 AUX java-gnome-gtk-214.patch 3993 RMD160 02df55bb536d0ef8609e8f14bf90caa777394f27 SHA1 89966c409b86c278735a66285eefd997a3100ac5 SHA256 715cbe49418bd8029ff4f07d4886dc47e1e323dbf2bd9d2ffd18ef02293c042d
 DIST java-gnome-4.0.7.tar.bz2 451009 RMD160 8131ff8be7f06cbf8a6312a73b4cb227ccfc43f9 SHA1 9915a8c6e83a814ff136c3e96a84af30f82f6a99 SHA256 a88223276ba3592322803cc4f4a11a8f564c2c534476cb97fba37489d055ae07
 DIST java-gnome-4.0.8.tar.bz2 464915 RMD160 cb2ed316ec9a18a4dcb696ae67c5d4de04ef99a6 SHA1 9d8d4ba1276ff5a15ebed4ec4b477468f006f659 SHA256 2880b212fb0df16d514f2ccccfb0f63d0f200947e872d19f8c139ebdd4b19e47
@@ -8,6 +12,13 @@ EBUILD java-gnome-4.0.7-r2.ebuild 1814 RMD160 ff6ab99c3796434e29f26c1be4bcc29a36
 EBUILD java-gnome-4.0.7-r3.ebuild 1566 RMD160 7f2c93824b3626c079a990f2ece433085c0eed34 SHA1 dcbac58e86e07ad21409a2fc0c18197bb4a140c5 SHA256 555664a862ec1ad892fb89cf015df8a476c58afe9eebd374c4e0a685a833db6c
 EBUILD java-gnome-4.0.7.ebuild 1717 RMD160 c5c830ded3e845daca7e3e63becabfe3b5a4509d SHA1 cb5ee517af4dfa9f5851e357efcc36dc5a5787a7 SHA256 9a4cf4618c8918b9eba6234327f5a0849cecc855e5cf78f87464fb9b955044b7
 EBUILD java-gnome-4.0.8-r2.ebuild 1665 RMD160 4d5962fed1f547d3fb79c92a6c710974bdc56fd0 SHA1 cb57d8d3f06cec4686781a1899db23cec6b84a12 SHA256 d5b5cbba2b441811395c199431242e6b550589e4647015dbd4068acd198da05d
-EBUILD java-gnome-4.0.9.ebuild 1755 RMD160 0d54ca319a655a357a954e31b53bc268ef9f5877 SHA1 d896ce4cf0b36a1200983a1a13a3c8c040d68b1e SHA256 007d934753f6699a5279c9d508f2beb6ab97a7904cfadcd71326fcc5dae4c453
-MISC ChangeLog 12603 RMD160 f1b5e75a81812189765948cbac4224edc68a474e SHA1 9ea0a1125c8a5a44f6e426942bb9efc806023af1 SHA256 0d451f87fd8824eacd0e179eefd5204e9545c9e7ef40ca3e6e2677bdc3ab82ce
+EBUILD java-gnome-4.0.9-r1.ebuild 1817 RMD160 005151c98a5f241c9e8bb03139211c548db0001a SHA1 8c9c45c0e1dad2467aed15753c2dc7c8b626eb0e SHA256 0ebbb6a88addbeb7b1277be7375b5a601e7206d46e1f0fde4310bc64e7488afd
+MISC ChangeLog 12856 RMD160 b52cd216df87d528c8e9290c1c86e87f4bf250a0 SHA1 b4ab9a1fb069cc00e7bb3a1a59adff2efcfb429a SHA256 3708aa8d30ec6d4a201a7a91b0a15879d82acf508e92b8188ae178da8d481514
 MISC metadata.xml 1084 RMD160 4bea9b6a1a08b968b94a1212b5f98dfd307c2cca SHA1 900ef9e5e2089937b83868332db0a7a039803611 SHA256 b705cf4e2792eec42ece7e8a70cb3f032f54ce2ad1e0ee88433994e3f71a9ec2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklV45wACgkQRh6X64ivZaIXGQCeMCxSni/i7E6jLBXTezc0OyOW
+r50AniWARCPmgS7TteWdnP/86+MaLANy
+=BLiu
+-----END PGP SIGNATURE-----
diff --git a/dev-java/java-gnome/files/java-gnome-4.0.9-crashfix.patch b/dev-java/java-gnome/files/java-gnome-4.0.9-crashfix.patch
new file mode 100644
index 000000000000..74b86b61e70e
--- /dev/null
+++ b/dev-java/java-gnome/files/java-gnome-4.0.9-crashfix.patch
@@ -0,0 +1,173 @@
+=== modified file 'src/bindings/org/gnome/gtk/GtkWindowOverride.c'
+--- src/bindings/org/gnome/gtk/GtkWindowOverride.c	2007-11-13 05:08:42 +0000
++++ src/bindings/org/gnome/gtk/GtkWindowOverride.c	2008-12-27 04:02:05 +0000
+@@ -59,7 +59,7 @@
+ )
+ {
+ 	if (DEBUG_MEMORY_MANAGEMENT) {
+-		g_print("mem: delete caught for\t\t%ld\n", (long) object);
++		g_printerr("mem: delete caught for\t\t%s\n", bindings_java_memory_pointerToString(object));
+ 	}
+ 	gtk_widget_hide(object);
+ 	
+@@ -102,7 +102,7 @@
+ )
+ {
+ 	if (DEBUG_MEMORY_MANAGEMENT) {
+-		g_print("mem: hide caught for\t\t%ld\n", (long) widget);
++		g_printerr("mem: hide caught for\t\t%s\n", bindings_java_memory_pointerToString(widget));
+ 	}
+ 	gdk_threads_add_timeout_full(G_PRIORITY_LOW, 100, window_hide_deref, widget, NULL);
+ }
+@@ -123,7 +123,7 @@
+ )
+ {
+ 	if (DEBUG_MEMORY_MANAGEMENT) {
+-		g_print("mem: show caught for\t\t%ld\n", (long) widget);
++		g_printerr("mem: show caught for\t\t%s\n", bindings_java_memory_pointerToString(widget));
+ 	}
+ 	g_object_ref(widget);
+ }
+
+=== modified file 'src/jni/bindings_java_memory.c'
+--- src/jni/bindings_java_memory.c	2008-04-06 08:23:22 +0000
++++ src/jni/bindings_java_memory.c	2008-12-27 04:02:05 +0000
+@@ -65,7 +65,7 @@
+ 		 * GObject, and remove strong Java reference
+ 		 */
+ 		if (DEBUG_MEMORY_MANAGEMENT) {
+-			g_print("mem: toggle Java ref to WEAK\t%s\n", bindings_java_memory_pointerToString(object));
++			g_printerr("mem: toggle Java ref to WEAK\t%s\n", bindings_java_memory_pointerToString(object));
+ 		}
+ 		weak = (*env)->NewWeakGlobalRef(env, ref);
+ 		g_object_set_data(object, REFERENCE, weak);
+@@ -77,7 +77,7 @@
+ 		 * replaced it with a strong one. 
+ 		 */
+ 		if (DEBUG_MEMORY_MANAGEMENT) {
+-			g_print("mem: toggle Java ref to STRONG\t%s\n", bindings_java_memory_pointerToString(object));
++			g_printerr("mem: toggle Java ref to STRONG\t%s\n", bindings_java_memory_pointerToString(object));
+ 		}
+ 
+ 		strong = (*env)->NewGlobalRef(env, ref);
+@@ -109,7 +109,7 @@
+         
+                 
+ 	if (DEBUG_MEMORY_MANAGEMENT) {
+-		g_print("mem: drop GObject ref\t\t%s\n", bindings_java_memory_pointerToString(object));
++		g_printerr("mem: drop GObject ref\t\t%s\n", bindings_java_memory_pointerToString(object));
+ 	}
+         g_object_unref(object);
+         return FALSE;
+@@ -145,7 +145,7 @@
+ 	 */
+  
+  	if (DEBUG_MEMORY_MANAGEMENT) {
+- 		g_print("mem: add STRONG Java ref\t%s\n", bindings_java_memory_pointerToString(object));
++ 		g_printerr("mem: add STRONG Java ref\t%s\n", bindings_java_memory_pointerToString(object));
+  	}
+ 	strong = (*env)->NewGlobalRef(env, target);
+ 	g_object_set_data(object, REFERENCE, strong);
+@@ -189,12 +189,23 @@
+ )
+ {
+ 	if (DEBUG_MEMORY_MANAGEMENT) {
+-		g_print("mem: remove toggle ref for\t%s\n", bindings_java_memory_pointerToString(object));
++		g_printerr("mem: remove toggle ref for\t%s\n", bindings_java_memory_pointerToString(object));
+ 	}
+ 
+ 	g_object_remove_toggle_ref(object, bindings_java_toggle, NULL);
+ }
+ 
++/**
++ * Ensure we properly own a GObject.
++ *
++ * This is really important. The aggregate result ensures that we own one Ref
++ * count to the object - no more, no less - which we can then turn into a
++ * ToggleRef. It needs to be called anywhere we are preparing to create a
++ * Proxy.
++ */
++/*
++ * TODO This needs a better name
++ */
+ void
+ bindings_java_memory_cleanup
+ (
+@@ -217,7 +228,7 @@
+         if (owner) {
+             if (G_IS_INITIALLY_UNOWNED(object) && g_object_is_floating(object)) {
+                 if (DEBUG_MEMORY_MANAGEMENT) {
+-                    g_print("mem: sink GObject ref\t\t%s\n", bindings_java_memory_pointerToString(object));
++                    g_printerr("mem: sink GObject ref\t\t%s\n", bindings_java_memory_pointerToString(object));
+                 }
+                 g_object_ref_sink(object);
+             }
+@@ -227,7 +238,7 @@
+              * Object constructor assumes we actually own the object.
+              */
+             if (DEBUG_MEMORY_MANAGEMENT) {
+-                g_print("mem: added extra ref for\t%s\n", bindings_java_memory_pointerToString(object));
++                g_printerr("mem: added extra ref for\t%s\n", bindings_java_memory_pointerToString(object));
+             }
+             g_object_ref(object);
+         }
+@@ -240,7 +251,7 @@
+          */
+         if (owner) {
+             if (DEBUG_MEMORY_MANAGEMENT) {
+-                g_print("mem: remove ref for\t%s\n", bindings_java_memory_pointerToString(object));
++                g_printerr("mem: remove ref for\t%s\n", bindings_java_memory_pointerToString(object));
+             }
+             g_object_unref(object);
+         }
+
+=== modified file 'src/jni/bindings_java_signal.c'
+--- src/jni/bindings_java_signal.c	2008-08-05 04:11:54 +0000
++++ src/jni/bindings_java_signal.c	2008-12-27 03:13:14 +0000
+@@ -97,13 +97,14 @@
+ 	
+ 	jstring _str;
+ 	gchar* str;
++	GObject* obj;
+ 	
+ 	/*
+ 	 * Begin marshaller by downcasting the GClosure we got.
+ 	 */
+ 
+ 	bjc = (BindingsJavaClosure*) closure;
+-	
++
+ 	/*
+ 	 * Get the JNIEnv interface pointer
+ 	 */
+@@ -131,12 +132,12 @@
+ 	 */
+ 
+ 	jargs = g_newa(jvalue, n_param_values + 1);
+-	
++
+ 	jargs[0].l = bjc->handler;
+-	
++
+ 	for(i = 0; i < n_param_values; i++) {
+-  		type = G_VALUE_TYPE(&param_values[i]);
+-    		switch(G_TYPE_FUNDAMENTAL(type)) {
++		type = G_VALUE_TYPE(&param_values[i]);
++		switch(G_TYPE_FUNDAMENTAL(type)) {
+ 		case G_TYPE_CHAR:
+ 			jargs[i+1].c = g_value_get_char(&param_values[i]);
+       			break;
+@@ -193,8 +194,10 @@
+ 			 * address across the boundary to be looked up and
+ 			 * either an existing Proxy returned or a new Proxy
+ 			 * created. 
+-			 */			
+-			jargs[i+1].j = (jlong) g_value_get_object(&param_values[i]); 
++			 */
++			obj = g_value_get_object(&param_values[i]); 
++			bindings_java_memory_cleanup(obj, FALSE);
++			jargs[i+1].j = (jlong) obj;
+ 			break;
+ 
+ 		case G_TYPE_BOXED:
+
diff --git a/dev-java/java-gnome/java-gnome-4.0.9.ebuild b/dev-java/java-gnome/java-gnome-4.0.9-r1.ebuild
index 6f318e693c6d..b05407b3bf0a 100644
--- a/dev-java/java-gnome/java-gnome-4.0.9.ebuild
+++ b/dev-java/java-gnome/java-gnome-4.0.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.9.ebuild,v 1.2 2008/10/14 00:56:24 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.9-r1.ebuild,v 1.1 2008/12/27 08:13:11 serkan Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc examples source"
@@ -37,6 +37,10 @@ RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-crashfix.patch
+}
+
 src_configure() {
 	# Handwritten in perl so not using econf
 	./configure prefix=/usr libdir=/usr/$(get_libdir)/${PN}-${SLOT} jardir=/usr/share/${PN}-${SLOT}/lib || die