rpms/eclipse/devel eclipse-combo-bug-backport.patch, NONE, 1.1 eclipse.spec, 1.120, 1.121 eclipse-NPE-debug.ui.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14705

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-combo-bug-backport.patch 
Removed Files:
	eclipse-NPE-debug.ui.patch 
Log Message:
- Replace temporary patch to debug.ui with upstream patch to swt (rh#155853).


eclipse-combo-bug-backport.patch:
 SWT/gtk/org/eclipse/swt/widgets/Combo.java |    0 
 gtk/org/eclipse/swt/widgets/Combo.java     |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE eclipse-combo-bug-backport.patch ---
Index: Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
===================================================================
RCS file: /home/eclipse/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java,v
retrieving revision 1.127
diff -u -r1.127 Combo.java
--- gtk/org/eclipse/swt/widgets/Combo.java	1 Mar 2005 13:01:37 -0000	1.127
+++ gtk/org/eclipse/swt/widgets/Combo.java	2 May 2005 16:58:12 -0000
@@ -1366,7 +1366,7 @@
 	this.items = new String [items.length];
 	System.arraycopy (items, 0, this.items, 0, i);
 	lockText = ignoreSelect = false;
-	OS.gtk_entry_set_text (entryHandle, new byte[0]);
+	OS.gtk_entry_set_text (entryHandle, new byte[1]);
 }
 
 void setOrientation() {


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- eclipse.spec	30 Apr 2005 19:45:37 -0000	1.120
+++ eclipse.spec	2 May 2005 21:22:29 -0000	1.121
@@ -23,7 +23,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}_fc
-Release:        0.M6.13
+Release:        0.M6.14
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -88,7 +88,8 @@
 #https://bugs.eclipse.org/bugs/show_bug.cgi?id=82988
 Patch23:	%{name}-importArchivedProj.patch
 #https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=155853
-Patch24: 	%{name}-NPE-debug.ui.patch
+#FIXME: should be removed for 3.1M7
+Patch24: 	%{name}-combo-bug-backport.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  ant
@@ -282,7 +283,7 @@
 pushd plugins/org.eclipse.ui.ide
 %patch23 -p0
 popd
-pushd plugins/org.eclipse.debug.ui
+pushd plugins/org.eclipse.swt/Eclipse\ SWT
 %patch24 -p0
 popd
 
@@ -1038,6 +1039,9 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
 
 %changelog
+* Mon May 2 2005 Ben Konrath <bkonrath at redhat.com> 3.1.0_fc-0.M6.14
+- Replace temporary patch to debug.ui with upstream patch to swt (rh#155853).
+
 * Sat Apr 30 2005 Ben Konrath <bkonrath at redhat.com> 3.1.0_fc-0.M6.13
 - Add patch to temporarily stop an NPE in debug.ui (rh#155853).
 


--- eclipse-NPE-debug.ui.patch DELETED ---