- Add patch to workaround an xml parsing bug in libgcj (gcc bug #29853).
- Resolves: #209393.
This commit is contained in:
parent
a3a491615f
commit
52a1764a2b
22
eclipse-workaround-plugin.xml-parsing-bug-gcc-bz29853.patch
Normal file
22
eclipse-workaround-plugin.xml-parsing-bug-gcc-bz29853.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
14
eclipse.spec
14
eclipse.spec
@ -26,7 +26,7 @@ Epoch: 1
|
|||||||
Summary: An open, extensible IDE
|
Summary: An open, extensible IDE
|
||||||
Name: eclipse
|
Name: eclipse
|
||||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||||
Release: 20%{?dist}
|
Release: 21%{?dist}
|
||||||
License: EPL
|
License: EPL
|
||||||
Group: Text Editors/Integrated Development Environments (IDE)
|
Group: Text Editors/Integrated Development Environments (IDE)
|
||||||
URL: http://www.eclipse.org/
|
URL: http://www.eclipse.org/
|
||||||
@ -111,6 +111,9 @@ Patch57: %{name}-ecj-gcj.patch
|
|||||||
# sed --in-place "s/Eclipse\ SWT\ PI/Eclipse_SWT_PI/g" eclipse-swt-firefox.patch
|
# sed --in-place "s/Eclipse\ SWT\ PI/Eclipse_SWT_PI/g" eclipse-swt-firefox.patch
|
||||||
Patch59: %{name}-swt-firefox.patch
|
Patch59: %{name}-swt-firefox.patch
|
||||||
Patch60: %{name}-swt-firefox.2.patch
|
Patch60: %{name}-swt-firefox.2.patch
|
||||||
|
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=209393
|
||||||
|
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29853
|
||||||
|
Patch61: %{name}-workaround-plugin.xml-parsing-bug-gcc-bz29853.patch
|
||||||
Patch100: customBuildCallbacks.xml-add-pre.gather.bin.parts.patch
|
Patch100: customBuildCallbacks.xml-add-pre.gather.bin.parts.patch
|
||||||
# Add ppc64 to the list of arches with gre64.conf
|
# Add ppc64 to the list of arches with gre64.conf
|
||||||
# part of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=207016
|
# part of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=207016
|
||||||
@ -475,6 +478,11 @@ mv "JNI Generation" JNI_Generation
|
|||||||
mv JNI_Generation "JNI Generation"
|
mv JNI_Generation "JNI Generation"
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
# workaround for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29853
|
||||||
|
pushd plugins/org.eclipse.pde.core
|
||||||
|
%patch61
|
||||||
|
popd
|
||||||
|
|
||||||
# FIXME check if this has been applied upstream
|
# FIXME check if this has been applied upstream
|
||||||
pushd plugins/org.eclipse.platform.doc.isv
|
pushd plugins/org.eclipse.platform.doc.isv
|
||||||
%patch100 -p0
|
%patch100 -p0
|
||||||
@ -1735,6 +1743,10 @@ rm -f %{_datadir}/%{name}/configuration/org.eclipse.update/platform.xml*
|
|||||||
%{_libdir}/%{name}/plugins/org.eclipse.sdk_*
|
%{_libdir}/%{name}/plugins/org.eclipse.sdk_*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Nov 17 2006 Ben Konrath <bkonrath@redhat.com> 3.2.1-21
|
||||||
|
- Add patch to workaround an xml parsing bug in libgcj (gcc bug #29853).
|
||||||
|
- Resolves: #209393.
|
||||||
|
|
||||||
* Fri Nov 17 2006 Andrew Overholt <overholt@redhat.com> 3.2.1-20
|
* Fri Nov 17 2006 Andrew Overholt <overholt@redhat.com> 3.2.1-20
|
||||||
- Revise gre64 patch to just do ppc64 addition and not ordering change.
|
- Revise gre64 patch to just do ppc64 addition and not ordering change.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user