diff --git a/eclipse-adjust-droplets.patch b/eclipse-adjust-droplets.patch deleted file mode 100644 index c751924..0000000 --- a/eclipse-adjust-droplets.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java -index 5fc0e73..ed7e4fa 100644 ---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java -+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java -@@ -150,7 +150,20 @@ public class EngineActivator implements BundleActivator { - } - continue; - } -- File[] listFiles = extension.listFiles(); -+ -+ // Support the additional 'eclipse' directory if it exists. -+ File[] extensionFiles = extension.listFiles(new FilenameFilter() { -+ public boolean accept(File dir, String name) { -+ return name.equals("eclipse"); -+ } -+ }); -+ -+ File[] listFiles; -+ if (extensionFiles.length == 1) { -+ listFiles = extensionFiles[0].listFiles(); -+ } else { -+ listFiles = extension.listFiles(); -+ } - // new magic - multiple info files, f.e. - // egit.info (git feature) - // cdt.link (properties file containing link=path) to other info file -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 12e4d89..77945ef 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 -@@ -160,7 +160,20 @@ public class SimpleConfiguratorUtils { - } - continue; - } -- File[] listFiles = extension.listFiles(); -+ -+ // Support the additional 'eclipse' directory if it exists. -+ File[] extensionFiles = extension.listFiles(new FilenameFilter() { -+ public boolean accept(File dir, String name) { -+ return name.equals("eclipse"); -+ } -+ }); -+ -+ File[] listFiles; -+ if (extensionFiles.length == 1) { -+ listFiles = extensionFiles[0].listFiles(); -+ } else { -+ listFiles = extension.listFiles(); -+ } - // new magic - multiple info files, f.e. - // egit.info (git feature) - // cdt.link (properties file containing link=path) to other info file diff --git a/eclipse-debug-symbols.patch b/eclipse-debug-symbols.patch index 3338e0b..9d9d63d 100644 --- a/eclipse-debug-symbols.patch +++ b/eclipse-debug-symbols.patch @@ -12,7 +12,7 @@ if [ "${OS}" = "" ]; then --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak.orig 2019-03-20 10:22:21.420240101 +0000 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak 2019-03-20 10:53:53.375471427 +0000 -@@ -92,7 +92,7 @@ +@@ -82,7 +82,7 @@ -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" \ -DGIO_LIB="\"libgio-2.0.so.0\"" -DGLIB_LIB="\"libglib-2.0.so.0\"" LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic diff --git a/eclipse-disable-uses-constraints.patch b/eclipse-disable-uses-constraints.patch index 5a56e61..43278ee 100644 --- a/eclipse-disable-uses-constraints.patch +++ b/eclipse-disable-uses-constraints.patch @@ -12,7 +12,7 @@ diff --git rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/fe index ded683f..7216865 100755 --- rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java +++ rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java -@@ -1231,7 +1231,9 @@ public class ResolverImpl implements Resolver +@@ -1234,7 +1234,9 @@ public class ResolverImpl implements Resolver { public void run() { diff --git a/eclipse-feature-plugins-to-category-ius.patch b/eclipse-feature-plugins-to-category-ius.patch index 78ee4b7..1b1e5ff 100644 --- a/eclipse-feature-plugins-to-category-ius.patch +++ b/eclipse-feature-plugins-to-category-ius.patch @@ -1,23 +1,26 @@ -From 42b1d14319f47d477f057a14aa1e2481729c6b13 Mon Sep 17 00:00:00 2001 +From 6dd34f0b0365e0529f3852c688bfd99519f035d1 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 6 Dec 2018 11:38:58 +0000 -Subject: [PATCH 1/2] Change features bundling third-party modules to feature - requirements +Subject: [PATCH] IU inclusion changes: +* Change features bundling third-party modules to feature requirements +* Make some IU name changes to accommodate for distro-specific packaging --- .../org.eclipse.jdt-feature/feature.xml | 114 ++----------- .../org.eclipse.pde-feature/feature.xml | 16 +- - .../org.eclipse.platform.doc.isv/pom.xml | 11 +- + .../bundles/org.eclipse.jdt.doc.isv/pom.xml | 2 +- + .../bundles/org.eclipse.pde.doc.user/pom.xml | 2 +- + .../org.eclipse.platform.doc.isv/pom.xml | 10 +- .../org.eclipse.help-feature/feature.xml | 130 +++------------ .../org.eclipse.platform-feature/feature.xml | 18 +-- .../org.eclipse.sdk.tests/feature.xml | 58 ++----- .../org.eclipse.test-feature/feature.xml | 56 +------ .../org.eclipse.tips.feature/feature.xml | 11 +- .../features/org.eclipse.e4.rcp/feature.xml | 150 ++---------------- - 9 files changed, 83 insertions(+), 481 deletions(-) + 11 files changed, 87 insertions(+), 480 deletions(-) diff --git a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml b/eclipse.jdt/org.eclipse.jdt-feature/feature.xml -index 06887d901..364cae9d8 100644 +index e12ef6a13..6deae2a13 100644 --- a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml +++ b/eclipse.jdt/org.eclipse.jdt-feature/feature.xml @@ -19,6 +19,23 @@ @@ -44,7 +47,7 @@ index 06887d901..364cae9d8 100644 @@ -149,7 +152,7 @@ index 06887d901..364cae9d8 100644 id="org.eclipse.jdt.doc.user" download-size="0" diff --git a/eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml b/eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml -index 4197cffde..85ab44540 100644 +index 57a58c6d5..a9c3e2c9b 100644 --- a/eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml +++ b/eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml @@ -21,6 +21,8 @@ @@ -182,25 +185,52 @@ index 4197cffde..85ab44540 100644 eclipse-plugin + + +- javax.annotation ++ javax.annotation-api + eclipse-plugin + + +diff --git a/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml b/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml +index 16a7a02dc..23ffa475a 100644 +--- a/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml ++++ b/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml +@@ -119,7 +119,7 @@ + eclipse-plugin + + +- javax.annotation ++ javax.annotation-api + eclipse-plugin + + diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml -index f3432dba5..c70631e90 100644 +index 5b9e03021..1702d4dc6 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml -@@ -78,12 +78,7 @@ +@@ -78,12 +78,12 @@ eclipse-plugin - javax.annotation -- 0.0.0 -- -- -- eclipse-plugin ++ javax.annotation-api + 0.0.0 + + + eclipse-plugin - javax.el + javax.el-api 0.0.0 -@@ -75,7 +70,7 @@ +@@ -93,7 +93,7 @@ eclipse-plugin @@ -209,7 +239,7 @@ index f3432dba5..c70631e90 100644 0.0.0 -@@ -95,7 +90,7 @@ +@@ -118,7 +118,7 @@ eclipse-plugin @@ -218,8 +248,17 @@ index f3432dba5..c70631e90 100644 0.0.0 +@@ -287,7 +287,7 @@ + eclipse-plugin + + +- javax.annotation ++ javax.annotation-api + eclipse-plugin + + 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 853db711d..5195b6d59 100644 +index 79fa77d7e..5f3d6f6d0 100644 --- a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml @@ -21,69 +21,6 @@ @@ -372,7 +411,7 @@ index 853db711d..5195b6d59 100644 + diff --git a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml -index f825d4539..a9b974ca5 100644 +index 94f21e6f8..694d49dc1 100644 --- a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml @@ -19,6 +19,11 @@ @@ -415,7 +454,7 @@ index f825d4539..a9b974ca5 100644 id="org.eclipse.compare.core" download-size="0" diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml -index a3a7d14a0..f0dab84a3 100644 +index 6d7659ab9..23f4e6524 100644 --- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml @@ -19,6 +19,15 @@ @@ -434,7 +473,7 @@ index a3a7d14a0..f0dab84a3 100644 -@@ -421,20 +430,6 @@ +@@ -427,20 +436,6 @@ install-size="0" version="0.0.0"/> @@ -455,7 +494,7 @@ index a3a7d14a0..f0dab84a3 100644 @@ -498,7 +537,7 @@ index a3a7d14a0..f0dab84a3 100644 id="org.eclipse.ui.tests.pluginchecks" download-size="0" diff --git a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml -index 1dcc94c1c..2a4871027 100644 +index 1f422b76e..9e26326c3 100644 --- a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml @@ -19,6 +19,14 @@ @@ -576,7 +615,7 @@ index 1dcc94c1c..2a4871027 100644 - diff --git a/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml b/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml -index 88d843b0f..d5b8195bc 100644 +index b8f52fe1a..a1d866a52 100644 --- a/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml +++ b/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml @@ -32,6 +32,10 @@ @@ -603,7 +642,7 @@ index 88d843b0f..d5b8195bc 100644 - diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml -index ba217da7b..464451193 100644 +index 0ce4361be..ac28b73c2 100644 --- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml +++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml @@ -22,6 +22,23 @@ @@ -763,7 +802,7 @@ index ba217da7b..464451193 100644 @@ -791,7 +830,7 @@ index ba217da7b..464451193 100644 @@ -806,5 +845,5 @@ index ba217da7b..464451193 100644 id="org.eclipse.e4.emf.xpath" download-size="0" -- -2.19.1 +2.21.1 diff --git a/eclipse-fix-dropins.patch b/eclipse-fix-dropins.patch index 69fd3aa..e3efe03 100644 --- a/eclipse-fix-dropins.patch +++ b/eclipse-fix-dropins.patch @@ -76,7 +76,7 @@ } --- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java.orig 2019-09-13 14:42:54.512346840 +0100 +++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java 2019-09-13 14:43:12.003296065 +0100 -@@ -159,8 +159,7 @@ +@@ -158,8 +158,7 @@ @Override public boolean performCancel() { diff --git a/eclipse-fix-tests.patch b/eclipse-fix-tests.patch index 8712cd5..2bfb1d0 100644 --- a/eclipse-fix-tests.patch +++ b/eclipse-fix-tests.patch @@ -1,6 +1,6 @@ --- eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/MinimalTargetDefinitionPersistenceTests.java.orig 2016-04-19 20:07:36.947017206 +0100 +++ eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/MinimalTargetDefinitionPersistenceTests.java 2016-04-19 20:09:59.166077383 +0100 -@@ -76,7 +76,7 @@ +@@ -80,7 +80,7 @@ */ protected IPath getJdtFeatureLocation() { IPath path = new Path(TargetPlatform.getDefaultLocation()); @@ -13,7 +13,7 @@ diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/eq index f1f38f0..f9111e6 100644 --- rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java +++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java -@@ -217,7 +217,7 @@ +@@ -246,7 +246,7 @@ if (parent != null) { File[] children = parent.listFiles((FileFilter) pathname -> { String name = pathname.getName(); diff --git a/eclipse-hide-droplets-from-install-wizard.patch b/eclipse-hide-droplets-from-install-wizard.patch index c261fef..729b2ae 100644 --- a/eclipse-hide-droplets-from-install-wizard.patch +++ b/eclipse-hide-droplets-from-install-wizard.patch @@ -1,17 +1,19 @@ -commit 4bfc5a7c6d8c2aaf954c113d805419472de2bcaf -Author: Mat Booth -Date: Thu May 3 15:58:49 2018 +0100 +From a23545ef5b4cbb94ff048fda2839ba08c3593d50 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Thu, 3 May 2018 15:58:49 +0100 +Subject: [PATCH] Bug 534326 - Awkward p2 UI when many droplets are installed + Filter out software site locations where we know that they are p2 droplets in + places we show the list to the user. Change-Id: + I12364223850862783cb7cffd32fb7428fbf6b270 Signed-off-by: Mat Booth + - Bug 534326 - Awkward p2 UI when many droplets are installed - - Filter out software site locations where we know that they are p2 - droplets in places we show the list to the user. - - Change-Id: I12364223850862783cb7cffd32fb7428fbf6b270 - Signed-off-by: Mat Booth +--- + .../p2/ui/dialogs/RepositorySelectionGroup.java | 13 +++++++++++++ + .../equinox/p2/ui/RepositoryManipulationPage.java | 15 ++++++++++++++- + 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java -index e6eef8c39..fe5970e79 100644 +index d07be5d43..c666f8fdc 100644 --- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java +++ b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java @@ -303,6 +303,19 @@ public class RepositorySelectionGroup { @@ -35,7 +37,7 @@ index e6eef8c39..fe5970e79 100644 final String[] items; if (hasLocalSites) { diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java -index d796aefd0..c03924f90 100644 +index 78fb5398e..b8e724b66 100644 --- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java +++ b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java @@ -133,9 +133,22 @@ public class RepositoryManipulationPage extends PreferencePage implements IWorkb @@ -43,22 +45,25 @@ index d796aefd0..c03924f90 100644 Object[] children = super.fetchChildren(o, monitor); cachedElements = new Hashtable<>(children.length); + String fragments = System.getProperty("p2.fragments"); //$NON-NLS-1$ - for (int i = 0; i < children.length; i++) { - if (children[i] instanceof MetadataRepositoryElement) { -- put((MetadataRepositoryElement) children[i]); + for (Object element : children) { + if (element instanceof MetadataRepositoryElement) { +- put((MetadataRepositoryElement) element); + // Filter out locations that are actually installed p2 droplets + if (fragments != null) { + boolean isDroplet = false; + for (String root : fragments.split(",")) { //$NON-NLS-1$ -+ URI childLoc = ((MetadataRepositoryElement) children[i]).getLocation(); ++ URI childLoc = ((MetadataRepositoryElement) element).getLocation(); + if (childLoc.getPath() != null && childLoc.getPath().startsWith(root)) { + isDroplet = true; + } + } + if (!isDroplet) { -+ put((MetadataRepositoryElement) children[i]); ++ put((MetadataRepositoryElement) element); + } + } } } } +-- +2.21.1 + diff --git a/eclipse-ignore-version-when-calculating-home.patch b/eclipse-ignore-version-when-calculating-home.patch index 6e95c61..d2b50d2 100644 --- a/eclipse-ignore-version-when-calculating-home.patch +++ b/eclipse-ignore-version-when-calculating-home.patch @@ -1,22 +1,26 @@ ---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java.orig 2014-03-24 12:06:59.530918305 +0000 -+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java 2014-03-24 12:07:42.709932098 +0000 -@@ -1348,7 +1348,7 @@ +diff --git a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java +index 144571914..7e99bc880 100644 +--- a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java ++++ b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java +@@ -1330,7 +1330,7 @@ public class Main { String appVersion = props.getProperty(PRODUCT_SITE_VERSION); if (appVersion == null || appVersion.trim().length() == 0) appVersion = ""; //$NON-NLS-1$ - appName += File.separator + appId + "_" + appVersion + "_" + installDirHash; //$NON-NLS-1$ //$NON-NLS-2$ -+ appName += File.separator + appId + "_" + installDirHash; //$NON-NLS-1$ //$NON-NLS-2$ ++ appName += File.separator + appId + "_" + installDirHash; //$NON-NLS-1$ } catch (IOException e) { - // Do nothing if we get an exception. We will default to a standard location + // Do nothing if we get an exception. We will default to a standard location // in the user's home dir. ---- rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java.orig 2014-03-24 12:05:52.666896971 +0000 -+++ rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java 2014-03-24 12:06:46.076914704 +0000 -@@ -308,7 +308,7 @@ +diff --git a/rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java b/rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java +index 0c13ace6f..d92d4fc45 100755 +--- a/rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java ++++ b/rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java +@@ -308,7 +308,7 @@ public class EquinoxLocations { String appVersion = props.getProperty(PRODUCT_SITE_VERSION); if (appVersion == null || appVersion.trim().length() == 0) appVersion = ""; //$NON-NLS-1$ - appName += File.separator + appId + "_" + appVersion + "_" + installDirHash; //$NON-NLS-1$ //$NON-NLS-2$ -+ appName += File.separator + appId + "_" + installDirHash; //$NON-NLS-1$ //$NON-NLS-2$ ++ appName += File.separator + appId + "_" + installDirHash; //$NON-NLS-1$ } catch (IOException e) { - // Do nothing if we get an exception. We will default to a standard location + // Do nothing if we get an exception. We will default to a standard location // in the user's home dir. diff --git a/eclipse-pde-tp-support-droplets.patch b/eclipse-pde-tp-support-droplets.patch index d8ddc39..59ae65d 100644 --- a/eclipse-pde-tp-support-droplets.patch +++ b/eclipse-pde-tp-support-droplets.patch @@ -1,4 +1,4 @@ -From 72e58be8c9c5fbc6f6527318b4381a58cebfc120 Mon Sep 17 00:00:00 2001 +From 7843458db4b359cbee040c17ddda21d5fa6ddd35 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Thu, 7 Apr 2016 10:23:49 -0400 Subject: [PATCH] Support reading BundleInfo from p2 Droplets enabled @@ -6,28 +6,26 @@ Subject: [PATCH] Support reading BundleInfo from p2 Droplets enabled - Additionally support reading source bundles from p2 Droplets location --- - ui/org.eclipse.pde.core/META-INF/MANIFEST.MF | 3 +- - .../src/org/eclipse/pde/internal/core/P2Utils.java | 48 +++++++++++++++++++--- - 2 files changed, 45 insertions(+), 6 deletions(-) + .../org.eclipse.pde.core/META-INF/MANIFEST.MF | 1 + + .../eclipse/pde/internal/core/P2Utils.java | 50 +++++++++++++++++-- + 2 files changed, 46 insertions(+), 5 deletions(-) -diff --git eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF -index 7c20994..ab702e3 100644 ---- eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF -+++ eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF -@@ -105,6 +105,7 @@ Require-Bundle: +diff --git a/eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF b/eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF +index f045abd5b..864665785 100644 +--- a/eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF ++++ b/eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF +@@ -102,5 +102,6 @@ Require-Bundle: org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)" Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 --Import-Package: com.ibm.icu.util -+Import-Package: com.ibm.icu.util, -+ org.eclipse.equinox.internal.simpleconfigurator.utils ++Import-Package: org.eclipse.equinox.internal.simpleconfigurator.utils Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.pde.core -diff --git eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java -index fbd4b81..55cd40e 100644 ---- eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java -+++ eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java -@@ -17,8 +17,9 @@ +diff --git a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java +index 696d2318f..7ab4596d5 100644 +--- a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java ++++ b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java +@@ -17,8 +17,9 @@ package org.eclipse.pde.internal.core; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -39,7 +37,7 @@ index fbd4b81..55cd40e 100644 import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -@@ -31,7 +32,9 @@ +@@ -31,7 +32,9 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; @@ -49,7 +47,7 @@ index fbd4b81..55cd40e 100644 import org.eclipse.equinox.p2.core.IProvisioningAgent; import org.eclipse.equinox.p2.core.IProvisioningAgentProvider; import org.eclipse.equinox.p2.engine.IEngine; -@@ -60,6 +63,7 @@ +@@ -60,6 +63,7 @@ import org.eclipse.pde.core.plugin.IPluginModelBase; import org.eclipse.pde.core.plugin.TargetPlatform; import org.eclipse.pde.internal.build.BundleHelper; import org.eclipse.pde.internal.core.plugin.PluginBase; @@ -57,7 +55,7 @@ index fbd4b81..55cd40e 100644 import org.osgi.framework.Constants; /** -@@ -139,7 +143,16 @@ +@@ -139,7 +143,16 @@ public class P2Utils { try { URL bundlesTxt = new URL(configurationArea.getProtocol(), configurationArea.getHost(), new File(configurationArea.getFile(), SimpleConfiguratorManipulator.BUNDLES_INFO_PATH).getAbsolutePath()); File home = basePath.toFile(); @@ -75,7 +73,7 @@ index fbd4b81..55cd40e 100644 if (bundles == null || bundles.length == 0) { return null; } -@@ -168,11 +181,38 @@ +@@ -168,11 +181,38 @@ public class P2Utils { try { File home = basePath.toFile(); URL srcBundlesTxt = new URL(configurationArea.getProtocol(), configurationArea.getHost(), configurationArea.getFile().concat(SimpleConfiguratorManipulator.SOURCE_INFO_PATH)); @@ -117,4 +115,5 @@ index fbd4b81..55cd40e 100644 PDECore.log(e); return null; -- -2.7.4 +2.21.1 + diff --git a/eclipse-support-symlink-bundles.patch b/eclipse-support-symlink-bundles.patch index 17f2e56..26de5cf 100644 --- a/eclipse-support-symlink-bundles.patch +++ b/eclipse-support-symlink-bundles.patch @@ -24,7 +24,7 @@ index d88d0a6..07fe087 100644 + 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", + org.osgi.framework.startlevel;version="1.0.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..d6bf121 100644 --- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java diff --git a/eclipse-swt-avoid-javascript-at-build.patch b/eclipse-swt-avoid-javascript-at-build.patch index e3d873b..8de5935 100644 --- a/eclipse-swt-avoid-javascript-at-build.patch +++ b/eclipse-swt-avoid-javascript-at-build.patch @@ -1,5 +1,18 @@ ---- eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml.orig 2019-05-01 16:18:20.026476746 +0100 -+++ eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml 2019-05-01 16:18:30.068453716 +0100 +From dd7d5dd0a820b3efd1a7955a7b80c881a40ddafc Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Sat, 21 Mar 2020 15:29:00 +0000 +Subject: [PATCH] Avoid the need to have javascript interpreter in the build + root + +--- + .../bundles/binaries-parent/pom.xml | 17 ------ + .../bundles/org.eclipse.swt/buildSWT.xml | 53 ++++--------------- + 2 files changed, 11 insertions(+), 59 deletions(-) + +diff --git a/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml b/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml +index 4d209cfdc..eab439ae5 100644 +--- a/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml ++++ b/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml @@ -75,23 +75,6 @@ @@ -7,8 +20,8 @@ - - - org.mozilla -- rhino -- 1.7.11 +- rhino-runtime +- 1.7.12 - - - org.apache.ant @@ -24,9 +37,11 @@ ---- eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml.orig 2019-05-01 15:19:21.784965731 +0100 -+++ eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml 2019-05-01 16:40:48.623849151 +0100 -@@ -399,27 +399,8 @@ +diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml +index 9d4bb1b6f..6c1cdf690 100644 +--- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml ++++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml +@@ -374,27 +374,8 @@ @@ -55,7 +70,7 @@ -@@ -548,11 +529,7 @@ +@@ -523,11 +504,7 @@ @@ -68,7 +83,7 @@ -@@ -686,23 +663,15 @@ +@@ -661,23 +638,15 @@ @@ -101,3 +116,6 @@ +-- +2.21.1 + diff --git a/eclipse-test-support.patch b/eclipse-test-support.patch deleted file mode 100644 index 2fbac97..0000000 --- a/eclipse-test-support.patch +++ /dev/null @@ -1,320 +0,0 @@ ---- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig 2017-04-19 12:47:51.000000000 +0100 -+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2017-04-19 20:15:38.781348810 +0100 -@@ -39,21 +39,6 @@ - arg1="${testPlugin}" - arg2="org.eclipse.equinox.p2.tests.discovery" /> - -- -- -- -- -- -- -- - - - -@@ -61,7 +46,7 @@ - - -+ value="${eclipse-home}" /> - - - -@@ -96,19 +81,6 @@ - name="setupRepo" - depends="init" - unless="testRepoCreated"> -- -- -- -- -- -- -- -- -- - - - - -+ removeNotFollowedSymlinks="true" failonerror="false" verbose="false"> -+ -+ - - - - -- -+ removeNotFollowedSymlinks="true" failonerror="false" verbose="false"> -+ -+ - - - - -+ removeNotFollowedSymlinks="true" failonerror="false" verbose="false"> -+ -+ - -@@ -333,11 +307,10 @@ - -- -- - -+ removeNotFollowedSymlinks="true" failonerror="false" verbose="false"> -+ -+ - -@@ -561,7 +534,7 @@ - unless="currentUpdateSite"> - -+ value="file:${repoLocation}" /> - - - - -@@ -823,7 +796,7 @@ - - -+ value="file:${repoLocation}" /> - - - -@@ -1887,6 +1860,7 @@ - --> - - -+ - - - -@@ -1948,6 +1922,8 @@ - - - -+ -+ - -@@ -2057,6 +2033,20 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -- - - - -@@ -2099,7 +2087,6 @@ - - - -- - - - -@@ -2115,7 +2102,6 @@ - - - -- - - - ---- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh.orig 2017-03-03 12:36:38.576140783 +0000 -+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh 2017-03-03 12:40:39.324608342 +0000 -@@ -6,6 +6,45 @@ - # version. - # https://bugs.eclipse.org/bugs/show_bug.cgi?id=437069 - -+function findXvncAndSetDisplay() { -+ # Try to find Xvnc -+ xvnc= -+ if [ -a /usr/bin/Xvnc ] -+ then -+ xvnc=/usr/bin/Xvnc -+ setupXvnc -+ else -+ if [ -a /usr/X11/bin/Xvnc ] -+ then -+ xvnc=/usr/X11/bin/Xvnc -+ setupXvnc -+ else -+ echo "Couldn't find Xvnc (/usr/bin/Xvnc or /usr/X11/bin/Xvnc). Using DISPLAY=0:0" -+ DISPLAY=$($HOST):0.0 -+ fi -+ fi -+ export DISPLAY -+} -+ -+function setupXvnc() { -+ # Pick a high display number. -+ port=`expr '(' $RANDOM '*' 9 / 32767 ')' + 58` -+ echo localhost > Xvnc.cfg -+ echo "Setting up Xvnc on port ${port} with password VNCpassword1" -+ $xvnc :$port -screen 1 1024x768x32 -auth Xvnc.cfg -localhost -PasswordFile eclipse-tests-vncpwd &> Xvnc.log & -+ Xvncpid=$! -+ DISPLAY=$($HOST):$port -+} -+ -+function cleanupXvnc() { -+ # Clean up if we used Xvnc -+ if [ -e Xvnc.cfg ] -+ then -+ kill $Xvncpid -+ rm Xvnc.cfg -+ fi -+} -+ - echo "command line as passed into $(basename ${0}): ${*}" - echo "command line (quoted) as passed into $(basename ${0}): ${@}" - -@@ -166,6 +205,8 @@ - if [[ "true" == "${START_WINDOW_MGT}" ]] - then - ./startWindowManager.sh -+else -+ findXvncAndSetDisplay - fi - - # During production tests, we define 'testedPlatform' as a combination of -@@ -199,6 +240,7 @@ - echo "platformString: ${platformString}" - echo "testedPlatform: ${testedPlatform}" - -+ANT_OPTS="${ANT_OPTS} -DtestedPlatform=${testedPlatform}" - # -Dtimeout=300000 "${ANT_OPTS}" - if [[ -n "${extdirproperty}" ]] - then -@@ -209,4 +251,4 @@ - $jvm ${ANT_OPTS} ${platformArgString} -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml ${ANT_OPTS} ${platformParmString} -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger $tests 2>&1 | tee $consolelogs - fi - -- -+cleanupXvnc ---- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml.orig 2017-04-19 19:39:39.382960089 +0100 -+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml 2017-04-19 20:04:36.088575077 +0100 -@@ -137,6 +137,15 @@ - -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - - - -+ -+ -+ -+ -+ -+ - - - -- -+ - - - -@@ -329,7 +349,7 @@ - output="${junit-report-output}/${classname}.txt"> - - -- -+ - - - diff --git a/eclipse.spec b/eclipse.spec index 902f440..31888a3 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -10,10 +10,10 @@ Epoch: 1 %global eb_commit c985e357223668b4bc1fb76ea6b9e0c12829b7e8 %global eclipse_rel %{version} -%global eclipse_tag R-%{eclipse_rel}-201912100610 +%global eclipse_tag R-%{eclipse_rel}-202003050155 -%global _jetty_version 9.4.24 -%global _lucene_version 8.1.1 +%global _jetty_version 9.4.27 +%global _lucene_version 8.4.1 %global _batik_version 1.11 %ifarch %{ix86} @@ -41,8 +41,8 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse -Version: 4.14 -Release: 5%{?dist} +Version: 4.15 +Release: 1%{?dist} License: EPL-2.0 URL: http://www.eclipse.org/ @@ -71,8 +71,6 @@ Patch4: eclipse-secondary-arches.patch Patch5: eclipse-debug-symbols.patch -#Patch6: eclipse-test-support.patch - # https://bugs.eclipse.org/bugs/show_bug.cgi?id=408138 Patch12: eclipse-fix-dropins.patch @@ -94,7 +92,6 @@ Patch14: eclipse-support-symlink-bundles.patch Patch15: eclipse-fix-tests.patch # Droplet fixes -Patch16: eclipse-adjust-droplets.patch Patch17: eclipse-pde-tp-support-droplets.patch # Disable uses by default @@ -119,18 +116,15 @@ Patch24: eclipse-swt-avoid-javascript-at-build.patch # Avoid optional dep used only for tests Patch25: eclipse-patch-out-fileupload-dep.patch -# Fix regression in ant support -Patch26: fix-ant-execution.patch - # Force a clean on the restart after p2 operations -Patch27: force-clean-after-p2-operations.patch - -# Backported from: https://bugs.eclipse.org/bugs/show_bug.cgi?id=559637 -Patch28: fix-build-gcc-10.patch +Patch26: force-clean-after-p2-operations.patch # Upstream no longer supports non-64bit arches ExcludeArch: s390 %{arm} %{ix86} +# Build with Java 11 +BuildRequires: java-11-openjdk-devel + BuildRequires: maven-local BuildRequires: tycho BuildRequires: tycho-extras @@ -159,7 +153,7 @@ BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(webkit2gtk-4.0) -BuildRequires: icu4j >= 1:64.2 +BuildRequires: icu4j >= 1:65.1 BuildRequires: ant >= 1.10.5 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf BuildRequires: ant-commons-net ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf ant-xz ant-junit5 @@ -195,8 +189,8 @@ BuildRequires: google-gson BuildRequires: xmlgraphics-commons >= 2.3 BuildRequires: xml-commons-apis BuildRequires: atinject -BuildRequires: eclipse-ecf-core >= 3.14.6 -BuildRequires: eclipse-emf-core >= 1:2.20.0 +BuildRequires: eclipse-ecf-core >= 3.14.7 +BuildRequires: eclipse-emf-core >= 1:2.21.0 BuildRequires: eclipse-license2 BuildRequires: glassfish-annotation-api BuildRequires: glassfish-el-api >= 3.0.1 @@ -278,15 +272,15 @@ Requires: batik-util >= %{_batik_version} Requires: xmlgraphics-commons >= 2.3 Requires: xml-commons-apis Requires: atinject -Requires: eclipse-ecf-core >= 3.14.6 -Requires: eclipse-emf-core >= 1:2.20.0 +Requires: eclipse-ecf-core >= 3.14.7 +Requires: eclipse-emf-core >= 1:2.21.0 Requires: glassfish-annotation-api Requires: glassfish-el-api >= 3.0.1 Requires: glassfish-el >= 3.0.1 Requires: glassfish-jsp-api >= 2.2.1-4 Requires: glassfish-jsp >= 2.2.5 Requires: glassfish-servlet-api >= 3.1.0 -Requires: icu4j >= 1:64.2 +Requires: icu4j >= 1:65.1 Requires: %{name}-swt = %{epoch}:%{version}-%{release} Requires: %{name}-equinox-osgi = %{epoch}:%{version}-%{release} Requires: httpcomponents-core @@ -355,7 +349,6 @@ Summary: Tools for Eclipse Contributors Obsoletes: %{name}-tests < 1:4.14-2 Requires: %{name}-platform = %{epoch}:%{version}-%{release} -Requires: easymock Requires: hamcrest Requires: mockito >= 2.23.9 @@ -386,17 +379,15 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/ %patch0 %patch1 -%patch2 +%patch2 -p1 %patch3 %patch4 -p1 %patch5 -#%patch6 %patch12 %patch13 -p1 %patch14 %patch15 -%patch16 -%patch17 +%patch17 -p1 %patch18 %patch19 %patch20 @@ -406,11 +397,9 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/ %endif %patch22 %patch23 -p1 -%patch24 +%patch24 -p1 %patch25 %patch26 -p1 -%patch27 -p1 -%patch28 -p1 # Optional (unused) multipart support (see patch 25) rm rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/multipart/MultipartSupport{Impl,FactoryImpl,Part}.java @@ -442,8 +431,6 @@ sed -i -e '/jgit.dirtyWorkingTree>/afalse %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.console.ssh rt.equinox.bundles -%pom_disable_module bundles/org.eclipse.equinox.console.ssh.tests rt.equinox.bundles -%pom_disable_module bundles/org.eclipse.equinox.console.tests 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.j9 rt.equinox.bundles @@ -454,9 +441,7 @@ sed -i -e '/jgit.dirtyWorkingTree>/afalse %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.reconciler.product rt.equinox.p2 %pom_disable_module bundles/org.eclipse.equinox.p2.artifact.optimizers rt.equinox.p2 -%pom_disable_module bundles/org.eclipse.equinox.p2.tests.optimizers rt.equinox.p2 %pom_disable_module bundles/org.eclipse.equinox.p2.artifact.processors rt.equinox.p2 %pom_disable_module bundles/org.eclipse.equinox.p2.artifact.checksums.bouncycastle rt.equinox.p2 @@ -601,6 +586,9 @@ sed -i -e '/<\/excludes>/i' \ # Prevent dep cycle %pom_xpath_remove "plugin[@id='org.eclipse.core.tests.harness']" eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml +# Don't require easymock +%pom_xpath_remove "import[@plugin='org.easymock']" eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml + # Include maven descriptors to allow our test execution setup to work %pom_xpath_set "pom:plugin[pom:artifactId = 'tycho-packaging-plugin']/pom:configuration/pom:archive/pom:addMavenDescriptor" "true" eclipse-platform-parent @@ -682,7 +670,7 @@ export M_ARCH="$LDFLAGS" #This is the lowest value where the build succeeds. 512m is not enough. export MAVEN_OPTS="-Xmx1024m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}" -export JAVA_HOME=%{_jvmdir}/java +export JAVA_HOME=%{_jvmdir}/java-11 # Pre-build agent jar needed for AdvancedSourceLookupSupport sed -i -e '/createSourcesJar/d' -e 's/7\.2/7.0/' eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/pom.xml @@ -697,7 +685,7 @@ QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +v%Y%m%d-%H%M) %if %{with bootstrap} -P !api-generation,!build-docs \ %endif - -Declipse.javadoc=/usr/bin/javadoc -Dnative=gtk.linux.%{eclipse_arch} \ + -Declipse.javadoc=%{_jvmdir}/java-11/bin/javadoc -Dnative=gtk.linux.%{eclipse_arch} \ -Dtycho.local.keepTarget \ -Dfedora.p2.repos=$(pwd)/.m2/p2/repo-sdk/plugins -DbuildType=X @@ -936,6 +924,7 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.e4.ui.css.swt.theme_* %{_eclipsedir}/plugins/org.eclipse.e4.ui.di_* %{_eclipsedir}/plugins/org.eclipse.e4.ui.dialogs_* +%{_eclipsedir}/plugins/org.eclipse.e4.ui.ide_* %{_eclipsedir}/plugins/org.eclipse.e4.ui.model.workbench_* %{_eclipsedir}/plugins/org.eclipse.e4.ui.services_* %{_eclipsedir}/plugins/org.eclipse.e4.ui.swt.gtk_* @@ -1071,6 +1060,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Sat Mar 21 2020 Mat Booth - 1:4.15-1 +- Update to latest upstream release + * Tue Jan 28 2020 Mat Booth - 1:4.14-5 - Backport patch to fix build against GCC 10 diff --git a/fix-ant-execution.patch b/fix-ant-execution.patch deleted file mode 100644 index 7507593..0000000 --- a/fix-ant-execution.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/eclipse.platform/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/AntSecurityManager.java b/eclipse.platform/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/AntSecurityManager.java -index b6c0d1e68..a35e683d7 100644 ---- a/eclipse.platform/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/AntSecurityManager.java -+++ b/eclipse.platform/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/AntSecurityManager.java -@@ -21,13 +21,6 @@ - import java.security.Permission; - import java.util.PropertyPermission; - --import org.eclipse.ant.core.AntCorePlugin; --import org.eclipse.ant.core.AntSecurityException; --import org.eclipse.ant.internal.launching.AntLaunching; --import org.eclipse.core.runtime.IStatus; --import org.eclipse.core.runtime.Platform; --import org.eclipse.core.runtime.Status; -- - /** - * A security manager that always throws an AntSecurityException if the calling thread attempts to cause the Java Virtual Machine to - * exit/halt or if the restricted thread attempts to set a System property. Otherwise this manager just delegates to the pre-existing manager passed -@@ -415,10 +408,8 @@ - } - - private static void logDeprecatedAccess(Throwable e) { -- Platform.getLog(AntCorePlugin.getPlugin().getBundle()).log(new Status(IStatus.WARNING, AntLaunching.PLUGIN_ID, RemoteAntMessages.getString("AntSecurityManager.deprecatedMethod"), e)); //$NON-NLS-1$ - } - - private static void logException(Throwable e) { -- Platform.getLog(AntCorePlugin.getPlugin().getBundle()).log(new Status(IStatus.ERROR, AntLaunching.PLUGIN_ID, e.getLocalizedMessage(), e)); - } - } diff --git a/fix-build-gcc-10.patch b/fix-build-gcc-10.patch deleted file mode 100644 index 4ab2bc3..0000000 --- a/fix-build-gcc-10.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 39e14aa3c638f36173f2a8747f524b9273857bee Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Tue, 28 Jan 2020 15:57:33 +0000 -Subject: [PATCH] Bug 559637 - SWT fails to build with GCC 10 - -Fixes build failure caused by global variable with multiple definitions -by declaring it with "extern" in the header - -Change-Id: Id34c07cddde21baa4c00e97eb4a457855c37906c -Signed-off-by: Mat Booth ---- - -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h -index e56bd8f..8389585 100644 ---- "a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h" -+++ "b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h" -@@ -105,7 +105,7 @@ - glong g_utf8_offset_to_utf16_offset(const gchar*, glong); - - // Cached JVM pointer: see bug 521487. --JavaVM *cached_jvm; -+extern JavaVM *cached_jvm; - - #define SWT_TYPE_FIXED (swt_fixed_get_type ()) - #define SWT_FIXED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SWT_TYPE_FIXED, SwtFixed)) diff --git a/force-clean-after-p2-operations.patch b/force-clean-after-p2-operations.patch index f83d5bd..c1e0d3c 100644 --- a/force-clean-after-p2-operations.patch +++ b/force-clean-after-p2-operations.patch @@ -18,8 +18,8 @@ index 497e5d6fa..a118a0e4c 100644 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.launcher;singleton:=true --Bundle-Version: 1.5.600.qualifier -+Bundle-Version: 1.5.601.qualifier +-Bundle-Version: 1.5.700.qualifier ++Bundle-Version: 1.5.701.qualifier Main-Class: org.eclipse.equinox.launcher.Main Bundle-ClassPath: . Bundle-Vendor: %providerName @@ -31,8 +31,8 @@ index 43849b5b8..c5d2cdfea 100644 org.eclipse.equinox org.eclipse.equinox.launcher -- 1.5.600-SNAPSHOT -+ 1.5.601-SNAPSHOT +- 1.5.700-SNAPSHOT ++ 1.5.701-SNAPSHOT eclipse-plugin diff --git a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java