Add patch to fix a crasher but with gtk+-2.14.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64

6 files changed, 175 insertions, 9 deletions

diff --git a/dev-java/java-gnome/ChangeLog b/dev-java/java-gnome/ChangeLog
index 91d56cbc2ffb..286f2d956f25 100644
--- a/dev-java/java-gnome/ChangeLog
+++ b/dev-java/java-gnome/ChangeLog
@@ -1,6 +1,16 @@
 # 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.69 2008/10/01 11:35:00 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.70 2008/10/05 11:06:46 serkan Exp $
+
+*java-gnome-4.0.8-r2 (05 Oct 2008)
+*java-gnome-4.0.7-r3 (05 Oct 2008)
+*java-gnome-4.0.7-r2 (05 Oct 2008)
+
+  05 Oct 2008; Serkan Kaba <serkan@gentoo.org>
+  +files/java-gnome-gtk-214.patch, -java-gnome-4.0.7-r1.ebuild,
+  +java-gnome-4.0.7-r2.ebuild, +java-gnome-4.0.7-r3.ebuild,
+  -java-gnome-4.0.8-r1.ebuild, +java-gnome-4.0.8-r2.ebuild:
+  Add patch to fix a crasher but with gtk+-2.14.
 
   01 Oct 2008; Serkan Kaba <serkan@gentoo.org> java-gnome-4.0.7-r1.ebuild,
   java-gnome-4.0.8-r1.ebuild:
diff --git a/dev-java/java-gnome/Manifest b/dev-java/java-gnome/Manifest
index e48ead9bbdf2..6390571a773f 100644
--- a/dev-java/java-gnome/Manifest
+++ b/dev-java/java-gnome/Manifest
@@ -3,21 +3,23 @@ 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-gtk-214.patch 3993 RMD160 02df55bb536d0ef8609e8f14bf90caa777394f27 SHA1 89966c409b86c278735a66285eefd997a3100ac5 SHA256 715cbe49418bd8029ff4f07d4886dc47e1e323dbf2bd9d2ffd18ef02293c042d
 DIST java-gnome-4.0.5.tar.bz2 391733 RMD160 7e420978ed8eedf88bab76434a480c311a21019b SHA1 a8275f0be3f41ccd1c1f020d5e393b6834a96606 SHA256 b8c305fb2b4479861e6238f9e601bb98166a9ed8d8990b1eefe91ec8b9be36da
 DIST java-gnome-4.0.6.tar.bz2 431667 RMD160 9353c92907632930f373d561896b744582839944 SHA1 172360998dbc0dd05dc3d735349562febeb7f16e SHA256 5e3695f1031d91da591c4f7536cd8f0213a59f7af888501ca61b680e5c31334e
 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
 EBUILD java-gnome-4.0.5.ebuild 1474 RMD160 8bbd395e9857fe15671984255887b2efd465f77d SHA1 37a6ad5e1ed80d38785a03afdb6c3db396c320dc SHA256 553d72c8578f3dc01a8befb9d6c7c9a5f581fc30103c1f58239f9e7c89f90431
 EBUILD java-gnome-4.0.6.ebuild 1449 RMD160 1916e36f98aa4af25b19c256ee8a33c73f16231d SHA1 957a51335c2b080ffa8b5108d1c44b04f32fdf81 SHA256 4ef22e37128c74a4ca918a1ff337adf6d32ac1ce01d98ffe264e72512276272a
