From 5101c77b33614eef8cca329c7cc3b9121db25587 Mon Sep 17 00:00:00 2001 From: Krzysztof Daniel Date: Feb 21 2013 08:22:58 +0000 Subject: Update to upstream 4.2.2 release. --- diff --git a/eclipse-bug-903537.patch b/eclipse-bug-903537.patch deleted file mode 100644 index a94e7c6..0000000 --- a/eclipse-bug-903537.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java -+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java -@@ -4232,7 +4232,11 @@ public boolean setParent (Composite parent) { - oldDecorations.fixAccelGroup (); - } - int /*long*/ newParent = parent.parentingHandle(); -- OS.gtk_widget_reparent (topHandle, newParent); -+// OS.gtk_widget_reparent (topHandle, newParent); -+ OS.g_object_ref(topHandle); -+ OS.gtk_container_remove(OS.gtk_widget_get_parent(topHandle), topHandle); -+ OS.gtk_container_add(newParent, topHandle); -+ OS.g_object_unref(topHandle); - OS.gtk_fixed_move (newParent, topHandle, x, y); - /* - * Restore the original widget size since GTK does not keep it. diff --git a/eclipse-build-internal-jdt-debug-jar.patch b/eclipse-build-internal-jdt-debug-jar.patch deleted file mode 100644 index ad9268a..0000000 --- a/eclipse-build-internal-jdt-debug-jar.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- eclipse.jdt.debug/org.eclipse.jdt.launching/pom.xml.bak 2012-09-19 14:00:15.000000000 +0200 -+++ eclipse.jdt.debug/org.eclipse.jdt.launching/pom.xml 2012-09-19 14:36:29.035226726 +0200 -@@ -22,4 +22,50 @@ - org.eclipse.jdt.launching - 3.6.101-SNAPSHOT - eclipse-plugin -+ -+ -+ -+ -+ maven-antrun-plugin -+ 1.7 -+ -+ -+ compile-internal-jar -+ compile -+ -+ -+ -+ -+ -+ -+ -+ run -+ -+ -+ -+ -+ -+ bsf -+ bsf -+ 2.4.0 -+ -+ -+ rhino -+ js -+ 1.7R2 -+ -+ -+ org.apache.ant -+ ant-apache-bsf -+ 1.8.3 -+ -+ -+ org.apache.ant -+ ant-nodeps -+ 1.8.1 -+ -+ -+ -+ -+ - diff --git a/eclipse-fix-compatibility-class.patch b/eclipse-fix-compatibility-class.patch index 850d494..8af40df 100644 --- a/eclipse-fix-compatibility-class.patch +++ b/eclipse-fix-compatibility-class.patch @@ -1,16 +1,9 @@ ---- eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml.bak 2012-07-25 17:28:30.000000000 +0200 -+++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml 2012-07-30 15:48:17.936540760 +0200 -@@ -23,4 +23,64 @@ - org.eclipse.core.runtime.compatibility.registry - 3.5.100-SNAPSHOT - eclipse-plugin -+ -+ -+ -+ classes -+ -+ -+ +--- eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml.bak 2013-02-20 13:23:25.000000000 +0100 ++++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml 2013-02-20 13:54:06.484832003 +0100 +@@ -30,4 +30,57 @@ + + + + + + diff --git a/eclipse-fix-linkageerrors-in-ui.patch b/eclipse-fix-linkageerrors-in-ui.patch index bdea806..db08bca 100644 --- a/eclipse-fix-linkageerrors-in-ui.patch +++ b/eclipse-fix-linkageerrors-in-ui.patch @@ -12,15 +12,6 @@ Bundle-Activator: org.eclipse.e4.ui.internal.css.swt.CSSActivator Bundle-ActivationPolicy: lazy -Import-Package: org.w3c.dom.css;version="2.0.0" ---- eclipse.platform.ui/bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF.bak 2012-09-17 15:49:37.000000000 +0200 -+++ eclipse.platform.ui/bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF 2012-09-28 11:09:35.677860544 +0200 -@@ -18,5 +18,4 @@ - Export-Package: org.eclipse.e4.ui.css.swt.internal.theme;x-internal:=true, - org.eclipse.e4.ui.css.swt.theme;x-friends:="org.eclipse.e4.ui.workbench.renderers.swt,org.eclipse.e4.ui.workbench.swt,org.eclipse.ui.workbench" - Import-Package: org.osgi.framework;version="1.5.0", -- org.osgi.service.event;version="1.3.0";resolution:=optional, -- org.w3c.dom.css;version="2.0.0" -+ org.osgi.service.event;version="1.3.0";resolution:=optional --- eclipse.platform.ui/bundles/org.eclipse.e4.ui.services/META-INF/MANIFEST.MF.bak 2012-09-17 15:49:37.000000000 +0200 +++ eclipse.platform.ui/bundles/org.eclipse.e4.ui.services/META-INF/MANIFEST.MF 2012-09-28 11:10:38.229281658 +0200 @@ -10,8 +10,7 @@ @@ -54,15 +45,12 @@ + org.osgi.util.tracker;version="1.4.0" Service-Component: OSGI-INF/testableobject.xml, OSGI-INF/statusreporter.xml, OSGI-INF/menuservice.xml ---- eclipse.platform.ui/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF.bak 2012-09-17 15:49:37.000000000 +0200 -+++ eclipse.platform.ui/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF 2012-09-28 11:13:39.266502896 +0200 -@@ -122,8 +122,5 @@ - org.eclipse.emf.common.util, - org.eclipse.emf.ecore, - org.eclipse.emf.ecore.util, -- org.osgi.service.event;version="1.2.0", -- org.w3c.dom, -- org.w3c.dom.css;version="2.0.0", -- org.xml.sax -+ org.osgi.service.event;version="1.2.0" - Bundle-RequiredExecutionEnvironment: J2SE-1.5 +--- eclipse.platform.ui/bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF.orig 2013-02-20 13:33:11.000000000 +0100 ++++ eclipse.platform.ui/bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF 2013-02-20 14:13:49.349335287 +0100 +@@ -20,5 +20,4 @@ + org.eclipse.e4.ui.css.swt.theme;x-friends:="org.eclipse.e4.ui.workbench.renderers.swt,org.eclipse.e4.ui.workbench.swt,org.eclipse.ui.workbench" + Import-Package: org.eclipse.osgi.service.datalocation;version="1.3.0", + org.osgi.framework;version="1.5.0", +- org.osgi.service.event;version="1.3.0";resolution:=optional, +- org.w3c.dom.css;version="2.0.0" ++ org.osgi.service.event;version="1.3.0";resolution:=optional diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch index 028210a..e4eeaec 100644 --- a/eclipse-secondary-arches.patch +++ b/eclipse-secondary-arches.patch @@ -8,20 +8,6 @@ bundles/org.eclipse.swt.gtk.linux.x86 bundles/org.eclipse.swt.gtk.linux.x86_64 bundles/org.eclipse.swt.gtk.solaris.sparc ---- eclipse.platform.resources/pom.xml.bak 2012-10-18 11:29:04.000000000 +0200 -+++ eclipse.platform.resources/pom.xml 2012-10-18 11:41:23.976257777 +0200 -@@ -31,7 +31,11 @@ - bundles/org.eclipse.core.filesystem - bundles/org.eclipse.core.filesystem.hpux.ia64_32 - bundles/org.eclipse.core.filesystem.hpux.PA_RISC -+ bundles/org.eclipse.core.filesystem.linux.arm - bundles/org.eclipse.core.filesystem.linux.ppc -+ bundles/org.eclipse.core.filesystem.linux.ppc64 -+ bundles/org.eclipse.core.filesystem.linux.s390 -+ bundles/org.eclipse.core.filesystem.linux.s390x - bundles/org.eclipse.core.filesystem.linux.x86 - bundles/org.eclipse.core.filesystem.linux.x86_64 - bundles/org.eclipse.core.filesystem.macosx --- eclipse.platform.team/pom.xml.bak 2012-10-18 11:29:03.000000000 +0200 +++ eclipse.platform.team/pom.xml 2012-10-18 11:43:17.422081348 +0200 @@ -49,6 +49,11 @@ @@ -443,44 +429,12 @@ *) echo "*** Unknown MODEL <${MODEL}>" ;; ---- eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties.bak 2013-01-04 10:10:25.000000000 +0100 -+++ eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties 2013-01-05 15:59:10.250002296 +0100 -@@ -29,6 +29,10 @@ - root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse - root.linux.gtk.ppc64=target/resources/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64 - root.linux.gtk.ppc64.permissions.755=eclipse -+root.linux.gtk.ppc=target/resources/linux.gtk.ppc,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc -+root.linux.gtk.ppc.permissions.755=eclipse -+root.linux.gtk.arm=target/resources/linux.gtk.arm,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/arm -+root.linux.gtk.arm.permissions.755=eclipse - root.linux.gtk.x86_64=target/resources/linux.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86_64 - root.linux.gtk.x86_64.permissions.755=libcairo-swt.so,eclipse - root.linux.gtk.s390x=target/resources/linux.gtk.s390x,../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/gtk/linux/s390x --- eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml.bak 2013-01-05 16:00:33.000000000 +0100 +++ eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml 2013-01-05 16:41:39.390622453 +0100 -@@ -79,6 +79,44 @@ +@@ -79,6 +79,25 @@ -+ copy-resources-gtk.linux.ppc -+ validate -+ -+ copy-resources -+ -+ -+ ${basedir}/target/resources/linux.gtk.ppc -+ -+ -+ ../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.ppc -+ -+ about_files/* -+ about.html -+ -+ -+ -+ -+ -+ + copy-resources-gtk.linux.arm + validate + @@ -503,3 +457,26 @@ copy-resources-gtk.linux.s390 validate +--- eclipse.platform.resources/pom.xml.orig 2013-02-20 13:23:15.000000000 +0100 ++++ eclipse.platform.resources/pom.xml 2013-02-20 14:28:57.484752489 +0100 +@@ -33,6 +33,9 @@ + + + bundles/org.eclipse.core.filesystem ++ bundles/org.eclipse.core.filesystem.linux.arm ++ bundles/org.eclipse.core.filesystem.linux.s390 ++ bundles/org.eclipse.core.filesystem.linux.s390x + bundles/org.eclipse.core.filesystem.hpux.ia64_32 + bundles/org.eclipse.core.filesystem.hpux.PA_RISC + bundles/org.eclipse.core.filesystem.linux.ppc +--- eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties.orig 2013-02-20 13:15:06.000000000 +0100 ++++ eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties 2013-02-20 14:33:26.482928362 +0100 +@@ -37,6 +37,8 @@ + root.linux.gtk.s390x.permissions.755=eclipse + root.linux.gtk.s390=target/resources/linux.gtk.s390,../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/gtk/linux/s390 + root.linux.gtk.s390.permissions.755=eclipse ++root.linux.gtk.arm=target/resources/linux.gtk.arm,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/arm ++root.linux.gtk.arm.permissions.755=eclipse + + #root.linux.gtk.ia64=absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/ia64 + # Need to be fixed to reflect eventual change into feature.xml diff --git a/eclipse.spec b/eclipse.spec index 6ada935..3e29322 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -65,7 +65,7 @@ fi; Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_version} -Release: 0.10.git20121217%{?dist} +Release: 1%{?dist} License: EPL Group: Development/Tools URL: http://www.eclipse.org/ @@ -100,9 +100,6 @@ Patch4: %{name}-no-source-for-dependencies.patch # +org.apache.commons.el Patch5: %{name}-osgi-serverside-patch-additional-imports.patch -# We don't need it -Patch6: %{name}-remove-jaas.patch - # javax.servlet 2.1 -> javax.servlet 3.0 Patch7: %{name}-fix-equinox-ip-imports.patch @@ -187,8 +184,6 @@ Patch31: %{name}-explicit-jdt-in-platform.patch Patch32: %{name}-adjust-p2-server-dependencies.patch -Patch33: %{name}-build-internal-jdt-debug-jar.patch - Patch34: %{name}-fix-linkageerrors-in-ui.patch Patch35: %{name}-secondary-arches.patch @@ -197,8 +192,6 @@ Patch36: %{name}-improve-core-net-makefile.patch Patch37: %{name}-debug-symbols.patch -Patch38: %{name}-bug-903537.patch - BuildRequires: ant >= 1.8.3 BuildRequires: rsync BuildRequires: jpackage-utils >= 0:1.5, make, gcc @@ -387,12 +380,13 @@ Eclipse Tests. tar --strip-components=1 -xf %{SOURCE1} +rm -rf rt.equinox.incubator + %patch0 %patch1 %patch3 %patch4 %patch5 -%patch6 %patch7 %patch8 %patch9 @@ -417,12 +411,10 @@ tar --strip-components=1 -xf %{SOURCE1} %patch30 %patch31 %patch32 -%patch33 %patch34 %patch35 %patch36 %patch37 -%patch38 #To save build hdd space (it took more than 10GB to build everything) %pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder @@ -439,11 +431,27 @@ tar --strip-components=1 -xf %{SOURCE1} %pom_disable_module features/org.eclipse.equinox.weaving.sdk rt.equinox.bundles %pom_disable_module features/master-equinox-weaving eclipse.platform.releng -%pom_disable_module bundles/org.eclipse.equinox.console.jaas.fragment rt.equinox.bundles - %pom_disable_module bundles/org.eclipse.equinox.cm.test rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.console.ssh rt.equinox.bundles +%pom_disable_module features/org.eclipse.equinox.sdk rt.equinox.bundles +%pom_disable_module bundles/org.eclipse.equinox.console.jaas.fragment rt.equinox.bundles +%pom_disable_module bundles/org.eclipse.equinox.ip rt.equinox.bundles +%pom_disable_module bundles/org.eclipse.equinox.transforms.xslt rt.equinox.bundles +%pom_disable_module bundles/org.eclipse.equinox.transforms.hook rt.equinox.bundles +%pom_disable_module bundles/org.eclipse.equinox.weaving.caching rt.equinox.bundles +%pom_disable_module bundles/org.eclipse.equinox.weaving.hook rt.equinox.bundles +%pom_disable_module features/org.eclipse.equinox.compendium.sdk rt.equinox.bundles +%pom_disable_module features/org.eclipse.equinox.core.sdk rt.equinox.framework +%pom_disable_module features/org.eclipse.equinox.p2.sdk rt.equinox.p2 +%pom_disable_module features/org.eclipse.equinox.server.p2 rt.equinox.bundles +%pom_disable_module features/org.eclipse.equinox.serverside.sdk rt.equinox.bundles +%pom_disable_module features/master-equinox eclipse.platform.releng +%pom_disable_module features/master eclipse.platform.releng +%pom_disable_module features/master-ecf eclipse.platform.releng +%pom_disable_module bundles/org.eclipse.releng.tools eclipse.platform.releng +%pom_disable_module features/org.eclipse.releng.tools eclipse.platform.releng + #no idea what's that. Maybe later - sources seem to be hidden inside this additonal jar. %pom_disable_module bundles/org.eclipse.equinox.weaving.caching.j9 rt.equinox.bundles/ @@ -465,24 +473,28 @@ tar --strip-components=1 -xf %{SOURCE1} %pom_disable_module bundles/org.eclipse.swt.win32.win32.ia64 eclipse.platform.swt.binaries %pom_disable_module bundles/org.eclipse.swt.wpf.win32.x86 eclipse.platform.swt.binaries +%pom_disable_module rt.equinox.incubator + +%pom_remove_plugin org.mortbay.jetty:jetty-jspc-maven-plugin eclipse.platform.ua/org.eclipse.help.webapp + # Use our system-installed javadocs, reference only what we built, and # don't like to osgi.org docs (FIXME: maybe we should package them?) -sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc/java|" \ +sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc|" \ -e "/osgi\.org/d" \ -e "s|-breakiterator|;../org.eclipse.equinox.util/@dot\n;../org.eclipse.ecf.filetransfer_3.0.0.v20090302-0803.jar\n;../org.eclipse.ecf_3.0.0.v20090302-0803.jar\n-breakiterator|" \ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt -sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc/java|" \ +sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc|" \ -e "s/win32.win32.x86/gtk.linux.%{eclipse_arch}/" \ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt -sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc/java|" \ +sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc|" \ -e "/osgi\.org/d" \ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt -sed -i -e "s|http://download.oracle.com/javase/1.4.2/docs/api|%{_datadir}/javadoc/java|" \ +sed -i -e "s|http://download.oracle.com/javase/1.4.2/docs/api|%{_datadir}/javadoc|" \ -e "s/motif.linux.x86/gtk.linux.%{eclipse_arch}/" \ -e "/osgi\.org/d" \ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt \ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt -sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc/java|" \ +sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc|" \ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt \ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt @@ -565,6 +577,11 @@ for f in `find eclipse.platform.team/bundles/org.eclipse.core.net/fragments -nam echo -e "Eclipse-BundleShape: dir\n\n" >> $f; done +sed -i -e 's@>org.eclipse.jdt<@>org.eclipse.tycho<@' eclipse-parent/pom.xml +sed -i -e 's@1.1.0-SNAPSHOT@1.1.1-SNAPSHOT@' rt.equinox.bundles/bundles/org.eclipse.equinox.region/pom.xml + + + %build #This is the lowest value where the build succeeds. 512m is not enough. export MAVEN_OPTS="-Xmx700m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState" @@ -631,11 +648,11 @@ popd zip -r org.apache.ant_1.8.3.v20120321-1730.jar org.apache.ant_1.8.3.v20120321-1730 popd -mvn-rpmbuild -f eclipse-parent/pom.xml \ +mvn-rpmbuild -f maven-cbi-plugin/pom.xml \ clean install \ -Dmaven.local.mode=true -Dtycho.local.keepTarget -DskipTychoVersionCheck -mvn-rpmbuild -f maven-cbi-plugin/pom.xml \ +mvn-rpmbuild -f eclipse-parent/pom.xml \ clean install \ -Dmaven.local.mode=true -Dtycho.local.keepTarget -DskipTychoVersionCheck @@ -647,7 +664,8 @@ popd mvn-rpmbuild clean install \ -Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} -DskipTychoVersionCheck \ - -Dmaven.local.mode=true -Dtycho.local.keepTarget -Dbuilddoc=$((%{bootstrap} != 1)) + -Dmaven.local.mode=true -Dtycho.local.keepTarget -Dbuilddoc=$((%{bootstrap} != 1)) \ + -Dcbi-jdt-version=3.8.0.v_C03 pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch} @@ -1316,6 +1334,9 @@ rm -rf %{_bindir}/efj/ %{_mavendepmapfragdir}/%{name}-equinox-osgi %changelog +* Wed Feb 20 2013 Krzysztof Daniel 1:4.2.2-1 +- Update to upstream 4.2.2 release. + * Wed Feb 20 2013 Krzysztof Daniel 1:4.2.2-0.10.git20121217 - Yet another fix for RHBZ#912664. diff --git a/sources b/sources index 91610c1..3e6538e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -841919f98ced4d5c7df6496d09761c37 eclipse-source.tar.bz2 +b59b115fcf1f37fef8bfa0c51dd6d163 eclipse-source.tar.bz2 102b0b7d9be171c8402dbf315b5e01b4 eclipse-build-7a327b17de5f606f47cba6b74e64619520186b7a.tar.xz