diff --git a/.devtoolset-3-eclipse.metadata b/.devtoolset-3-eclipse.metadata index 2023903..41cb762 100644 --- a/.devtoolset-3-eclipse.metadata +++ b/.devtoolset-3-eclipse.metadata @@ -1,2 +1,2 @@ -16323bbbdd3ac709a9c63707f59a0db8c4760ee6 SOURCES/R4_platform-aggregator-R4_4.tar.xz -6b3adca0e240cbee0b98e802f9a6cdc4ba3ba717 SOURCES/org.eclipse.linuxtools.eclipse-build-93cece6ca02e022b0d8d0816a9f6596b311ab774.tar.bz2 +b90a3d14adf82565c64a5590221609c49426c556 SOURCES/R4_platform-aggregator-R4_4_2.tar.xz +1518030b6169a55172f65f58b34b4a03315e4e37 SOURCES/org.eclipse.linuxtools.eclipse-build-2135919f7f0f11f3c43901b8e70819c9a4911ac3.tar.bz2 diff --git a/.gitignore b/.gitignore index 12c6026..277a470 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/R4_platform-aggregator-R4_4.tar.xz -SOURCES/org.eclipse.linuxtools.eclipse-build-93cece6ca02e022b0d8d0816a9f6596b311ab774.tar.bz2 +SOURCES/R4_platform-aggregator-R4_4_2.tar.xz +SOURCES/org.eclipse.linuxtools.eclipse-build-2135919f7f0f11f3c43901b8e70819c9a4911ac3.tar.bz2 diff --git a/SOURCES/eclipse-antrun-to-exec.patch b/SOURCES/eclipse-antrun-to-exec.patch new file mode 100644 index 0000000..72b5724 --- /dev/null +++ b/SOURCES/eclipse-antrun-to-exec.patch @@ -0,0 +1,31 @@ +--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.x86_64/pom.xml.orig 2015-01-09 17:32:22.105954064 +0000 ++++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.x86_64/pom.xml 2015-01-09 17:34:48.825961054 +0000 +@@ -67,19 +67,22 @@ + + + +- maven-antrun-plugin ++ org.codehaus.mojo ++ exec-maven-plugin ++ 1.3.2 + + + natives + process-resources + +- +- +- +- ++ ant ++ ++ -Dmachine_gtk3=1-Dtargets=install ++ build_libraries ++ + + +- run ++ exec + + + diff --git a/SOURCES/eclipse-bug-386377.patch b/SOURCES/eclipse-bug-386377.patch index 29dfe95..c912db5 100644 --- a/SOURCES/eclipse-bug-386377.patch +++ b/SOURCES/eclipse-bug-386377.patch @@ -1,11 +1,11 @@ --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml 2014-04-16 15:53:08.145402094 +0100 -@@ -27,4 +27,59 @@ +@@ -27,4 +27,37 @@ gtk x86_64 + -+ ++ + build-native-launchers-gtk.linux.x86_64 + + @@ -17,7 +17,7 @@ + + + maven-antrun-plugin -+ 1.7 ++ 1.7 + + + compile-executable-natives @@ -32,28 +32,6 @@ + + + -+ -+ -+ 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 -+ -+ + + + @@ -62,13 +40,12 @@ --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml 2014-04-16 15:53:08.145402094 +0100 -@@ -27,4 +27,60 @@ +@@ -27,4 +27,37 @@ win32 x86_64 -+ + -+ ++ + build-native-launchers-win32.win32.x86_64 + + @@ -80,7 +57,7 @@ + + + maven-antrun-plugin -+ 1.7 ++ 1.7 + + + compile-executable-natives @@ -95,28 +72,6 @@ + + + -+ -+ -+ 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 -+ -+ + + + @@ -125,13 +80,12 @@ --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml.orig 2014-04-16 15:57:02.805249103 +0100 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml 2014-04-16 15:57:26.204834155 +0100 -@@ -27,4 +27,60 @@ +@@ -27,4 +27,37 @@ gtk ppc64le -+ + -+ ++ + build-native-launchers-gtk.linux.ppc64le + + @@ -143,7 +97,7 @@ + + + maven-antrun-plugin -+ 1.7 ++ 1.7 + + + compile-executable-natives @@ -158,28 +112,6 @@ + + + -+ -+ -+ 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 -+ -+ + + + @@ -188,12 +120,12 @@ --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml 2014-04-16 15:53:08.145402094 +0100 -@@ -27,4 +27,59 @@ +@@ -27,4 +27,37 @@ gtk x86 + -+ ++ + build-native-launchers-gtk.linux.x86 + + @@ -205,7 +137,7 @@ + + + maven-antrun-plugin -+ 1.7 ++ 1.7 + + + compile-executable-natives @@ -220,28 +152,6 @@ + + + -+ -+ -+ 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 -+ -+ + + + @@ -250,13 +160,12 @@ --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml 2014-04-16 15:53:08.145402094 +0100 -@@ -27,4 +27,60 @@ +@@ -27,4 +27,37 @@ win32 x86 -+ + -+ ++ + build-native-launchers-win32.win32.x86 + + @@ -268,7 +177,7 @@ + + + maven-antrun-plugin -+ 1.7 ++ 1.7 + + + compile-executable-natives @@ -283,28 +192,6 @@ + + + -+ -+ -+ 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 -+ -+ + + + @@ -313,13 +200,12 @@ --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml 2014-04-16 15:53:08.145402094 +0100 -@@ -27,4 +27,60 @@ +@@ -27,4 +27,37 @@ gtk s390 -+ + -+ ++ + build-native-launchers-gtk.linux.s390 + + @@ -331,7 +217,7 @@ + + + maven-antrun-plugin -+ 1.7 ++ 1.7 + + + compile-executable-natives @@ -346,28 +232,6 @@ + + + -+ -+ -+ 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 -+ -+ + + + @@ -376,13 +240,12 @@ --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml 2014-04-16 15:53:08.146402075 +0100 -@@ -27,4 +27,60 @@ +@@ -27,4 +27,37 @@ gtk s390x -+ + -+ ++ + build-native-launchers-gtk.linux.s390x + + @@ -394,7 +257,7 @@ + + + maven-antrun-plugin -+ 1.7 ++ 1.7 + + + compile-executable-natives @@ -409,28 +272,6 @@ + + + -+ -+ -+ 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 -+ -+ + + + @@ -439,13 +280,12 @@ --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml 2014-04-16 15:57:28.315796703 +0100 -@@ -27,4 +27,60 @@ +@@ -27,4 +27,37 @@ gtk ppc64 -+ + -+ ++ + build-native-launchers-gtk.linux.ppc64 + + @@ -457,7 +297,7 @@ + + + maven-antrun-plugin -+ 1.7 ++ 1.7 + + + compile-executable-natives @@ -472,28 +312,6 @@ + + + -+ -+ -+ 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 -+ -+ + + + @@ -502,13 +320,12 @@ --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml 2014-04-16 15:53:08.146402075 +0100 -@@ -27,4 +27,60 @@ +@@ -27,4 +27,37 @@ gtk ppc -+ + -+ ++ + build-native-launchers-gtk.linux.ppc + + @@ -520,7 +337,7 @@ + + + maven-antrun-plugin -+ 1.7 ++ 1.7 + + + compile-executable-natives @@ -535,28 +352,6 @@ + + + -+ -+ -+ 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/SOURCES/eclipse-bug-444143.patch b/SOURCES/eclipse-bug-444143.patch deleted file mode 100644 index d9e7d93..0000000 --- a/SOURCES/eclipse-bug-444143.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 716d35d30c1f639a04515188fedd89bb3aaf12bc Mon Sep 17 00:00:00 2001 -From: Sami Wagiaalla -Date: Mon, 15 Sep 2014 11:51:44 -0400 -Subject: Bug 444143 - [GTK3] Reset selected background color in Table - -When setBackgroundColor is called for Table it results in -a call to gtk_widget_override_background_color with the flag -GTK_STATE_FLAG_NORMAL which overrides the color for selected -items' background despite the flag. Therefore the selected item -color must be reset to the default. - -Change-Id: Iab3cad4e01cf87cca04e536fdea8991c818d0336 -Signed-off-by: Sami Wagiaalla - -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java -index 96493c6..2558fd1 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java -@@ -11,12 +11,28 @@ - package org.eclipse.swt.widgets; - - --import org.eclipse.swt.*; --import org.eclipse.swt.internal.*; --import org.eclipse.swt.internal.cairo.*; --import org.eclipse.swt.internal.gtk.*; --import org.eclipse.swt.graphics.*; --import org.eclipse.swt.events.*; -+import org.eclipse.swt.SWT; -+import org.eclipse.swt.SWTException; -+import org.eclipse.swt.events.SelectionEvent; -+import org.eclipse.swt.events.SelectionListener; -+import org.eclipse.swt.graphics.Color; -+import org.eclipse.swt.graphics.Font; -+import org.eclipse.swt.graphics.GC; -+import org.eclipse.swt.graphics.Image; -+import org.eclipse.swt.graphics.Point; -+import org.eclipse.swt.graphics.Rectangle; -+import org.eclipse.swt.internal.Converter; -+import org.eclipse.swt.internal.ImageList; -+import org.eclipse.swt.internal.cairo.Cairo; -+import org.eclipse.swt.internal.gtk.GdkColor; -+import org.eclipse.swt.internal.gtk.GdkEventButton; -+import org.eclipse.swt.internal.gtk.GdkEventExpose; -+import org.eclipse.swt.internal.gtk.GdkRGBA; -+import org.eclipse.swt.internal.gtk.GdkRectangle; -+import org.eclipse.swt.internal.gtk.GtkAllocation; -+import org.eclipse.swt.internal.gtk.GtkCellRendererClass; -+import org.eclipse.swt.internal.gtk.GtkRequisition; -+import org.eclipse.swt.internal.gtk.OS; - - /** - * Instances of this class implement a selectable user interface -@@ -3006,6 +3022,17 @@ void setBackgroundColor (GdkColor color) { - super.setBackgroundColor (color); - if (!OS.GTK3) { - OS.gtk_widget_modify_base (handle, 0, color); -+ } else { -+ // Setting the background color overrides the selected background color -+ // so we have to reset it the default. -+ GdkColor defaultColor = getDisplay().COLOR_LIST_SELECTION; -+ GdkRGBA selectedBackground = new GdkRGBA (); -+ selectedBackground.alpha = 1; -+ selectedBackground.red = (defaultColor.red & 0xFFFF) / (float)0xFFFF; -+ selectedBackground.green = (defaultColor.green & 0xFFFF) / (float)0xFFFF; -+ selectedBackground.blue = (defaultColor.blue & 0xFFFF) / (float)0xFFFF; -+ -+ OS.gtk_widget_override_background_color (handle, OS.GTK_STATE_FLAG_SELECTED, selectedBackground); - } - } - -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java -index 2a40869..4603cff 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java -@@ -3038,6 +3038,17 @@ void setBackgroundColor (GdkColor color) { - super.setBackgroundColor (color); - if (!OS.GTK3) { - OS.gtk_widget_modify_base (handle, 0, color); -+ } else { -+ // Setting the background color overrides the selected background color -+ // so we have to reset it the default. -+ GdkColor defaultColor = getDisplay().COLOR_LIST_SELECTION; -+ GdkRGBA selectedBackground = new GdkRGBA (); -+ selectedBackground.alpha = 1; -+ selectedBackground.red = (defaultColor.red & 0xFFFF) / (float)0xFFFF; -+ selectedBackground.green = (defaultColor.green & 0xFFFF) / (float)0xFFFF; -+ selectedBackground.blue = (defaultColor.blue & 0xFFFF) / (float)0xFFFF; -+ -+ OS.gtk_widget_override_background_color (handle, OS.GTK_STATE_FLAG_SELECTED, selectedBackground); - } - } - --- -cgit v0.10.1-9-gd18e - diff --git a/SOURCES/eclipse-debug-symbols.patch b/SOURCES/eclipse-debug-symbols.patch index d7173a7..5c4a70e 100644 --- a/SOURCES/eclipse-debug-symbols.patch +++ b/SOURCES/eclipse-debug-symbols.patch @@ -1,5 +1,5 @@ ---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak.orig" 2014-03-12 10:43:26.000000000 +0000 -+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak" 2014-03-12 14:36:44.130938292 +0000 +--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak.orig 2014-03-12 10:43:26.000000000 +0000 ++++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 2014-03-12 14:36:44.130938292 +0000 @@ -115,7 +115,7 @@ WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o diff --git a/SOURCES/eclipse-disable-jdt-annotation-java8.patch b/SOURCES/eclipse-disable-jdt-annotation-java8.patch index 7ae2749..52017c9 100644 --- a/SOURCES/eclipse-disable-jdt-annotation-java8.patch +++ b/SOURCES/eclipse-disable-jdt-annotation-java8.patch @@ -14,3 +14,50 @@ id="org.eclipse.jdt.core.manipulation" download-size="0" install-size="0" +--- eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF.orig 2015-03-03 15:47:48.996114578 +0000 ++++ eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF 2015-03-03 15:48:14.355657645 +0000 +@@ -15,8 +15,7 @@ + org.eclipse.test.performance, + org.eclipse.jdt.core, + org.eclipse.ui.ide, +- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional, +- org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional ++ org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional + Bundle-ActivationPolicy: lazy + Bundle-Vendor: %providerName + Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +--- eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF.orig 2015-03-03 15:47:48.997114560 +0000 ++++ eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF 2015-03-03 15:48:22.679507663 +0000 +@@ -20,8 +20,7 @@ + org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", + org.eclipse.test.performance;bundle-version="[3.1.0,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", +- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional, +- org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional ++ org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional + Bundle-RequiredExecutionEnvironment: J2SE-1.4 + Eclipse-BundleShape: dir + Bundle-Activator: org.eclipse.jdt.core.tests.compiler.Activator +--- eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/META-INF/MANIFEST.MF.orig 2015-03-03 15:47:48.998114542 +0000 ++++ eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/META-INF/MANIFEST.MF 2015-03-03 15:48:32.001339702 +0000 +@@ -12,7 +12,6 @@ + org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", + org.eclipse.test.performance;bundle-version="[3.1.0,4.0.0)", +- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional, +- org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional ++ org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional + Bundle-RequiredExecutionEnvironment: J2SE-1.4 + Eclipse-BundleShape: dir +--- eclipse.jdt.core/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF.orig 2015-03-03 15:47:48.998114542 +0000 ++++ eclipse.jdt.core/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF 2015-03-03 15:48:39.720200622 +0000 +@@ -25,8 +25,7 @@ + org.eclipse.text;bundle-version="[3.2.0,4.0.0)", + com.ibm.icu;bundle-version="3.4.4", + org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)", +- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional, +- org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional ++ org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional + Bundle-RequiredExecutionEnvironment: J2SE-1.4 + Eclipse-BundleShape: dir + Bundle-Activator: org.eclipse.jdt.core.tests.Activator diff --git a/SOURCES/eclipse-feature-plugins-to-category-ius.patch b/SOURCES/eclipse-feature-plugins-to-category-ius.patch new file mode 100644 index 0000000..b501bfd --- /dev/null +++ b/SOURCES/eclipse-feature-plugins-to-category-ius.patch @@ -0,0 +1,413 @@ +diff --git eclipse.jdt/org.eclipse.jdt-feature/feature.xml eclipse.jdt/org.eclipse.jdt-feature/feature.xml +index 0743586..1cbf404 100644 +--- eclipse.jdt/org.eclipse.jdt-feature/feature.xml ++++ eclipse.jdt/org.eclipse.jdt-feature/feature.xml +@@ -154,19 +154,6 @@ + unpack="false"/> + + +- +- +- +- + ++ ++ ++ ++ ++ + +diff --git eclipse.pde/org.eclipse.pde-feature/feature.xml eclipse.pde/org.eclipse.pde-feature/feature.xml +index 88a8daa..382c5ee 100644 +--- eclipse.pde/org.eclipse.pde-feature/feature.xml ++++ eclipse.pde/org.eclipse.pde-feature/feature.xml +@@ -82,20 +82,6 @@ + unpack="false"/> + + +- +- +- +- + ++ ++ ++ ++ ++ + +diff --git eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml +index c6d5da0..e76f33f 100644 +--- eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml ++++ eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml +@@ -21,62 +21,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +diff --git eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml +index 8176831..c97bab0 100644 +--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml ++++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml +@@ -95,62 +95,6 @@ + unpack="false"/> + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + +- +- +- +- + + +- +- + + +- +- +- +- +- +- + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +diff --git eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml +index 6f6526b..c05d703 100644 +--- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml ++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml +@@ -36,4 +36,43 @@ + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + diff --git a/SOURCES/eclipse-help-doc-adjust-dependencies.patch b/SOURCES/eclipse-help-doc-adjust-dependencies.patch index f5a622f..d6593ea 100644 --- a/SOURCES/eclipse-help-doc-adjust-dependencies.patch +++ b/SOURCES/eclipse-help-doc-adjust-dependencies.patch @@ -1,25 +1,3 @@ -diff --git a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml -index c63d1e1..8e7cc30 100644 ---- a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml -+++ b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml -@@ -42,7 +42,7 @@ - unpack="false"/> - - - - + + -+ ++ + + + diff --git a/SOURCES/eclipse-remove-w3c-smil-and-use-geronimo.patch b/SOURCES/eclipse-remove-w3c-smil-and-use-geronimo.patch index c9834ac..d60d5b5 100644 --- a/SOURCES/eclipse-remove-w3c-smil-and-use-geronimo.patch +++ b/SOURCES/eclipse-remove-w3c-smil-and-use-geronimo.patch @@ -1,35 +1,3 @@ ---- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.orig 2014-03-26 11:00:57.935084582 +0000 -+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2014-03-26 11:02:43.076109293 +0000 -@@ -123,20 +123,6 @@ - unpack="false"/> - - -- -- -- -- - - bundles/org.eclipse.swt.gtk.linux.ppc64 +@@ -54,6 +54,8 @@ + bundles/org.eclipse.swt.gtk.linux.ppc64le bundles/org.eclipse.swt.gtk.linux.s390 bundles/org.eclipse.swt.gtk.linux.s390x + bundles/org.eclipse.swt.gtk.linux.arm + bundles/org.eclipse.swt.gtk.linux.aarch64 -+ bundles/org.eclipse.swt.gtk.linux.ppc64le bundles/org.eclipse.swt.gtk.linux.x86 bundles/org.eclipse.swt.gtk.linux.x86_64 bundles/org.eclipse.swt.gtk.solaris.sparc @@ -117,16 +116,15 @@ diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml index b46cdc6..0fb36a5 100644 --- a/rt.equinox.framework/pom.xml +++ b/rt.equinox.framework/pom.xml -@@ -55,6 +55,9 @@ +@@ -55,6 +55,8 @@ bundles/org.eclipse.equinox.launcher.gtk.aix.ppc bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64 bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64 + bundles/org.eclipse.equinox.launcher.gtk.linux.arm + bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64 -+ bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le bundles/org.eclipse.equinox.launcher.gtk.linux.ppc bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64 - bundles/org.eclipse.equinox.launcher.gtk.linux.s390 + bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml index f5fb504..1187e84 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml @@ -143,22 +141,12 @@ diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclip index 7e1f520..734dd10 100644 --- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml +++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml -@@ -409,6 +409,36 @@ +@@ -419,6 +419,26 @@ install-size="0" version="0.0.0" fragment="true"/> + + -+ -+ + + -+ -+ @@ -384,13 +348,84 @@ index fac13bf..e487001 100644 + + + ++ ++ build-native-launchers-gtk.linux.s390x ++ ++ ++ native ++ gtk.linux.s390x ++ ++ ++ ++ ++ ++ maven-antrun-plugin ++ ++ ++ compile-executable-natives ++ generate-resources ++ ++ ++ ++ ++ ++ ++ run ++ ++ ++ ++ ++ ++ ++ ++ ++ build-native-launchers-gtk.linux.s390 ++ ++ ++ native ++ gtk.linux.s390 ++ ++ ++ ++ ++ ++ maven-antrun-plugin ++ ++ ++ compile-executable-natives ++ generate-resources ++ ++ ++ ++ ++ ++ ++ run ++ ++ ++ ++ ++ ++ ++ + build-native-launchers-win32.win32.x86_64 +@@ -530,8 +530,8 @@ + + + +- +- ++ ++ + + + --- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml 2014-05-26 19:20:28.958177815 +0300 +++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml 2014-05-26 19:33:42.942025740 +0300 -@@ -30,6 +30,64 @@ +@@ -30,6 +30,44 @@ 2.6 @@ -432,26 +467,6 @@ index fac13bf..e487001 100644 + + + -+ copy-resources-gtk.linux.ppc64le -+ validate -+ -+ copy-resources -+ -+ -+ ${basedir}/rootfiles/linux.gtk.ppc64le -+ -+ -+ ../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.ppc64le -+ -+ -+ about_files/* -+ about.html -+ -+ -+ -+ -+ -+ copy-resources-gtk.linux.x86 validate diff --git a/SOURCES/eclipse-support-scls-for-symlink-script.patch b/SOURCES/eclipse-support-scls-for-symlink-script.patch new file mode 100644 index 0000000..aad73a7 --- /dev/null +++ b/SOURCES/eclipse-support-scls-for-symlink-script.patch @@ -0,0 +1,76 @@ +diff --git dependencies/replace_platform_plugins_with_symlinks.sh dependencies/replace_platform_plugins_with_symlinks.sh +index febe616..e9cad48 100755 +--- dependencies/replace_platform_plugins_with_symlinks.sh ++++ dependencies/replace_platform_plugins_with_symlinks.sh +@@ -3,21 +3,20 @@ + # Then into plugins, and then symlinks + + # SCL java dir is different from default +-SCL_JAVA_DIR=$2 ++SCL_JAVA_DIRS=${@:2} + + function _symlink { + _f=`ls | grep -e "^$1"` + rm -rf $_f +- if [ -f ${SCL_JAVA_DIR}/$2 ]; then +- echo "found ${SCL_JAVA_DIR}/$2" +- ln -s ${SCL_JAVA_DIR}/$2 ${_f%.jar}.jar +- elif [ -f /usr/share/java/$2 ]; then +- echo "found /usr/share/java/$2" +- ln -s /usr/share/java/$2 ${_f%.jar}.jar +- else +- echo "not found ${SCL_JAVA_DIR}/$2 or /usr/share/java/$2" +- exit 1 +- fi ++ for SCL_JAVA_DIR in ${SCL_JAVA_DIRS}; do ++ if [ -f ${SCL_JAVA_DIR}/$2 ]; then ++ echo "found ${SCL_JAVA_DIR}/$2" ++ ln -s ${SCL_JAVA_DIR}/$2 ${_f%.jar}.jar ++ return 0 ++ fi ++ done ++ echo "not found $2 in any of ${SCL_JAVA_DIRS}" ++ exit 1 + } + + pushd $1 +diff --git testbundle-to-eclipse-test/gatherBundles.sh testbundle-to-eclipse-test/gatherBundles.sh +index a388f4e..4379357 100755 +--- testbundle-to-eclipse-test/gatherBundles.sh ++++ testbundle-to-eclipse-test/gatherBundles.sh +@@ -32,15 +32,13 @@ pushd $sdk >/dev/null + (cd $eclipse/dropins/$f/eclipse; + ls -d plugins/* features/* 2>/dev/null) | + while read g; do +- [ ! -e $g ] && \ +- ln -s $eclipse/dropins/$f/eclipse/$g $g ++ ln -sf $eclipse/dropins/$f/eclipse/$g $g + done + else + (cd $eclipse/dropins/$f; + ls -d plugins/* features/* 2>/dev/null) | + while read g; do +- [ ! -e $g ] && \ +- ln -s $eclipse/dropins/$f/$g $g ++ ln -sf $eclipse/dropins/$f/$g $g + done + fi + done +@@ -50,15 +48,13 @@ pushd $sdk >/dev/null + (cd $datadir/dropins/$f/eclipse; + ls -d plugins/* features/* 2>/dev/null) | + while read g; do +- [ ! -e $g ] && \ +- ln -s $datadir/dropins/$f/eclipse/$g $g ++ ln -sf $datadir/dropins/$f/eclipse/$g $g + done + else + (cd $datadir/dropins/$f; + ls -d plugins/* features/* 2>/dev/null) | + while read g; do +- [ ! -e $g ] && \ +- ln -s $datadir/dropins/$f/$g $g ++ ln -sf $datadir/dropins/$f/$g $g + done + fi + done diff --git a/SOURCES/eclipse-support-symlink-bundles.patch b/SOURCES/eclipse-support-symlink-bundles.patch new file mode 100644 index 0000000..e0b75f6 --- /dev/null +++ b/SOURCES/eclipse-support-symlink-bundles.patch @@ -0,0 +1,159 @@ +From ca186bc5d8c8f0ecde78aab255c02eed414e3cb1 Mon Sep 17 00:00:00 2001 +From: Roland Grunberg +Date: Fri, 12 Sep 2014 10:27:14 -0400 +Subject: [PATCH] Add support for regenerating bundle versions for symlinks. + +When the version field in a bundle info file corresponds to a bundle +whose location is a symbolic link, the correct version should be +regenerated every time, in case a change has occured. + +Change-Id: Ifbe8efed2218a8a1250fd1ac59f0cdd6bdd5f309 +--- + .../META-INF/MANIFEST.MF | 1 + + .../utils/SimpleConfiguratorUtils.java | 104 ++++++++++++++++++++- + 2 files changed, 104 insertions(+), 1 deletion(-) + +diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF +index 7f339b5..38b881c 100644 +--- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF ++++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF +@@ -9,6 +9,7 @@ Bundle-Activator: org.eclipse.equinox.internal.simpleconfigurator.Activator + Bundle-ActivationPolicy: lazy + Import-Package: org.eclipse.osgi.framework.console;version="1.0.0";resolution:=optional, + org.eclipse.osgi.service.datalocation;version="1.0.0";resolution:=optional, ++ org.eclipse.osgi.util;version="1.1.0", + org.osgi.framework;version="1.3.0", + org.osgi.framework.namespace;version="1.0.0", + org.osgi.framework.wiring;version="1.2.0", +diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java +index ab69b88..bde62e0 100644 +--- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java ++++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java +@@ -13,9 +13,15 @@ package org.eclipse.equinox.internal.simpleconfigurator.utils; + + import java.io.*; + import java.net.*; ++import java.nio.file.Files; ++import java.nio.file.Paths; + import java.util.*; ++import java.util.jar.JarFile; ++import java.util.zip.ZipEntry; ++import java.util.zip.ZipFile; + import org.eclipse.equinox.internal.simpleconfigurator.Activator; +-import org.osgi.framework.Version; ++import org.eclipse.osgi.util.ManifestElement; ++import org.osgi.framework.*; + + public class SimpleConfiguratorUtils { + +@@ -283,6 +289,13 @@ public class SimpleConfiguratorUtils { + String symbolicName = tok.nextToken().trim(); + String version = tok.nextToken().trim(); + URI location = parseLocation(tok.nextToken().trim()); ++ URI absLoc = URIUtil.append(base, location.toString()); ++ // Symbolic links may change outside Eclipse so regenerate proper bundle version. ++ if (Files.isSymbolicLink(Paths.get(absLoc))) { ++ // We can't depend on org.eclipse.equinox.internal.frameworkadmin.utils.Utils ++ Dictionary manifest = getOSGiManifest(absLoc); ++ version = manifest.get(Constants.BUNDLE_VERSION); ++ } + int startLevel = Integer.parseInt(tok.nextToken().trim()); + boolean markedAsStarted = Boolean.valueOf(tok.nextToken()).booleanValue(); + BundleInfo result = new BundleInfo(symbolicName, version, location, startLevel, markedAsStarted); +@@ -421,4 +434,93 @@ public class SimpleConfiguratorUtils { + } + return regularTimestamp; + } ++ ++ private static Dictionary getOSGiManifest(URI location) { ++ if (location == null) ++ return null; ++ // if we have a file-based URL that doesn't end in ".jar" then... ++ if (FILE_SCHEME.equals(location.getScheme())) ++ return basicLoadManifest(URIUtil.toFile(location)); ++ ++ try { ++ URL url = new URL("jar:" + location.toString() + "!/"); //$NON-NLS-1$//$NON-NLS-2$ ++ JarURLConnection jarConnection = (JarURLConnection) url.openConnection(); ++ ZipFile jar = jarConnection.getJarFile(); ++ ++ try { ++ ZipEntry entry = jar.getEntry(JarFile.MANIFEST_NAME); ++ if (entry == null) ++ return null; ++ ++ Map manifest = ManifestElement.parseBundleManifest(jar.getInputStream(entry), null); ++ return manifestToProperties(manifest); ++ } catch (BundleException e) { ++ return null; ++ } finally { ++ jar.close(); ++ } ++ } catch (IOException e) { ++ if (System.getProperty("osgi.debug") != null) { //$NON-NLS-1$ ++ System.err.println("location=" + location); //$NON-NLS-1$ ++ e.printStackTrace(); ++ } ++ } ++ return null; ++ } ++ ++ private static Dictionary basicLoadManifest(File bundleLocation) { ++ InputStream manifestStream = null; ++ ZipFile jarFile = null; ++ try { ++ try { ++ // Handle a JAR'd bundle ++ if (bundleLocation.isFile()) { ++ jarFile = new ZipFile(bundleLocation, ZipFile.OPEN_READ); ++ ZipEntry manifestEntry = jarFile.getEntry(JarFile.MANIFEST_NAME); ++ if (manifestEntry != null) { ++ manifestStream = jarFile.getInputStream(manifestEntry); ++ } ++ } else { ++ // we have a directory-based bundle ++ File bundleManifestFile = new File(bundleLocation, JarFile.MANIFEST_NAME); ++ if (bundleManifestFile.exists()) ++ manifestStream = new BufferedInputStream(new FileInputStream(new File(bundleLocation, JarFile.MANIFEST_NAME))); ++ } ++ } catch (IOException e) { ++ //ignore ++ } ++ ++ try { ++ Map manifest = ManifestElement.parseBundleManifest(manifestStream, null); ++ return manifestToProperties(manifest); ++ } catch (IOException ioe) { ++ return null; ++ } catch (BundleException e) { ++ return null; ++ } ++ } finally { ++ try { ++ if (manifestStream != null) ++ manifestStream.close(); ++ } catch (IOException e1) { ++ //Ignore ++ } ++ try { ++ if (jarFile != null) ++ jarFile.close(); ++ } catch (IOException e2) { ++ //Ignore ++ } ++ } ++ } ++ ++ private static Dictionary manifestToProperties(Map d) { ++ Iterator iter = d.keySet().iterator(); ++ Dictionary result = new Hashtable(); ++ while (iter.hasNext()) { ++ String key = iter.next(); ++ result.put(key, d.get(key)); ++ } ++ return result; ++ } + } +-- +1.9.3 + diff --git a/SOURCES/eclipse-test-support.patch b/SOURCES/eclipse-test-support.patch index 828b5e5..35332b1 100644 --- a/SOURCES/eclipse-test-support.patch +++ b/SOURCES/eclipse-test-support.patch @@ -1,5 +1,19 @@ --- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig 2014-04-01 15:02:34.500445944 +0100 +++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2014-04-01 15:16:01.556714647 +0100 +@@ -24,13 +24,6 @@ + has to move to "top of file" ... outer scope? + + --> +- +- +- +- +- + + + @@ -292,8 +306,8 @@ -# assuming metacity attaches to "current" display by default (which should have -# already been set by Hudson). We echo its value here just for extra reference/cross-checks. - --echo "Check if any window managers are running (xfwm|twm|metacity|beryl|fluxbox|compiz|kwin):" --wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz|kwin" | grep -v egrep) +-echo "Check if any window managers are running (xfwm|twm|metacity|beryl|fluxbox|compiz|kwin|openbox|icewm):" +-wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz|kwin|openbox|icewm" | grep -v egrep) -echo "Window Manager processes: $wmpss" -echo - @@ -316,7 +330,7 @@ -echo - -echo "Triple check if any window managers are running (at least metacity should be!):" --wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz" | grep -v egrep) +-wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz|kwin|openbox|icewm" | grep -v egrep) -echo "Window Manager processes: $wmpss" -echo -echo "extdirprop in runtest: ${extdirprop}" diff --git a/SPECS/eclipse.spec b/SPECS/eclipse.spec index e944da8..324311a 100644 --- a/SPECS/eclipse.spec +++ b/SPECS/eclipse.spec @@ -1,6 +1,6 @@ %{?scl:%scl_package eclipse} %{!?scl:%global pkg_name %{name}} -%{!?scl:%global _scl_root %{nil}} +%{?java_common_find_provides_and_requires} # Set to 1 to build Eclipse without dependency to eclipse-pde # Some parts (help) will not be built, and second run will be required, @@ -12,9 +12,9 @@ Epoch: 1 %global eclipse_major 4 %global eclipse_minor 4 -%global eclipse_micro 0 -%global eb_commit 93cece6ca02e022b0d8d0816a9f6596b311ab774 -%global eclipse_tag R4_4 +%global eclipse_micro 2 +%global eb_commit 2135919f7f0f11f3c43901b8e70819c9a4911ac3 +%global eclipse_tag R4_4_2 %global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro} %global _jetty_version 9.0.3 @@ -23,7 +23,7 @@ Epoch: 1 %endif %ifarch %{arm} %define eclipse_arch arm -%endif +%endif %ifarch ppc64 ppc64p7 %define eclipse_arch ppc64 %endif @@ -39,7 +39,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: %{?scl_prefix}eclipse Version: %{eclipse_version} -Release: 7%{?dist} +Release: 3%{?dist} License: EPL Group: Development/Tools URL: http://www.eclipse.org/ @@ -111,15 +111,30 @@ Patch20: %{pkg_name}-no-target-platform.patch Patch21: %{pkg_name}-mockito.patch Patch22: %{pkg_name}-policy-comparators.patch -Patch23: %{pkg_name}-disable-mockito-tests.patch -Patch24: %{pkg_name}-disable-jdt-annotation-java8.patch -Patch25: %{pkg_name}-webkit-disable-favicon-db-sooner.patch -Patch26: %{pkg_name}-bug-444143.patch + +#Patch23: %{pkg_name}-webkit2-support.patch + +Patch25: %{pkg_name}-support-symlink-bundles.patch + +# Feature plugin definitions lock onto version of plugin at build-time. +# If plugin is external, updating it breaks the feature. (version changes) +# Workaround : Change definition to a 'requirement' and list +# the plugin in the top-level category so it still gets bundled. +Patch26: %{pkg_name}-feature-plugins-to-category-ius.patch + +# Patches for DTS +Patch28: eclipse-disable-mockito-tests.patch +Patch29: eclipse-disable-jdt-annotation-java8.patch +Patch30: eclipse-antrun-to-exec.patch +Patch31: eclipse-webkit-disable-favicon-db-sooner.patch +Patch32: eclipse-support-scls-for-symlink-script.patch BuildRequires: rsync BuildRequires: make, gcc BuildRequires: gtk2-devel +%if 0%{?rhel} >= 7 BuildRequires: gtk3-devel +%endif BuildRequires: glib2-devel BuildRequires: gcc-c++ BuildRequires: nspr-devel @@ -131,49 +146,54 @@ BuildRequires: unzip BuildRequires: desktop-file-utils BuildRequires: java-1.7.0-openjdk-devel BuildRequires: libXt-devel -BuildRequires: webkitgtk3-devel +%if 0%{?rhel} >= 7 BuildRequires: webkitgtk3 -BuildRequires: geronimo-annotation >= 1.0-7 -BuildRequires: %{?scl_prefix}icu4j-eclipse >= 1:52.1 -BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net -BuildRequires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf -BuildRequires: %{?scl_prefix}jsch >= 0:0.1.46-2 +BuildRequires: webkitgtk3-devel +%else +BuildRequires: webkitgtk +BuildRequires: webkitgtk-devel +%endif +BuildRequires: %{?scl_prefix_java_common}geronimo-annotation >= 1.0-7 +BuildRequires: %{?scl_prefix}icu4j >= 1:54.1.1-2 +BuildRequires: %{?scl_prefix_java_common}ant-antlr %{?scl_prefix_java_common}ant-apache-bcel %{?scl_prefix_java_common}ant-apache-log4j %{?scl_prefix_java_common}ant-apache-oro %{?scl_prefix_java_common}ant-apache-regexp %{?scl_prefix_java_common}ant-apache-resolver %{?scl_prefix_java_common}ant-commons-logging %{?scl_prefix_java_common}ant-apache-bsf %{?scl_prefix_java_common}ant-commons-net +BuildRequires: %{?scl_prefix_java_common}ant-javamail %{?scl_prefix_java_common}ant-jdepend %{?scl_prefix_java_common}ant-junit %{?scl_prefix_java_common}ant-swing %{?scl_prefix_java_common}ant-jsch %{?scl_prefix_java_common}ant-testutil %{?scl_prefix_java_common}ant-apache-xalan2 %{?scl_prefix_java_common}ant-jmf BuildRequires: %{?scl_prefix}apache-commons-el >= 1.0-22 -BuildRequires: apache-commons-logging -BuildRequires: apache-commons-codec >= 1.6-2 +BuildRequires: %{?scl_prefix_java_common}apache-commons-logging +BuildRequires: %{?scl_prefix_java_common}apache-commons-codec >= 1.6-2 BuildRequires: %{?scl_prefix}felix-gogo-command >= 0.12 BuildRequires: %{?scl_prefix}felix-gogo-shell >= 0.10.0-3 -BuildRequires: osgi(org.eclipse.jetty.util) >= %{_jetty_version} -BuildRequires: osgi(org.eclipse.jetty.server) >= %{_jetty_version} -BuildRequires: osgi(org.eclipse.jetty.http) >= %{_jetty_version} -BuildRequires: osgi(org.eclipse.jetty.continuation) >= %{_jetty_version} -BuildRequires: osgi(org.eclipse.jetty.io) >= %{_jetty_version} -BuildRequires: osgi(org.eclipse.jetty.security) >= %{_jetty_version} -BuildRequires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version} -BuildRequires: %{?scl_prefix}lucene-core >= 4.8.0-3 -BuildRequires: %{?scl_prefix}lucene-analysis >= 4.8.0-3 -BuildRequires: junit >= 4.10-5 -BuildRequires: hamcrest >= 0:1.1-11 +BuildRequires: %{?scl_prefix_java_common}jetty-util >= %{_jetty_version} +BuildRequires: %{?scl_prefix_java_common}jetty-server >= %{_jetty_version} +BuildRequires: %{?scl_prefix_java_common}jetty-http >= %{_jetty_version} +BuildRequires: %{?scl_prefix_java_common}jetty-continuation >= %{_jetty_version} +BuildRequires: %{?scl_prefix_java_common}jetty-io >= %{_jetty_version} +BuildRequires: %{?scl_prefix_java_common}jetty-security >= %{_jetty_version} +BuildRequires: %{?scl_prefix_java_common}jetty-servlet >= %{_jetty_version} +BuildRequires: %{?scl_prefix_java_common}jsch >= 0.1.46-2 +BuildRequires: %{?scl_prefix_java_common}lucene-core >= 4.8.0 +BuildRequires: %{?scl_prefix_java_common}lucene-analysis >= 4.8.0 +BuildRequires: %{?scl_prefix_java_common}junit >= 4.10-5 +BuildRequires: %{?scl_prefix_java_common}hamcrest >= 0:1.1-11 BuildRequires: %{?scl_prefix}sat4j >= 2.3.5-1 -BuildRequires: %{?scl_prefix}objectweb-asm >= 5.0.1-1 +BuildRequires: %{?scl_prefix_java_common}objectweb-asm5 >= 5.0.1-1 BuildRequires: zip -BuildRequires: sac >= 1.3-12 -BuildRequires: batik >= 1.8 -BuildRequires: xml-commons-apis >= 1.4.01-12 -BuildRequires: atinject >= 1-6 -BuildRequires: tycho >= 0.19 -BuildRequires: tycho-extras >= 0.19 -BuildRequires: %{?scl_prefix}eclipse-ecf-core >= 3.8.1-1.1 -BuildRequires: %{?scl_prefix}eclipse-emf-core >= 1:2.10.0-1.1 -BuildRequires: tomcat-servlet-3.0-api -BuildRequires: tomcat-el-2.2-api -BuildRequires: glassfish-jsp-api >= 2.2.1-4 -BuildRequires: glassfish-jsp >= 2.2.5 +BuildRequires: sac >= 1.3 +BuildRequires: %{?scl_prefix_java_common}batik >= 1.8 +BuildRequires: %{?scl_prefix_java_common}xml-commons-apis >= 1.4.01-12 +BuildRequires: %{?scl_prefix_java_common}atinject >= 1-6 +BuildRequires: %{?scl_prefix}tycho >= 0.22 +BuildRequires: %{?scl_prefix}tycho-extras >= 0.22 +BuildRequires: %{?scl_prefix}eclipse-ecf-core >= 3.9.1-2.5 +BuildRequires: %{?scl_prefix}eclipse-emf-core >= 1:2.10.2-2 +BuildRequires: %{?scl_prefix_java_common}glassfish-jsp-api >= 2.2.1-4 +BuildRequires: %{?scl_prefix_java_common}glassfish-jsp >= 2.2.5 +BuildRequires: %{?scl_prefix}glassfish-el >= 3.0.0 BuildRequires: %{?scl_prefix}glassfish-servlet-api >= 3.1.0 BuildRequires: %{?scl_prefix}cbi-plugins BuildRequires: xml-maven-plugin -BuildRequires: %{?scl_prefix}httpcomponents-core -BuildRequires: %{?scl_prefix}httpcomponents-client >= 4.3.5-1 +BuildRequires: %{?scl_prefix_maven}exec-maven-plugin +BuildRequires: %{?scl_prefix_java_common}httpcomponents-core +BuildRequires: %{?scl_prefix_java_common}httpcomponents-client BuildRequires: %{?scl_prefix}mockito %if ! %{bootstrap} BuildRequires: %{?scl_prefix}eclipse-pde @@ -188,19 +208,23 @@ everything in between. %package swt Summary: SWT Library for GTK+ Group: Development/Tools -Requires: java >= 1:1.7.0 -Requires: jpackage-utils -Requires: gtk2 +Requires: java-1.7.0-openjdk +Requires: %{?scl_prefix_java_common}javapackages-tools +%if 0%{?rhel} >= 7 Requires: gtk3 Requires: webkitgtk3 +%else +Requires: gtk2 +Requires: webkitgtk +%endif %description swt SWT Library for GTK+. %package equinox-osgi Summary: Eclipse OSGi - Equinox -Requires: java-headless >= 1:1.7.0 -Requires: javapackages-tools +Requires: java-1.7.0-openjdk +Requires: %{?scl_prefix_java_common}javapackages-tools Provides: osgi(system.bundle) = %{epoch}:%{eclipse_version} %description equinox-osgi @@ -209,42 +233,40 @@ Eclipse OSGi - Equinox %package platform Summary: Eclipse platform common files Group: Development/Tools -Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net -Requires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf +Requires: %{?scl_prefix_java_common}ant-antlr %{?scl_prefix_java_common}ant-apache-bcel %{?scl_prefix_java_common}ant-apache-log4j %{?scl_prefix_java_common}ant-apache-oro %{?scl_prefix_java_common}ant-apache-regexp %{?scl_prefix_java_common}ant-apache-resolver %{?scl_prefix_java_common}ant-commons-logging %{?scl_prefix_java_common}ant-apache-bsf %{?scl_prefix_java_common}ant-commons-net +Requires: %{?scl_prefix_java_common}ant-javamail %{?scl_prefix_java_common}ant-jdepend %{?scl_prefix_java_common}ant-junit %{?scl_prefix_java_common}ant-swing %{?scl_prefix_java_common}ant-jsch %{?scl_prefix_java_common}ant-testutil %{?scl_prefix_java_common}ant-apache-xalan2 %{?scl_prefix_java_common}ant-jmf Requires: %{?scl_prefix}apache-commons-el >= 1.0-23 -Requires: apache-commons-logging -Requires: apache-commons-codec >= 1.6-2 +Requires: %{?scl_prefix_java_common}apache-commons-logging +Requires: %{?scl_prefix_java_common}apache-commons-codec >= 1.6-2 Requires: %{?scl_prefix}felix-gogo-command >= 0.12 Requires: %{?scl_prefix}felix-gogo-shell >= 0.10.0-3 -Requires: osgi(org.eclipse.jetty.util) >= %{_jetty_version} -Requires: osgi(org.eclipse.jetty.server) >= %{_jetty_version} -Requires: osgi(org.eclipse.jetty.http) >= %{_jetty_version} -Requires: osgi(org.eclipse.jetty.continuation) >= %{_jetty_version} -Requires: osgi(org.eclipse.jetty.io) >= %{_jetty_version} -Requires: osgi(org.eclipse.jetty.security) >= %{_jetty_version} -Requires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version} -Requires: %{?scl_prefix}jsch >= 0.1.46-2 -Requires: %{?scl_prefix}lucene-core >= 4.8.0-3 -Requires: %{?scl_prefix}lucene-analysis >= 4.8.0-3 +Requires: %{?scl_prefix_java_common}jetty-util >= %{_jetty_version} +Requires: %{?scl_prefix_java_common}jetty-server >= %{_jetty_version} +Requires: %{?scl_prefix_java_common}jetty-http >= %{_jetty_version} +Requires: %{?scl_prefix_java_common}jetty-continuation >= %{_jetty_version} +Requires: %{?scl_prefix_java_common}jetty-io >= %{_jetty_version} +Requires: %{?scl_prefix_java_common}jetty-security >= %{_jetty_version} +Requires: %{?scl_prefix_java_common}jetty-servlet >= %{_jetty_version} +Requires: %{?scl_prefix_java_common}jsch >= 0.1.46-2 +Requires: %{?scl_prefix_java_common}lucene-core >= 4.8.0 +Requires: %{?scl_prefix_java_common}lucene-analysis >= 4.8.0 Requires: %{?scl_prefix}sat4j >= 2.3.5-1 -Requires: sac >= 1.3-12 -Requires: xml-commons-apis >= 1.4.01-12 -Requires: batik >= 1.8 -Requires: atinject >= 1-6 -Requires: geronimo-annotation >= 1.0-7 -Requires: %{?scl_prefix}eclipse-ecf-core >= 3.8.1-1.1 -Requires: %{?scl_prefix}eclipse-emf-core >= 1:2.10.0-1.1 -Requires: tomcat-servlet-3.0-api -Requires: tomcat-el-2.2-api -Requires: glassfish-jsp-api >= 2.2.1-4 -Requires: glassfish-jsp >= 2.2.5 +Requires: sac >= 1.3 +Requires: %{?scl_prefix_java_common}batik >= 1.8 +Requires: %{?scl_prefix_java_common}xml-commons-apis >= 1.4.01-12 +Requires: %{?scl_prefix_java_common}atinject >= 1-6 +Requires: %{?scl_prefix_java_common}geronimo-annotation >= 1.0-7 +Requires: %{?scl_prefix}eclipse-ecf-core >= 3.9.1-2.5 +Requires: %{?scl_prefix}eclipse-emf-core >= 1:2.10.2-2 +Requires: %{?scl_prefix_java_common}glassfish-jsp-api >= 2.2.1-4 +Requires: %{?scl_prefix_java_common}glassfish-jsp >= 2.2.5 +Requires: %{?scl_prefix}glassfish-el >= 3.0.0 Requires: %{?scl_prefix}glassfish-servlet-api >= 3.1.0 -Requires: %{?scl_prefix}icu4j-eclipse >= 1:52.1 +Requires: %{?scl_prefix}icu4j >= 1:54.1.1-2 Requires: %{name}-swt = %{epoch}:%{eclipse_version}-%{release} Requires: %{name}-equinox-osgi = %{epoch}:%{eclipse_version}-%{release} -Requires: %{?scl_prefix}httpcomponents-core -Requires: %{?scl_prefix}httpcomponents-client >= 4.3.5-1 -Requires: %{?scl_prefix}objectweb-asm >= 5.0.1-1 +Requires: %{?scl_prefix_java_common}httpcomponents-core +Requires: %{?scl_prefix_java_common}httpcomponents-client %{?scl:Requires: %scl_runtime} Obsoletes: %{name}-rcp < 1:4.3.0 Provides: %{name}-rcp = 1:%{eclipse_version}-%{release} @@ -257,8 +279,8 @@ Java Development Tools or the Plugin Development Environment. Summary: Eclipse Java Development Tools Group: Development/Tools Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release} -Requires: junit >= 4.10-5 -Requires: hamcrest >= 0:1.1-11 +Requires: %{?scl_prefix_java_common}junit >= 4.10-5 +Requires: %{?scl_prefix_java_common}hamcrest >= 0:1.1-11 %description jdt Eclipse Java Development Tools. This package is required to use Eclipse for @@ -270,7 +292,7 @@ Group: Development/Tools Provides: %{name} = %{epoch}:%{eclipse_version}-%{release} Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release} Requires: %{name}-jdt = %{epoch}:%{eclipse_version}-%{release} -Requires: %{?scl_prefix}objectweb-asm >= 5.0.1-1 +Requires: %{?scl_prefix_java_common}objectweb-asm5 >= 5.0.1-1 # For PDE Build wrapper script + creating jars Requires: zip Requires: bash @@ -279,12 +301,24 @@ Requires: bash Eclipse Plugin Development Environment. This package is required for developing Eclipse plugins. +%package p2-discovery +Summary: Eclipse p2 Discovery +Group: Development/Tools +Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release} +Obsoletes: %{name}-p2-discovery < 1:4.4.0 + +%description p2-discovery +The p2 Discovery mechanism provides a simplified and branded front-end for the +p2 provisioning platform. Discovery can be used as a tool to display and +install from existing P2 repositories or as a framework to build branded +installer UIs. + %package tests Summary: Eclipse Tests Group: Development/Tools Requires: %{name}-pde = %{epoch}:%{eclipse_version}-%{release} +Requires: %{?scl_prefix_java_common}easymock3 Requires: %{?scl_prefix}mockito -Requires: %{?scl_prefix}easymock >= 3.0 %description tests Eclipse Tests. @@ -317,10 +351,17 @@ tar --strip-components=1 -xf %{SOURCE1} %patch20 %patch21 %patch22 -%patch23 -%patch24 +#%patch23 %patch25 -%patch26 -p1 +%patch26 +%patch28 +%patch29 +%patch30 +%patch31 +%patch32 + +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +set -x #Disable as many things as possible to make the build faster. We care only for Eclipse. %pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder @@ -348,7 +389,6 @@ tar --strip-components=1 -xf %{SOURCE1} %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 bundles/org.eclipse.equinox.p2.tests.discovery rt.equinox.p2 %pom_disable_module bundles/org.eclipse.equinox.p2.tests.reconciler.product rt.equinox.p2 %pom_disable_module org.eclipse.ua.tests eclipse.platform.ua @@ -405,7 +445,7 @@ done for dir in eclipse.platform.swt.binaries/bundles \ rt.equinox.framework/bundles rt.equinox.binaries ; do utils/ensure_arch.sh "$dir" x86 arm - utils/ensure_arch.sh "$dir" x86_64 aarch64 ppc64le + utils/ensure_arch.sh "$dir" x86_64 aarch64 done # Don't mirror stuff to the repo that we haven't built @@ -420,6 +460,7 @@ done %pom_xpath_remove "pom:execution[pom:id[text()='mirror-org.eclipse.releng.tools']]" \ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository + # Remove the SWT build sections from every linux arch that is not currently being built # (this is not really necessary but further reduces the build time on arm by around 20 # minutes per architecture that we are not currently building, over 2.5 hours in total) @@ -432,14 +473,13 @@ sed -i -e '/^root\.[^l]/d' \ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties \ eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties -#hack - there should be a patch providing a profile for each arch +# Hack - this can go away once upstream grows arm and aarch64 support mkdir -p rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch} #pdebuild script should point to dropins sed -i -e "s|@DATADIR@|%{_datadir}|g" eclipse.pde.build/org.eclipse.pde.build/templates/package-build/build.properties - -#ensure that bundles with *.so libs are dirs, so no *.so is extracted into user.home +# Ensure that bundles with native artifacts are dir-shaped, so no *.so is extracted into user.home for f in `find eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.* -name MANIFEST.MF` ; do echo -e "Eclipse-BundleShape: dir\n\n" >> $f; done @@ -451,25 +491,13 @@ for f in `find eclipse.platform.team/bundles/org.eclipse.core.net/fragments -nam done %if 0%{?rhel} < 7 -# Remove unnecessary ant dependencies -sed -i '/ant-antlr/ d' dependencies/fake_ant_dependency.sh -sed -i '/ant-jdepend/ d' dependencies/fake_ant_dependency.sh -sed -i '/ant-javamail/ d' dependencies/fake_ant_dependency.sh -sed -i '/ant-commons-net/ d' dependencies/fake_ant_dependency.sh -sed -i '/ant-apache-log4j/ d' dependencies/fake_ant_dependency.sh -sed -i '/ant-apache-oro/ d' dependencies/fake_ant_dependency.sh -sed -i '/ant-apache-bcel/ d' dependencies/fake_ant_dependency.sh -sed -i '/ant-apache-regexp/ d' dependencies/fake_ant_dependency.sh - -# No GTK3 -sed -i '/machine_gtk3/ d' eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.%{eclipse_arch}/pom.xml +sed -i 's/-Dmachine_gtk3=1<\/argument>//' eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.%{eclipse_arch}/pom.xml # Manually place rhino at correction location in reactor cache mkdir -p .m2/rhino/js/1.7R2 pushd .m2/rhino/js/1.7R2 cp %{_root_datadir}/java/rhino.jar js-1.7R2.jar -cat << "EOF" > js-1.7R2.pom - +echo ' 4.0.0 @@ -478,109 +506,96 @@ cat << "EOF" > js-1.7R2.pom 1.7R2 jar Rhino - -EOF +' > js-1.7R2.pom popd + %endif #fake dependencies that don't exist in fedora -./dependencies/./fake_ant_dependency.sh .m2/p2/repo-sdk/plugins/org.apache.ant_* /usr/share/java /usr/bin -makejar +./dependencies/./fake_ant_dependency.sh .m2/p2/repo-sdk/plugins/org.apache.ant_* \ + %{_javadir_java_common} %{_bindir_java_common} -makejar -cp -r %{_javadir}/eclipse-license/eclipse/features/* .m2/p2/repo-sdk/features/ -cp -r %{_javadir}/emf/eclipse/features/* .m2/p2/repo-sdk/features/ -cp -r %{_javadir}/ecf/eclipse/features/* .m2/p2/repo-sdk/features/ -%{?scl: cp %{_javadir}/ecf/eclipse/plugins/* .m2/p2/repo-sdk/plugins} -%{?scl: cp %{_javadir}/*sat4j* .m2/p2/repo-sdk/plugins} -%if ! %{bootstrap} -cp -rf %{_libdir}/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_* .m2/p2/repo-sdk/plugins/ -cp -rf %{_libdir}/eclipse/dropins/sdk/plugins/org.eclipse.pde.core_* .m2/p2/repo-sdk/plugins/ -%else # Use org.eclipse.tycho:org.eclipse.jdt.core (ecj) sed -i -e 's@>org.eclipse.jdt<@>org.eclipse.tycho<@' eclipse-platform-parent/pom.xml -%endif - -# Bump batik from 1.7.0 to 1.6.0 -sed -i '/org\.apache\.batik/ s/1\.7\.0/1\.6\.0/' eclipse.platform.ui/bundles/org.eclipse.e4.ui.css.core/META-INF/MANIFEST.MF -sed -i 's/1\.7\.0/1\.6\.0/' eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml - -# Force usage of javax.servlet 3.1 -sed -i '/javax.servlet/ s/2\.4\.0/3\.1\.0/' eclipse.platform.ua/org.eclipse.help.webapp/META-INF/MANIFEST.MF # Allow usage of javax.servlet.jsp 2.3. sed -i '/javax\.servlet\.jsp/ s/2\.3/2\.4/' rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF +# Use com.sun.el.java.el (Glassfish) instead of javax.el (Tomcat) +sed -i 's/javax\.el/com\.sun\.el\.javax\.el/' \ + eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml \ + eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml + +# Use javax.servlet-api (Glassfish) instead of javax.servlet (Tomcat) +find -name feature.xml | xargs sed -i -e 's|"javax.servlet"|"javax.servlet-api"|' + # Bump javax.servlet Import-Package statements sed -i '/javax\.servlet/ s/3\.1/3\.2/' rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF sed -i '/javax\.servlet/ s/3\.1/3\.2/' rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF +# Bump Import-Package to accept only javax.servlet 3.1 +sed -i '/javax\.servlet/ s/2\.4\.0/3\.1\.0/' eclipse.platform.ua/org.eclipse.help.webapp/META-INF/MANIFEST.MF + %pom_remove_plugin org.mortbay.jetty:jetty-jspc-maven-plugin eclipse.platform.ua/org.eclipse.help.webapp sed -i -e 's@Dhelp.lucene.tokenizer=standard@XX:MaxPermSize=384M@g' eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml +# Remove generated files not present during bootstrap build +# org.eclipse.platform.doc.isv, org.eclipse.jdt.doc.isv, +# org.eclipse.pde.doc.user, org.eclipse.platform.doc.isv, +# org.eclipse.jdt.doc.isv, org.eclipse.pde.doc.user +%if %{bootstrap} +sed -i '18,47d' eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/assembly/assembly.xml +%endif + +%{?scl:EOF} + %build -%{?scl:scl enable %{scl} - << "EOF"} +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +set -x #This is the lowest value where the build succeeds. 512m is not enough. export MAVEN_OPTS="-Xmx1000m -XX:MaxPermSize=256m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}" export JAVA_HOME=%{java_home} +export GTK_VERSION=3.0 xmvn -o clean verify \ %if %{bootstrap} -P !api-generation,!build-docs \ %endif -Declipse.javadoc=/usr/bin/javadoc \ -Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} \ - -Dtycho.local.keepTarget -DbuildId=`echo "%{release}" | tr -d "."` \ - -Dtargets=install + -Dtycho.local.keepTarget -Ddirector.running.env.only=true \ + -Dfedora.p2.repos=`pwd`/.m2/p2/repo-sdk \ + -Dtargets=install -DbuildType=Z %{?scl:EOF} -# Use the packaged icu4j provided by Tycho -%if %{bootstrap} -sed -i '/ com\.ibm\.icu_ / d' dependencies/replace_platform_plugins_with_symlinks.sh -%endif - -# Tomcat provides javax.el -sed -i 's/com\.sun\.el\.javax\.el/javax\.el/' dependencies/replace_platform_plugins_with_symlinks.sh -sed -i 's/glassfish-el\.jar/tomcat-el-api\.jar/' dependencies/replace_platform_plugins_with_symlinks.sh - -# Fix path for objectweb-asm v5 (there is also objectweb-asm v3 in base) -sed -i 's/objectweb-asm/objectweb-asm5/' dependencies/replace_platform_plugins_with_symlinks.sh -# Fix path for Glassfish JSP API -sed -i 's|glassfish-jsp-api/javax\.servlet\.jsp-api\.jar|glassfish-jsp-api\.jar|' dependencies/replace_platform_plugins_with_symlinks.sh - -#symlink necessary plugins (that are provided by other packages) -dependencies/replace_platform_plugins_with_symlinks.sh \ - eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse %{_javadir} #ant again dependencies/fake_ant_dependency.sh \ eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse/plugins/org.apache.ant_* \ - /usr/share/java /usr/bin + %{_javadir_java_common} %{_bindir_java_common} # JDT and PDE are built as update sites. # Initialize them and move into dropins. utils/move_JDT_PDE_to_dropins.sh \ eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/ \ - `pwd`/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository + `pwd`/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository \ + "jdt cvs equinox.p2.discovery.feature sdk" -pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse +# Fix path for objectweb-asm (must use compat version in dts scl) +sed -i 's|objectweb-asm/\(.*\).jar|objectweb-asm5/\1-5.jar|' dependencies/replace_platform_plugins_with_symlinks.sh +# Fix path for Glassfish JSP API +sed -i 's|glassfish-jsp-api/javax\.servlet\.jsp-api\.jar|glassfish-jsp-api\.jar|' dependencies/replace_platform_plugins_with_symlinks.sh +# Fix path for Glassfish EL (must use the compat version in dts scl) +sed -i 's|glassfish-el|glassfish-el-3.0.0|' dependencies/replace_platform_plugins_with_symlinks.sh -# This is a temporary hack -# We offer javax.servlet and javax.servlet-api as the same bundle -# References to javax.servlet should be renamed -pushd plugins - f=`ls | grep -e "^javax.servlet-api_"` - rm -f $f - ln -s %{_javadir}/glassfish-servlet-api.jar $f -popd +# Symlink necessary plugins that are provided by other packages +dependencies/replace_platform_plugins_with_symlinks.sh \ + eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse \ +%{_javadir_java_common} \ +%{_javadir} \ +%{_root_datadir}/java -#in jdt -pushd dropins/jdt/plugins - f=`ls | grep -e "^org.hamcrest.core_"` - rm -rf $f - ln -s %{_root_datadir}/java/hamcrest/core.jar ${f%.jar}.jar - f=`ls | grep -e "^org.junit_4"` - rm -rf $f - ln -s %{_root_datadir}/java/junit.jar ${f%.jar}.jar -popd +pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse #clean up rm -rf configuration/org.eclipse.core.runtime @@ -591,17 +606,28 @@ rm -rf p2/org.eclipse.equinox.p2.core/cache/* # no icon needed rm -f icon.xpm +# EMF and ECF are packaged separately +rm -rf features/org.eclipse.emf.* plugins/org.eclipse.emf.* \ + features/org.eclipse.ecf.* plugins/org.eclipse.ecf.* plugins/org.eclipse.ecf_* + #delete all local repositories. We want to have only "original" by default. pushd p2/org.eclipse.equinox.p2.engine/.settings sed -i "/repositories\/file/d" *.prefs ../profileRegistry/SDKProfile.profile/.data/.settings/*.prefs sed -i "/repositories\/memory/d" *.prefs ../profileRegistry/SDKProfile.profile/.data/.settings/*.prefs popd -#ini file adjustements +# ini file adjustements sed -i "s|-Xms40m|-Xms128m|g" eclipse.ini -sed -i "s|-Xmx384m|-Xmx512m|g" eclipse.ini +sed -i "s|-Xmx512m|-Xmx1024m|g" eclipse.ini sed -i '1i-protect\nmaster' eclipse.ini +# Use GTK3 by default on F22 or newer +%if 0%{?rhel} >= 7 +sed -i '5i--launcher.GTK_version\n3' eclipse.ini +%else +sed -i '5i--launcher.GTK_version\n2' eclipse.ini +%endif + # Temporary fix until https://bugs.eclipse.org/294877 is resolved cat >> eclipse.ini <> eclipse.ini <> $RPM_BUILD_ROOT/%{_bindir}/%{pkg_name}-runEclipsePackageTests @@ -780,10 +820,9 @@ cp -r testbundle-to-eclipse-test $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/tes pushd $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/testbundle # Set the proper paths for scripts -%if 0%{?rhel} > 6 -sed -i 's|%{_datadir}/ant|%{_root_datadir}/ant|' $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.sh -sed -i 's|%{_bindir}/\./ant|%{_root_bindir}/\./ant|' $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.sh -%endif +sed -i 's|%{_datadir}/ant|%{_datadir_java_common}/ant|' $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.sh +sed -i 's|%{_bindir}/\./ant|%{_bindir_java_common}/\./ant|' $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.sh + sed -i 's|/usr/share/java|%{_javadir}|' prepRuntimeLocation.sh sed -i 's|\.\+/\(gatherBundles\.sh\)|%{_javadir}/eclipse-testing/testbundle/\1|' prepRuntimeLocation.sh sed -i 's|\.\+/\(genRepo\.sh\)|%{_javadir}/eclipse-testing/testbundle/\1|' prepAllTestBundles.sh @@ -792,7 +831,7 @@ sed -i 's|\.\+/\(prepAllTestBundles\.sh\)|%{_javadir}/eclipse-testing/testbundle sed -i 's|cp swtbot-library.xml alltest.xml updateTestBundleXML.sh target/|cp %{_javadir}/eclipse-testing/testbundle/{swtbot-library.xml,alltest.xml,updateTestBundleXML.sh} target/|' prepRuntimeLocation.sh for file in genRepo.sh gatherBundles.sh ;do - sed -i 's|scl_root=|scl_root=%{_scl_root}|' ${file} + sed -i 's|scl_root=|scl_root=%{?_scl_root}|' ${file} done mv $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/testbundle/%{pkg_name}-runTestBundles $RPM_BUILD_ROOT/%{_bindir}/%{pkg_name}-runTestBundles @@ -802,29 +841,25 @@ popd find $RPM_BUILD_ROOT/%{_libdir}/eclipse -name *.so -exec chmod a+x {} \; %post platform -touch --no-create %{_root_datadir}/icons/hicolor +touch --no-create /usr/share/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then - gtk-update-icon-cache -q %{_root_datadir}/icons/hicolor + gtk-update-icon-cache -q /usr/share/icons/hicolor fi %postun platform -touch --no-create %{_root_datadir}/icons/hicolor +touch --no-create /usr/share/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then - gtk-update-icon-cache -q %{_root_datadir}/icons/hicolor + gtk-update-icon-cache -q /usr/share/icons/hicolor fi - %files swt -%dir %{_libdir}/%{pkg_name} -%dir %{_libdir}/%{pkg_name}/plugins %{_libdir}/%{pkg_name}/notice.html %{_libdir}/%{pkg_name}/eclipse.ini %{_libdir}/%{pkg_name}/epl-v10.html %{_libdir}/%{pkg_name}/plugins/org.eclipse.swt_* %{_libdir}/%{pkg_name}/plugins/org.eclipse.swt.gtk.linux.* -%{_libdir}/%{pkg_name}/swt-gtk*.jar %{_libdir}/%{pkg_name}/swt.jar -%{_libdir}/../lib/java/swt.jar +%{_jnidir}/swt.jar %files platform -f .mfiles-platform %{_bindir}/%{pkg_name} @@ -834,29 +869,23 @@ fi /usr/share/applications/* /usr/share/pixmaps/* /usr/share/icons/*/*/apps/* -/usr/share/appdata/%{?scl_prefix}eclipse.appdata.xml +%{_datadir}/appdata/eclipse.appdata.xml %{_libdir}/%{pkg_name}/eclipse -%dir %{_libdir}/%{pkg_name}/dropins -%dir %{_datadir}/%{pkg_name}/ -%dir %{_datadir}/%{pkg_name}/dropins %dir %{_libdir}/%{pkg_name}/configuration/ +%dir %{_libdir}/%{pkg_name}/configuration/org.eclipse.equinox.simpleconfigurator/ %{_libdir}/%{pkg_name}/configuration/config.ini %{_libdir}/%{pkg_name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info -%dir %{_libdir}/%{pkg_name}/features/ %{_libdir}/%{pkg_name}/features/org.eclipse.platform_* %{_libdir}/%{pkg_name}/features/org.eclipse.e4.rcp_* %{_libdir}/%{pkg_name}/features/org.eclipse.rcp_* -%{_libdir}/%{pkg_name}/features/org.eclipse.emf.common_* -%{_libdir}/%{pkg_name}/features/org.eclipse.emf.ecore_* %{_libdir}/%{pkg_name}/features/org.eclipse.rcp.configuration_* -%{_libdir}/%{pkg_name}/plugins/asm* %{_libdir}/%{pkg_name}/plugins/com.ibm.icu_* %{_libdir}/%{pkg_name}/plugins/com.jcraft.jsch_* %{_libdir}/%{pkg_name}/plugins/javax.servlet-api_* -%{_libdir}/%{pkg_name}/plugins/javax.servlet_* %{_libdir}/%{pkg_name}/plugins/javax.servlet.jsp_* %{_libdir}/%{pkg_name}/plugins/javax.xml_* -%{_libdir}/%{pkg_name}/plugins/javax.el_* +%{_libdir}/%{pkg_name}/plugins/com.sun.el.javax.el_* +%{_libdir}/%{pkg_name}/plugins/javax.el* %{_libdir}/%{pkg_name}/plugins/javax.inject_*.jar %{_libdir}/%{pkg_name}/plugins/org.apache.ant_* %{_libdir}/%{pkg_name}/plugins/org.apache.batik.css_* @@ -886,10 +915,6 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.core.variables_* %{_libdir}/%{pkg_name}/plugins/org.eclipse.debug.core_* %{_libdir}/%{pkg_name}/plugins/org.eclipse.debug.ui_* -%{_libdir}/%{pkg_name}/plugins/org.eclipse.emf.common_* -%{_libdir}/%{pkg_name}/plugins/org.eclipse.emf.ecore.change_* -%{_libdir}/%{pkg_name}/plugins/org.eclipse.emf.ecore.xmi_* -%{_libdir}/%{pkg_name}/plugins/org.eclipse.emf.ecore_* %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.ds_* %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.event_* %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.http.jetty_* @@ -991,20 +1016,6 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.security.ui_* %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.extensionlocation_* %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.director.app_* -%{_libdir}/%{pkg_name}/features/org.eclipse.ecf.core.feature_* -%{_libdir}/%{pkg_name}/features/org.eclipse.ecf.core.ssl.feature_* -%{_libdir}/%{pkg_name}/features/org.eclipse.ecf.filetransfer.feature_* -%{_libdir}/%{pkg_name}/features/org.eclipse.ecf.filetransfer.httpclient4.feature_* -%{_libdir}/%{pkg_name}/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature_* -%{_libdir}/%{pkg_name}/features/org.eclipse.ecf.filetransfer.ssl.feature_* -%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.provider.filetransfer_* -%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient4_* -%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient4.ssl_* -%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.provider.filetransfer.ssl_* -%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.ssl_* -%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf_* -%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.filetransfer_* -%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.identity_* %{_libdir}/%{pkg_name}/plugins/org.sat4j.core_* %{_libdir}/%{pkg_name}/plugins/org.sat4j.pb_* %{_libdir}/%{pkg_name}/plugins/org.w3c.css.sac_* @@ -1042,15 +1053,23 @@ fi %doc %{_libdir}/%{pkg_name}/about.html %{_libdir}/%{pkg_name}/artifacts.xml %{_libdir}/%{pkg_name}/p2 +%{_javadir}/%{pkg_name}/core* +%{_javadir}/%{pkg_name}/equinox* -%files jdt -f .mfiles-jdt -%attr(0755,root,root) %{_bindir}/efj +%files jdt +%{_bindir}/efj +%{_datadir}/appdata/eclipse-jdt.metainfo.xml %{_libdir}/%{pkg_name}/dropins/jdt %files pde %{_bindir}/%{pkg_name}-pdebuild +%{_datadir}/appdata/eclipse-pde.metainfo.xml %{_libdir}/%{pkg_name}/buildscripts %{_libdir}/%{pkg_name}/dropins/sdk +%{_libdir}/%{pkg_name}/dropins/cvs + +%files p2-discovery +%{_libdir}/%{pkg_name}/dropins/equinox.p2.discovery.feature %files tests %{_bindir}/%{pkg_name}-runEclipsePackageTests @@ -1065,80 +1084,199 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_* %changelog -* Tue Oct 14 2014 Mat Booth - 1:4.4.0-7 -- Resolves: rhbz#1146976 - Rebuild for new eclipse-emf +* Tue Apr 07 2015 Mat Booth - 1:4.4.2-3 +- Resolves: rhbz#1208867 - Fix upgrade path from DTS3.0 -* Fri Sep 19 2014 Alexander Kurtakov 1:4.4.0-6 -- Fix for rhbz#1139573 . +* Wed Mar 04 2015 Mat Booth - 1:4.4.2-2 +- Rebuild for SR2 release of EMF -* Thu Aug 28 2014 Sami Wagiaalla - 1:4.4.0-5 -- Add R on objectweb-asm to the platform package. +* Mon Mar 02 2015 Mat Booth - 1:4.4.2-1 +- Update to Luna SR2 release. +- Drop upstreamed patches. +- Resolves: rhbz#1175105 -* Wed Aug 20 2014 Mat Booth - 1:4.4.0-4 -- Rebuild for new httpcomponents and ecf +* Mon Jan 26 2015 Roland Grunberg - 1:4.4.1-14.7 +- Fix Eclipse test framework. +- Resolves: rhbz#1185546, rhbz#1185549. -* Tue Jul 15 2014 Sami Wagiaalla - 1:4.4.0-3 -- Disable webkit icon database earlier. +* Mon Jan 26 2015 Mat Booth - 1:4.4.1-14.6 +- Resolves: rhbz#1185541, rhbz#1185542 +- Fix link to easymock in eclipse-tests package -* Fri Jul 11 2014 Sami Wagiaalla - 1:4.4.0-2 -- Add R/BR to devtoolset-3-jsch to fix broken symlink. +* Wed Jan 14 2015 Mat Booth - 1:4.4.1-14.5 +- Rebuild for latest emf/ecf/httpcomponents -* Tue Jul 01 2014 Mat Booth - 1:4.4.0-1 -- Update to final Luna release -- Rebuild against newer dependencies +* Sun Jan 11 2015 Roland Grunberg - 1:4.4.1-14.4 +- Non-bootstrap build. -* Thu Jun 26 2014 Roland Grunberg - 1:4.4.0-0.19.17.git201405252000 -- Update eclipse-build with improvements to bundle testing. +* Sun Jan 11 2015 Roland Grunberg - 1:4.4.1-14.3 +- Always use artifact alias org.eclipse.tycho:org.eclipse.jdt.core. +- We use version of Jasper that requires javax.el* (2.x). -* Fri Jun 20 2014 Sami Wagiaalla - 1:4.4.0-0.19.16.git201405252000 -- link to dts3 easymock jar. +* Sat Jan 10 2015 Roland Grunberg - 1:4.4.1-14.2 +- Fix Requires on gtk and webkitgtk. -* Fri Jun 06 2014 Roland Grunberg - 1:4.4.0-0.19.15.git201405252000 -- Fix testbundle-to-eclipse-test script packaging. +* Fri Jan 09 2015 Mat Booth - 1:4.4.1-14.1 +- Resolves: rhbz#1175105 - First version for DTS 3.1 -* Mon Jun 02 2014 Roland Grunberg - 1:4.4.0-0.19.14.git201405252000 -- Use SCL-ized httpcomponents-{core,client}. +* Wed Dec 10 2014 Alexander Kurtakov 1:4.4.1-14 +- Rebuild for new eclipse-ecf. -* Wed May 28 2014 Roland Grunberg - 1:4.4.0-0.19.13.git201405252000 -- Fix %%post/%%postun script paths. +* Tue Dec 9 2014 Alexander Kurtakov 1:4.4.1-13 +- Move to slimmer batik-css BR/R. -* Wed May 28 2014 Sami Wagialla - 1:4.4.0-0.19.12.git201405112000 -- Read easymock3 requirement to eclipse-test +* Sat Nov 29 2014 Roland Grunberg - 1:4.4.1-12 +- Make changes necessary for Tycho 0.22.0. -* Tue May 27 2014 Roland Grunberg - 1:4.4.0-0.19.11.git201405112000 -- Update to latest I-build. -- Pass eclipse.javadoc as param to mvn call to fix javadoc generation. +* Thu Nov 27 2014 Mat Booth - 1:4.4.1-11 +- Update eclipse-build snapshot +- Rebuild for ECF symlink changes + +* Wed Nov 19 2014 Mat Booth - 1:4.4.1-10 +- Update eclipse-build snapshot +- Rebuild for EMF and icu4j symlink changes +- Don't own dirs owned by eclipse-filesystem + +* Tue Nov 18 2014 Mat Booth - 1:4.4.1-9 +- Update dep on icu4j/ECF + +* Mon Nov 17 2014 Mat Booth - 1:4.4.1-8 +- Increase max heap size to 1024m + - But don't do this as a patch, it doesn't work +- Fix build ID to always be lexigraphically higher that upstream -* Tue May 27 2014 Roland Grunberg - 1:4.4.0-0.19.10.git201405112000 -- Fix some runtime issues with Eclipse. +* Wed Nov 12 2014 Mat Booth - 1:4.4.1-7 +- Backport patch to make workspace selection dialog visible in the task manager +- Tidy up SWT symlinks -* Mon May 26 2014 Roland Grunberg - 1:4.4.0-0.19.9.git201405112000 -- Remove EMF feature fix due to bootstrapping and rebuild against EMF. +* Wed Oct 29 2014 Roland Grunberg - 1:4.4.1-6 +- Change external plugin references to requirements. +- List external plugin references in the top-level category. -* Mon May 26 2014 Alexander Kurtakov 1:4.4.0-0.19.8.git201405112000 -- Reenable all tests now that mockito is built. +* Fri Oct 24 2014 Alexander Kurtakov 1:4.4.1-5 +- Rebuild for latest lucene. -* Wed May 21 2014 Roland Grunberg - 1:4.4.0-0.19.7.git201405112000 -- Temporarily remove R: on easymock and mockito. +* Mon Oct 20 2014 Roland Grunberg - 1:4.4.1-4 +- Support loading symlinked bundles when location changes. -* Wed May 21 2014 Alexander Kurtakov 1:4.4.0-0.19.6.git201405112000 +* Wed Oct 01 2014 Mat Booth - 1:4.4.1-3 +- Require latest EMF + +* Wed Oct 01 2014 Mat Booth - 1:4.4.1-2 +- Fix s390 launcher build + +* Fri Sep 26 2014 Mat Booth - 1:4.4.1-1 +- Update to Luna SR1 +- Drop upstreamed patch and fix permissions on appdata files + +* Tue Sep 16 2014 Alexander Kurtakov 1:4.4.0-19 +- Fix for autocomplete selection color. +- Rebuild for latest jetty. + +* Tue Sep 09 2014 Mat Booth - 1:4.4.0-18 +- Symlink more equinox and some core jars into javadir +- Enables tycho to unbundle it's eclipse platform jars +- Update dep on lucene + +* Sat Sep 6 2014 Alexander Kurtakov 1:4.4.0-17 +- Rebuild for lucene update. + +* Thu Aug 28 2014 Roland Grunberg - 1:4.4.0-16 - Non-bootstrap build. -* Wed May 21 2014 Alexander Kurtakov 1:4.4.0-0.19.5.git201405112000 -- Revert tomcat experiment - not good for RHEL yet. +* Wed Aug 27 2014 Roland Grunberg - 1:4.4.0-15 +- Build Eclipse bootstrapped. + +* Tue Aug 26 2014 Sami Wagiaalla - 1:4.4.0-15 +- Build agianst webkitgtk4. -* Wed May 21 2014 Alexander Kurtakov 1:4.4.0-0.19.4.git201405112000 -- Try build without tomcat. +* Tue Aug 19 2014 Mat Booth - 1:4.4.0-14 +- Rebuild against new ECF + +* Mon Aug 18 2014 Mat Booth - 1:4.4.0-13 +- Drop custom buildId, to keep it lexographically greater than upstream's + +* Sat Aug 16 2014 Fedora Release Engineering - 1:4.4.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Mon Jul 28 2014 Sami Wagiaalla 1:4.4.0-11 +- Add patch for webkit2 support. + +* Mon Jul 28 2014 Roland Grunberg - 1:4.4.0-10 +- Provide org.eclipse.tycho:org.eclipse.osgi.compatibility.state. + +* Mon Jul 21 2014 Alexander Kurtakov 1:4.4.0-9 +- Rebuild for new ecf and asm. + +* Wed Jul 16 2014 Mat Booth - 1:4.4.0-8 +- Update eclipse-build snapshot +- Tighten up deps on asm + +* Tue Jul 15 2014 Mat Booth - 1:4.4.0-7 +- Add appstream addon metadata for JDT and PDE plugins +- Only use GTK3 by default on F22 or newer, rhbz1118317 + +* Tue Jul 15 2014 Mat Booth - 1:4.4.0-6 +- Backport fix for eclipse bz438992 +- Only assemble products for current running target environment +- Tidy up some unnecessary SCL bits + +* Tue Jul 08 2014 Mat Booth - 1:4.4.0-5 +- Make GTK3 the default SWT implementation in eclipse.ini + +* Wed Jul 02 2014 Mat Booth - 1:4.4.0-4 +- Package the equinox.p2.discovery feature, obsolete the separate package +- Update e-b snapshot +- BR/R: gogo-command >= 0.14 +- Symlink mockito to system jar in testing package + +* Fri Jun 27 2014 Roland Grunberg - 1:4.4.0-3 +- Fix sed delimeter when dealing with paths. + +* Thu Jun 26 2014 Roland Grunberg - 1:4.4.0-2 +- Update eclipse-build with improvements to bundle testing. + +* Wed Jun 25 2014 Mat Booth - 1:4.4.0-1 +- Update to final Luna release +- Rebuild against newer dependencies + +* Tue Jun 24 2014 Alexander Kurtakov 1:4.4.0-0.31.git201406042000 +- Non bootstrap build. + +* Tue Jun 24 2014 Alexander Kurtakov 1:4.4.0-0.30.git201406042000 +- Bootstrap build for aarch64. + +* Fri Jun 13 2014 Michael Simacek - 1:4.4.0-0.29.git201406042000 +- Rebuild against new jetty + +* Tue Jun 10 2014 Alexander Kurtakov 1:4.4.0-0.28.git201406042000 +- Drop jdt mvn depmaps. + +* Thu Jun 05 2014 Mat Booth - 1:4.4.0-0.27.git201406042000 +- Remove pre-built launcher binaries +- Remove last uses of tomcat + +* Tue Jun 03 2014 Mat Booth - 1:4.4.0-0.26.git201406022000 +- Update to latest I-build + +* Fri May 30 2014 Michael Simacek - 1:4.4.0-0.25.git201405252000 +- Rebuild against new jetty + +* Tue May 27 2014 Alexander Kurtakov 1:4.4.0-0.24.git201405252000 +- Pass eclipse.javadoc as param to mvn call to fix javadoc generation. + +* Tue May 27 2014 Alexander Kurtakov 1:4.4.0-0.23.git201405252000 +- Update to latest I-build. -* Tue May 20 2014 Sami Wagialla 1:4.4.0-0.19.3.git201405112000 -- Remove devtoolset prefix from glassfish-servlet-api.jar link. -- Fix broken symlinks. +* Fri May 23 2014 Alexander Kurtakov 1:4.4.0-0.22.git201405112000 +- Rebuild for new lucene/junit metadata. -* Tue May 20 2014 Alexander Kurtakov 1:4.4.0-0.19.2.git201405112000 -- Another non-bootstrap build try. +* Wed May 21 2014 Alexander Kurtakov 1:4.4.0-0.21.git201405112000 +- Drop tomcat BR/Rs. -* Tue May 20 2014 Alexander Kurtakov 1:4.4.0-0.19.1.git201405112000 -- Nont bootstrap build. +* Wed May 21 2014 Alexander Kurtakov 1:4.4.0-0.20.git201405112000 +- Drop cglib dep. +- Apply jetty 9 patch unconditionally. * Mon May 19 2014 Mat Booth - 1:4.4.0-0.19.git201405112000 - Drop unnecessary BRs