-EBUILD java-gnome-4.0.7-r1.ebuild 1505 RMD160 d255e4852d648d95390b59aa6ae5a9eec5adeb3d SHA1 629b181e930d06afe30e4de69dc5855839cead75 SHA256 b1fc47ecd90c45f7a4139d4b5828f4186592fc25650bfc1791e0a2080a5a3fe4
+EBUILD java-gnome-4.0.7-r2.ebuild 1814 RMD160 ff6ab99c3796434e29f26c1be4bcc29a363eabb8 SHA1 881ae8072a417f7596021acc4b50cad8cc915ea4 SHA256 81d6acb961c5363257123949c4d981c2e31bddd718a0a891c79c445a38c3eeac
+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-r1.ebuild 1623 RMD160 94e99c5a6a8db0a6cae978c8aef321f9c6c252f7 SHA1 28263cfec4d58f6b7aaa3d646b6167d6e4a076e4 SHA256 d73a4e1145038617ad951f7557a2c6ed267e73f0d7ec1e2160147a412c1be468
-MISC ChangeLog 11880 RMD160 37ff9102c35ec3d302b847854582e0d56b82960d SHA1 48d780f59bbd3ab401a6eebd605d6840183aef6b SHA256 8ed3eda65bda13ee204f19b2897044b8830c301de24409f6bd4d0a04f5720876
+EBUILD java-gnome-4.0.8-r2.ebuild 1665 RMD160 4d5962fed1f547d3fb79c92a6c710974bdc56fd0 SHA1 cb57d8d3f06cec4686781a1899db23cec6b84a12 SHA256 d5b5cbba2b441811395c199431242e6b550589e4647015dbd4068acd198da05d
+MISC ChangeLog 12267 RMD160 66e5b45fa0835cd5d2d91acdb31844b7e939e1db SHA1 056c19529b9c682f5c4f142f3e2f7f82eeb7eb6d SHA256 b8f262cc641afd606fea0a72907c2d90febd6a6f48592f147cf32b6ce614aec6
 MISC metadata.xml 1084 RMD160 4bea9b6a1a08b968b94a1212b5f98dfd307c2cca SHA1 900ef9e5e2089937b83868332db0a7a039803611 SHA256 b705cf4e2792eec42ece7e8a70cb3f032f54ce2ad1e0ee88433994e3f71a9ec2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjjYG4ACgkQRh6X64ivZaK4hgCdFN41cSo37UkHqzshtyk8zv6M
-1BgAn2ezRaN1wtDHaUiQJnFkXmuC2UW0
-=tYHH
+iEYEARECAAYFAkjon88ACgkQRh6X64ivZaJIKgCfTFrh3zNbj7U/JHmfebZNU3rp
+ZPsAn2qf2Goj6ablql3J74uVX2Dtm5HJ
+=TUCj
 -----END PGP SIGNATURE-----
