rpms/eclipse/FC-6 eclipse-ppc64gre64.patch, NONE, 1.1 eclipse-workaround-plugin.xml-parsing-bug-gcc-bz29853.patch, NONE, 1.1

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Nov 18 03:19:46 UTC 2006


Author: bkonrath

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

Added Files:
	eclipse-ppc64gre64.patch 
	eclipse-workaround-plugin.xml-parsing-bug-gcc-bz29853.patch 
Log Message:
- Add new patches from rawhide

eclipse-ppc64gre64.patch:
 eclipseMozilla.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE eclipse-ppc64gre64.patch ---
Index: library/eclipseMozilla.c
===================================================================
RCS file: /cvsroot/eclipse/platform-launcher/library/eclipseMozilla.c,v
retrieving revision 1.2
diff -u -r1.2 eclipseMozilla.c
--- library/eclipseMozilla.c	10 Aug 2006 21:21:26 -0000	1.2
+++ library/eclipseMozilla.c	17 Nov 2006 18:39:08 -0000
@@ -102,7 +102,7 @@
 		{
 			struct stat buf;
 			FILE *file = NULL;
-#if defined(__amd64__) || defined(__x86_64__)
+#if defined(__amd64__) || defined(__x86_64__) || defined(__powerpc64__)
 			if (stat("/etc/gre64.conf", &buf) == 0)
 			{
 				file = fopen("/etc/gre64.conf", "r");

eclipse-workaround-plugin.xml-parsing-bug-gcc-bz29853.patch:
 PluginHandler.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE eclipse-workaround-plugin.xml-parsing-bug-gcc-bz29853.patch ---
Index: src/org/eclipse/pde/internal/core/plugin/PluginHandler.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/PluginHandler.java,v
retrieving revision 1.6
diff -u -r1.6 PluginHandler.java
--- src/org/eclipse/pde/internal/core/plugin/PluginHandler.java	3 Apr 2006 19:48:18 -0000	1.6
+++ src/org/eclipse/pde/internal/core/plugin/PluginHandler.java	17 Nov 2006 22:18:53 -0000
@@ -52,11 +52,13 @@
 			}
 		}
 		
+		boolean setLineAttr = false;
 		Element element = fDocument.createElement(qName);
 		for (int i = 0; i < attributes.getLength(); i++) {
 			element.setAttribute(attributes.getQName(i), attributes.getValue(i));
-			if ("extension".equals(qName) || "extension-point".equals(qName)) { //$NON-NLS-1$ //$NON-NLS-2$
+			if (("extension".equals(qName) || "extension-point".equals(qName)) && !setLineAttr) { //$NON-NLS-1$ //$NON-NLS-2$
 				element.setAttribute("line", Integer.toString(fLocator.getLineNumber())); //$NON-NLS-1$
+				setLineAttr = true;
 			}
 		}
 		




More information about the fedora-cvs-commits mailing list