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

(Portage version: 2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64)

5 files changed, 167 insertions, 3 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/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() {