From 7a492ac2b5daaba7f244d452f3488dc5aaf9d8af Mon Sep 17 00:00:00 2001 From: John Marino Date: Thu, 26 Jun 2014 08:48:10 +0000 Subject: java/eclipse: Update version 3.7.1 => 4.3.2 and assign maintainer At long last, eclipse has been updated to the latest release and is now under the stewardship of Jimmy Kelly. This version supports OpenJDK8 runtime environments. A special thanks to Jonathan Chen for getting the ball rolling after the PR stalled. PR: 188659 Submitted by: Jimmy Kelly Distfiles by: Jonathan Chen Verified by: F10/amd64 poudriere --- java/eclipse/files/patch-aggregator | 385 ++++++++++++++++++++++++++++++++++++ 1 file changed, 385 insertions(+) create mode 100644 java/eclipse/files/patch-aggregator (limited to 'java/eclipse/files/patch-aggregator') diff --git a/java/eclipse/files/patch-aggregator b/java/eclipse/files/patch-aggregator new file mode 100644 index 000000000000..091bbc21d519 --- /dev/null +++ b/java/eclipse/files/patch-aggregator @@ -0,0 +1,385 @@ +diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml +index ce98be7..fa2d1e1 100644 +--- a/eclipse-platform-parent/pom.xml ++++ b/eclipse-platform-parent/pom.xml +@@ -155,6 +155,12 @@ + + + ++ freebsd ++ gtk ++ %%ECLIPSE_ARCH%% ++ ++ + + + +@@ -308,11 +315,11 @@ + tycho-packaging-plugin + ${tycho.version} + +- ++ + + org.eclipse.tycho.extras + tycho-sourceref-jgit +@@ -322,14 +329,14 @@ + + false + 'v'yyyyMMdd-HHmm +- jgit ++ + + pom.xml + + ${jgit.dirtyWorkingTree} +- ++ + + false + +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml +index 81a82e1..dc2fdd9 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml +@@ -121,6 +121,12 @@ + p2 + + ++ freebsd ++ gtk ++ %%ECLIPSE_ARCH%% ++ ++ + + + +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml +index 60e4299..4c9106e 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml +@@ -112,6 +112,7 @@ + + + zip ++ tar.gz + tar.gz + tar.gz + +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml +index 14b8336..0b97442 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml +@@ -15,6 +15,8 @@ + + + ++ ++ + + + +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml +index 129d0a6..a8f76b6 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml +@@ -278,6 +278,16 @@ + fileName="launchers-win32.win32.x86_64.${BUILD_ID}.zip" /> + ++ ++ +@@ -346,6 +356,16 @@ + fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86_64.zip" /> + ++ ++ +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties +index 80a32e4..fcb7ed5 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties ++++ b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties +@@ -27,6 +27,11 @@ root.solaris.gtk.sparc.permissions.755=eclipse + root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86 + root.solaris.gtk.x86.permissions.755=eclipse + ++root.freebsd.gtk.x86=rootfiles/freebsd.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86 ++root.freebsd.gtk.x86.permissions.755=libcairo-swt.so,eclipse ++root.freebsd.gtk.x86_64=rootfiles/freebsd.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86_64 ++root.freebsd.gtk.x86_64.permissions.755=libcairo-swt.so,eclipse ++ + root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86 + root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse + root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc +@@ -69,10 +74,3 @@ root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse + root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse + + bin.includes = feature.properties +- +- +- +- +- +- +- +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml +index 2c342a3..5e27062 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml +@@ -20,6 +20,25 @@ + 2.6 + + ++ copy-resources-gtk.freebsd.%%ECLIPSE_ARCH%% ++ validate ++ ++ copy-resources ++ ++ ++ ${basedir}/rootfiles/freebsd.gtk.%%ECLIPSE_ARCH%% ++ ++ ++ ../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%% ++ ++ about_files/* ++ about.html ++ ++ ++ ++ ++ ++ + copy-resources-gtk.linux.x86 + validate + +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml +index bc261f9..88e8522 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml +@@ -91,6 +91,7 @@ + + + zip ++ tar.gz + tar.gz + tar.gz + +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf +index c2f679b..742fe0b 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf ++++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf +@@ -55,6 +55,23 @@ units.3.touchpoint.version=1.0.0 + units.3.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true); + units.3.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo); + ++requires.4.namespace=org.eclipse.equinox.p2.iu ++requires.4.name=toolingorg.eclipse.platform.configuration.gtk.freebsd.%%ECLIPSE_ARCH%% ++requires.4.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk)) ++requires.4.range=[1.0.0,1.0.0] ++requires.4.greedy=true ++ ++units.4.id=toolingorg.eclipse.platform.configuration.gtk.freebsd.%%ECLIPSE_ARCH%% ++units.4.version=1.0.0 ++units.4.provides.1.namespace=org.eclipse.equinox.p2.iu ++units.4.provides.1.name=toolingorg.eclipse.platform.configuration.gtk.freebsd.%%ECLIPSE_ARCH%% ++units.4.provides.1.version=1.0.0 ++units.4.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk)) ++units.4.touchpoint.id=org.eclipse.equinox.p2.osgi ++units.4.touchpoint.version=1.0.0 ++units.4.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true); ++units.4.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo); ++ + # Restrict range so we are not an automatic update for 3.x. + update.id = org.eclipse.platform.ide + update.range = [4.0,$version$) +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml +index d8468e6..b6c77d5 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml +@@ -92,6 +92,7 @@ + + + zip ++ tar.gz + tar.gz + tar.gz + +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties +index 80a32e4..fcb7ed5 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties ++++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties +@@ -27,6 +27,11 @@ root.solaris.gtk.sparc.permissions.755=eclipse + root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86 + root.solaris.gtk.x86.permissions.755=eclipse + ++root.freebsd.gtk.x86=rootfiles/freebsd.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86 ++root.freebsd.gtk.x86.permissions.755=libcairo-swt.so,eclipse ++root.freebsd.gtk.x86_64=rootfiles/freebsd.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86_64 ++root.freebsd.gtk.x86_64.permissions.755=libcairo-swt.so,eclipse ++ + root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86 + root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse + root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc +@@ -69,10 +74,3 @@ root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse + root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse + + bin.includes = feature.properties +- +- +- +- +- +- +- +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml +index bb03da8..75632a0 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml +@@ -20,6 +20,25 @@ + 2.6 + + ++ copy-resources-gtk.freebsd.%%ECLIPSE_ARCH%% ++ validate ++ ++ copy-resources ++ ++ ++ ${basedir}/rootfiles/freebsd.gtk.%%ECLIPSE_ARCH%% ++ ++ ++ ../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%% ++ ++ about_files/* ++ about.html ++ ++ ++ ++ ++ ++ + copy-resources-gtk.linux.x86 + validate + +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml +index 0ea4fd3..5bd93db 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml +@@ -91,6 +91,7 @@ + + + zip ++ tar.gz + tar.gz + tar.gz + +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml +index ce76451..3b40705 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml +@@ -91,6 +91,7 @@ + + + zip ++ tar.gz + tar.gz + tar.gz + +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml +index bf2f66a..5a37141 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml +@@ -91,6 +91,7 @@ + + + zip ++ tar.gz + tar.gz + tar.gz + +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf +index 6b59ed2..64975ba 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf ++++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf +@@ -89,6 +89,23 @@ units.5.touchpoint.version=1.0.0 + units.5.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true); + units.5.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo); + ++requires.6.namespace=org.eclipse.equinox.p2.iu ++requires.6.name=toolingorg.eclipse.sdk.configuration.gtk.freebsd.%%ECLIPSE_ARCH%% ++requires.6.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk)) ++requires.6.range=[1.0.0,1.0.0] ++requires.6.greedy=true ++ ++units.6.id=toolingorg.eclipse.sdk.configuration.gtk.freebsd.%%ECLIPSE_ARCH%% ++units.6.version=1.0.0 ++units.6.provides.1.namespace=org.eclipse.equinox.p2.iu ++units.6.provides.1.name=toolingorg.eclipse.sdk.configuration.gtk.freebsd.%%ECLIPSE_ARCH%% ++units.6.provides.1.version=1.0.0 ++units.6.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk)) ++units.6.touchpoint.id=org.eclipse.equinox.p2.osgi ++units.6.touchpoint.version=1.0.0 ++units.6.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true); ++units.6.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo); ++ + # Restrict range so we are not an automatic update for 3.x. + update.id= org.eclipse.sdk.ide + update.range = [4.0,$version$) +--- a/pom.xml.orig 2014-06-05 16:00:15.000000000 -0500 ++++ a/pom.xml 2014-06-19 18:03:47.000000000 -0500 +@@ -50,6 +50,6 @@ + + eclipse.platform.releng + eclipse.platform.releng.tychoeclipsebuilder +- eclipse.platform.repository ++ + + -- cgit v1.2.3