From 8e9e7d75b84a4600c0e426c3639fd34a8ebdd46a Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: Jan 04 2010 16:52:01 +0000
Subject: - Back-port patch for e.o#291128.


---

diff --git a/eclipse-swtbug291128.patch b/eclipse-swtbug291128.patch
new file mode 100644
index 0000000..badd1ac
--- /dev/null
+++ b/eclipse-swtbug291128.patch
@@ -0,0 +1,47 @@
+diff -uNr build.xml build.xml
+--- build.xml	2009-11-05 06:15:17.000000000 -0500
++++ build.xml	2009-12-22 16:47:19.000000000 -0500
+@@ -247,6 +247,7 @@
+ 		<patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="3" />
+ 		<patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="3" />
+ 		<patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}/plugins/org.eclipse.pde.build" strip="0" />
++		<patch patchfile="${basedir}/patches/swtbug291128.patch" dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT Accessibility" strip="1" />
+ 		<patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" />
+ 		<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
+ 		<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
+diff -uNr patches/swtbug291128.patch patches/swtbug291128.patch
+--- patches/swtbug291128.patch	1969-12-31 19:00:00.000000000 -0500
++++ patches/swtbug291128.patch	2009-12-22 16:46:54.000000000 -0500
+@@ -0,0 +1,32 @@
++### Eclipse Workspace Patch 1.0
++#P org.eclipse.swt
++Index: Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
++===================================================================
++RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java,v
++retrieving revision 1.46
++diff -u -r1.46 AccessibleObject.java
++--- Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java	29 May 2009 21:30:30 -0000	1.46
+++++ Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java	22 Dec 2009 17:05:15 -0000
++@@ -1176,7 +1176,12 @@
++ 	}
++ 
++ 	static AccessibleObject getAccessibleObject (int /*long*/ atkObject) {
++-		return (AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
+++		AccessibleObject object = (AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
+++		if (object == null) return null;
+++		if (object.accessible == null) return null;
+++		Control control = object.accessible.control;
+++		if (control == null || control.isDisposed()) return null;
+++		return object;
++ 	}
++ 	
++ 	AccessibleObject getChildByHandle (int /*long*/ handle) {
++@@ -1252,7 +1257,7 @@
++ 		GObjectClass objectClassStruct = new GObjectClass ();
++ 		ATK.memmove (objectClassStruct, gObjectClass);
++ 		ATK.call (objectClassStruct.finalize, atkObject);
++-		AccessibleObject object = getAccessibleObject (atkObject);
+++		AccessibleObject object = (AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
++ 		if (object != null) {
++ 			AccessibleObjects.remove (new LONG (atkObject));
++ 			object.release ();
diff --git a/eclipse.spec b/eclipse.spec
index e3b82b3..15353cb 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -27,7 +27,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        21%{?dist}
+Release:        22%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -48,6 +48,8 @@ Patch0:        %{name}-target-platform-template.patch
 # make o.e.swt.gtk.linux.ppc64 version to match ppc 
 Patch1:        %{name}-swt-ppc64-version.patch
 Patch2:        %{name}-junit-dropins.patch
+# Already upstream in eclipse-build
+Patch3:        %{name}-swtbug291128.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
@@ -190,6 +192,7 @@ developing Eclipse plugins.
 %prep
 %setup -q -n eclipse-build-0_4_RC4
 cp %{SOURCE1} .
+%patch3
 ant -DbuildArch=%{eclipse_arch} applyPatches
 pushd build/eclipse-R3_5_1-fetched-src
 
@@ -1106,6 +1109,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Jan 4 2010 Andrew Overholt <overholt@redhat.com> 1:3.5.1-22
+- Back-port patch for e.o#291128.
+
 * Wed Dec 16 2009 Alexander Kurtakov <akurtako@redhat.com> 1:3.5.1-21
 - Fix o.e.jdt.junit dropins issue. RHBZ#538803 (Thanks to Patrick Higgins).