diff --git a/dev-java/java-gnome/files/java-gnome-gtk-214.patch b/dev-java/java-gnome/files/java-gnome-gtk-214.patch
new file mode 100644
index 000000000000..6786b956698e
--- /dev/null
+++ b/dev-java/java-gnome/files/java-gnome-gtk-214.patch
@@ -0,0 +1,77 @@
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: serkan@gentoo.org-20081005045146-jspegmo5ljm2less
+# target_branch: ../mainline/
+# testament_sha1: aad4b35143ec69622f6af833be1c41e8ba3c742a
+# timestamp: 2008-10-05 07:54:22 +0300
+# base_revision_id: andrew@operationaldynamics.com-20081004065325-\
+#   grsoaun9jq879ia2
+# 
+# Begin patch
+=== modified file 'src/bindings/org/gnome/gdk/CrossingMode.java'
+--- src/bindings/org/gnome/gdk/CrossingMode.java	2008-03-27 05:45:36 +0000
++++ src/bindings/org/gnome/gdk/CrossingMode.java	2008-10-05 04:51:46 +0000
+@@ -46,4 +46,19 @@
+      * Event occurred because an ungrab happened.
+      */
+     public static final CrossingMode UNGRAB = new CrossingMode(GdkCrossingMode.UNGRAB, "UNGRAB");
++
++    /**
++     * Event occurred because a GTK+ grab happened.
++     */
++    public static final CrossingMode GTK_GRAB = new CrossingMode(GdkCrossingMode.GTK_GRAB, "GTK_GRAB");
++
++    /**
++     * Event occurred because a GTK+ ungrab happened.
++     */
++    public static final CrossingMode GTK_UNGRAB = new CrossingMode(GdkCrossingMode.GTK_UNGRAB, "GTK_UNGRAB");
++
++    /**
++     * Event occurred because a GTK+ widget changed state.
++     */
++    public static final CrossingMode STATE_CHANGED = new CrossingMode(GdkCrossingMode.STATE_CHANGED, "STATE_CHANGED");
+ }
+
+=== modified file 'src/defs/GdkCrossingMode.defs'
+--- src/defs/GdkCrossingMode.defs	2007-04-14 23:21:13 +0000
++++ src/defs/GdkCrossingMode.defs	2008-10-05 04:51:46 +0000
+@@ -6,6 +6,9 @@
+     '("normal" "GDK_CROSSING_NORMAL")
+     '("grab" "GDK_CROSSING_GRAB")
+     '("ungrab" "GDK_CROSSING_UNGRAB")
++    '("gtk-grab" "GDK_CROSSING_GTK_GRAB")
++    '("gtk-ungrab" "GDK_CROSSING_GTK_UNGRAB")
++    '("state-changed" "GDK_CROSSING_STATE_CHANGED")
+   )
+ )
+ 
+
+# Begin bundle
+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
diff --git a/dev-java/java-gnome/java-gnome-4.0.7-r2.ebuild b/dev-java/java-gnome/java-gnome-4.0.7-r2.ebuild
new file mode 100644
index 000000000000..880378464b2b
--- /dev/null
+++ b/dev-java/java-gnome/java-gnome-4.0.7-r2.ebuild
@@ -0,0 +1,72 @@
+# 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.7-r2.ebuild,v 1.1 2008/10/05 11:06:46 serkan Exp $
+
+EAPI=1
+JAVA_PKG_IUSE="doc examples source"
+
+inherit eutils versionator java-pkg-2
+
+DESCRIPTION="Java bindings for GTK and GNOME"
+HOMEPAGE="http://java-gnome.sourceforge.net/"
+SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="4.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.12.13
+		>=x11-libs/gtk+-2.12
+		>=gnome-base/libglade-2.6.1
+		>=gnome-base/libgnome-2.18.0
+		>=gnome-base/gnome-desktop-2.18.0
+		>=virtual/jre-1.5"
+DEPEND="${RDEPEND}
+		dev-java/junit:0
+		dev-lang/python
+		>=virtual/jdk-1.5
+		dev-util/pkgconfig"
+
+# Needs X11
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+	epatch "${FILESDIR}/${PN}-gtk-214.patch"
+}
+
+pkg_setup() {
+	if ! built_with_use x11-libs/cairo svg; then
+		echo
+		eerror "x11-libs/cairo has not been built with svg support."
+		eerror "Please re-emerge cairo with the svg use-flag enabled."
+		die "missing svg flag for x11-libs/cairo"
+	fi
+	java-pkg-2_pkg_setup
+}
+
+src_compile() {
+	# Handwritten in perl so not using econf
+	./configure --prefix=/usr || die
+
+	# Fails parallel build in case GCJ is detected
+	# See https://bugs.gentoo.org/show_bug.cgi?id=200550
+	emake -j1 || die "Compilation of java-gnome failed"
+
+	if use doc; then
+		emake -j1 doc || die "Making documentation failed"
+	fi
+}
+
+src_install(){
+	java-pkg_doso tmp/*.so
+	java-pkg_dojar tmp/*.jar
+
+	dodoc AUTHORS HACKING NEWS README || die
+
+	use doc && java-pkg_dojavadoc doc/api
+	use examples && java-pkg_doexamples doc/examples
+	use source && java-pkg_dosrc src/bindings/org
+}
diff --git a/dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild b/dev-java/java-gnome/java-gnome-4.0.7-r3.ebuild
index e60ad325c1f3..4bc4aa4e67bb 100644
--- a/dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild
+++ b/dev-java/java-gnome/java-gnome-4.0.7-r3.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.7-r1.ebuild,v 1.2 2008/10/01 11:35:00 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.7-r3.ebuild,v 1.1 2008/10/05 11:06:46 serkan Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc examples source"
@@ -32,6 +32,10 @@ DEPEND="${RDEPEND}
 # Needs X11
 RESTRICT="test"
 
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-gtk-214.patch"
+}
+
 src_configure() {
 	# Handwritten in perl so not using econf
 	./configure --prefix=/usr || die
diff --git a/dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild b/dev-java/java-gnome/java-gnome-4.0.8-r2.ebuild
index aecff11763e7..5da8854431f2 100644
--- a/dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild
+++ b/dev-java/java-gnome/java-gnome-4.0.8-r2.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.8-r1.ebuild,v 1.2 2008/10/01 11:35:00 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.8-r2.ebuild,v 1.1 2008/10/05 11:06:46 serkan Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc examples source"
@@ -35,6 +35,7 @@ RESTRICT="test"
 src_prepare() {
 	epatch "${FILESDIR}/${P}-disable-doc-snapshots.patch"
 	epatch "${FILESDIR}/${P}-deprecated.patch"
+	epatch "${FILESDIR}/${PN}-gtk-214.patch"
 }
 
 src_configure() {