From 22ade32a301aaf94ca4c6c854687f6bac8fdde2e Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sep 13 2019 14:02:52 +0000 Subject: Update to latest upstream release --- diff --git a/eclipse-debug-symbols.patch b/eclipse-debug-symbols.patch index 60016c2..3338e0b 100644 --- a/eclipse-debug-symbols.patch +++ b/eclipse-debug-symbols.patch @@ -21,31 +21,6 @@ -fpic \ -DLINUX \ -DDEFAULT_OS="\"$(DEFAULT_OS)\"" \ ---- rt.equinox.bundles/bundles/org.eclipse.equinox.security.linux.x86_64/keystorelinuxnative/makefile.orig 2019-03-19 22:40:23.145082352 +0000 -+++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.linux.x86_64/keystorelinuxnative/makefile 2019-03-20 09:29:20.370457348 +0000 -@@ -1,7 +1,8 @@ - LIBSECRET_CFLAGS = `pkg-config --cflags libsecret-1` - LIBSECRET_LIBS = `pkg-config --libs libsecret-1` - --CFLAGS = -shared -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux" -+CFLAGS := $(CFLAGS) -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux" $(LIBSECRET_CFLAGS) -+LDFLAGS := $(LDFLAGS) -shared $(LIBSECRET_LIBS) - - all: ../libkeystorelinuxnative.so - -@@ -9,10 +10,10 @@ - rm ../libkeystorelinuxnative.so ../target/keystoreLinuxNative.o - - ../libkeystorelinuxnative.so: ../target/keystoreLinuxNative.o -- $(CC) $(CFLAGS) -o $@ $< $(LIBSECRET_LIBS) -+ $(CC) $(LDFLAGS) -o $@ $< - - ../target/keystoreLinuxNative.o: ../target keystoreLinuxNative.c -- $(CC) -c -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux" -o $@ $(TESTFLAGS) $(LIBSECRET_CFLAGS) keystoreLinuxNative.c -+ $(CC) -c $(CFLAGS) -o $@ $(TESTFLAGS) keystoreLinuxNative.c - - ../target: - mkdir -p ../target --- eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux/makefile.orig 2019-03-20 09:49:40.694899138 +0000 +++ eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux/makefile 2019-03-20 10:20:21.704664294 +0000 @@ -25,10 +25,10 @@ diff --git a/eclipse-ebz542708.patch b/eclipse-ebz542708.patch deleted file mode 100644 index d1696ae..0000000 --- a/eclipse-ebz542708.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ceaa5685fe7f51dae0ce444407d2aea7a49b8896 Mon Sep 17 00:00:00 2001 -From: Lakshminarayana Nekkanti -Date: Mon, 3 Jun 2019 15:12:13 +0530 -Subject: Bug 542708 - stale JRE shown in Package Explorer after changing it - from 9 or above to 11 - -Change-Id: Ia9ef62a7e90fb12c9107bfaaf2f47af97fca75fb -Signed-off-by: Lakshminarayana Nekkanti ---- - .../jdt/internal/ui/packageview/PackageExplorerContentProvider.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerContentProvider.java b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerContentProvider.java -index ff62fa9eda..143364142a 100644 ---- a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerContentProvider.java -+++ b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerContentProvider.java -@@ -657,7 +657,7 @@ public class PackageExplorerContentProvider extends StandardJavaElementContentPr - return false; - } - // if the class path has changed we refresh the entire project -- if ((flags & IJavaElementDelta.F_RESOLVED_CLASSPATH_CHANGED) != 0) { -+ if ((flags & (IJavaElementDelta.F_CLASSPATH_CHANGED | IJavaElementDelta.F_RESOLVED_CLASSPATH_CHANGED)) != 0) { - postRefresh(element, ORIGINAL, element, runnables); - return false; - } --- -cgit v1.2.1 - diff --git a/eclipse-ebz548211-2.patch b/eclipse-ebz548211-2.patch deleted file mode 100644 index fff6f28..0000000 --- a/eclipse-ebz548211-2.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 9ecc34bf838eae50a356b20c76d35fb62a423563 Mon Sep 17 00:00:00 2001 -From: Stephan Herrmann -Date: Tue, 18 Jun 2019 16:28:49 +0200 -Subject: Bug 548211 - "Remove" in the Module dependencies tab does not remove - system modules - -- more fixes, concerning update on Apply and re-open with only java.base - -Change-Id: I39a7a1da6c8ae733010009372fd36a88814e4faf ---- - .../ui/wizards/buildpaths/BuildPathsBlock.java | 3 +++ - .../ui/wizards/buildpaths/CPListElement.java | 24 +++++++++++++++------- - .../wizards/buildpaths/ModuleDependenciesPage.java | 13 ++++++++++++ - 3 files changed, 33 insertions(+), 7 deletions(-) - -diff --git a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java -index 3fec77d579..37229a834b 100644 ---- a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java -+++ b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java -@@ -395,6 +395,9 @@ public class BuildPathsBlock { - } - - protected void doUpdateUI() { -+ if (fModulesPage.needReInit()) { -+ init(fCurrJProject, null, null); // extent of system modules was changed, re-init fClassPathList -+ } - fBuildPathDialogField.refresh(); - fClassPathList.refresh(); - boolean is9OrHigherAfter= JavaModelUtil.is9OrHigher(fCurrJProject); -diff --git a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPListElement.java b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPListElement.java -index a3c475e7ea..c670c0770f 100644 ---- a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPListElement.java -+++ b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPListElement.java -@@ -42,6 +42,7 @@ import org.eclipse.jdt.core.IModuleDescription; - import org.eclipse.jdt.core.IPackageFragmentRoot; - import org.eclipse.jdt.core.JavaCore; - import org.eclipse.jdt.core.JavaModelException; -+import org.eclipse.jdt.core.provisional.JavaModelAccess; - - - import org.eclipse.jdt.internal.corext.util.JavaModelUtil; -@@ -207,13 +208,22 @@ public class CPListElement { - boolean modulesAdded= false; - if (containerEntry != null) { - IPackageFragmentRoot[] fragmentRoots= fProject.findPackageFragmentRoots(containerEntry); -- if (fragmentRoots != null && fragmentRoots.length > 1) { -- for (IPackageFragmentRoot fragmentRoot : fragmentRoots) { -- IModuleDescription currModule= fragmentRoot.getModuleDescription(); -- if (currModule != null) { -- CPListElement curr= create(this, pseudoEntry, currModule, true, fProject); -- fChildren.add(curr); -- modulesAdded= true; -+ if (fragmentRoots != null) { -+ // detect if system library: -+ boolean addChildren= false; -+ if (fragmentRoots.length > 0) { -+ IModuleDescription module= fragmentRoots[0].getModuleDescription(); -+ if (module != null && JavaModelAccess.isSystemModule(module)) -+ addChildren= true; -+ } -+ if (addChildren) { -+ for (IPackageFragmentRoot fragmentRoot : fragmentRoots) { -+ IModuleDescription currModule= fragmentRoot.getModuleDescription(); -+ if (currModule != null) { -+ CPListElement curr= create(this, pseudoEntry, currModule, true, fProject); -+ fChildren.add(curr); -+ modulesAdded= true; -+ } - } - } - } -diff --git a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java -index b813d22956..e9f1c9feff 100644 ---- a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java -+++ b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java -@@ -164,6 +164,7 @@ public class ModuleDependenciesPage extends BuildPathBasePage { - private Collection fAllDefaultSystemModules; // if current is unnamed module: transitive closure of default root modules (names) - - public final Map fPatchMap= new HashMap<>(); -+ private boolean needReInit= false; - - public ModuleDependenciesPage(IStatusChangeListener context, CheckedListDialogField classPathList) { - fClassPathList= classPathList; -@@ -530,6 +531,7 @@ public class ModuleDependenciesPage extends BuildPathBasePage { - } - updateLimitModules(cpListElement.findAttributeElement(CPListElement.MODULE)); - fModuleList.refresh(); -+ this.needReInit= true; - } - - public void addToSystemModules(List modulesToAdd) throws JavaModelException { -@@ -655,8 +657,19 @@ public class ModuleDependenciesPage extends BuildPathBasePage { - } - } - } -+ this.needReInit= true; - } - -+ /** Destructively reed the needReInit flag. -+ * @return {@code true} if the classpath needs to be reinitialized due to change of extent of the system library -+ */ -+ public boolean needReInit() { -+ try { -+ return this.needReInit; -+ } finally { -+ this.needReInit= false; -+ } -+ } - private Set computeForwardClosure(List seeds) { - Set closure= new HashSet<>(); - collectForwardClosure(seeds, closure); --- -cgit v1.2.1 - diff --git a/eclipse-ebz548211.patch b/eclipse-ebz548211.patch deleted file mode 100644 index f390e6d..0000000 --- a/eclipse-ebz548211.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 5ca45e97b527b5a4d4ed4ce92e32720859911968 Mon Sep 17 00:00:00 2001 -From: Stephan Herrmann -Date: Sat, 15 Jun 2019 20:47:45 +0200 -Subject: Bug 548211 - "Remove" in the Module dependencies tab does not remove - system modules - -Change-Id: I633fa86e5911c50b17a1c7ef188805902942e1db ---- - .../jdt/internal/ui/wizards/NewWizardMessages.java | 1 + - .../ui/wizards/NewWizardMessages.properties | 1 + - .../wizards/buildpaths/ModuleDependenciesPage.java | 22 ++++++++++++++++++---- - 3 files changed, 20 insertions(+), 4 deletions(-) - -diff --git a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.java b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.java -index 3a66ae56ed..961aa63bba 100644 ---- a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.java -+++ b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.java -@@ -564,6 +564,7 @@ public final class NewWizardMessages extends NLS { - public static String ModuleDependenciesPage_removeCurrentModule_error; - public static String ModuleDependenciesPage_removeModule_error_with_hint; - public static String ModuleDependenciesPage_removeSystemModule_error_hint; -+ public static String ModuleDependenciesPage_moduleIsRequired_error_hint; - - public static String ModuleDependenciesAdapter_patchConflict_title; - public static String ModuleDependenciesAdapter_patchConflict_message; -diff --git a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.properties b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.properties -index feb30bc627..a3d8a04624 100644 ---- a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.properties -+++ b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.properties -@@ -605,6 +605,7 @@ ModuleDependenciesPage_removeCurrentModule_error=Cannot remove the current modul - ModuleDependenciesPage_removeModule_error_with_hint=Cannot remove module ''{0}''{1} - ModuleDependenciesPage_removeSystemModule_error_hint=\nOnly system modules can be removed here.\n\ - To remove other modules please remove them from the Modulepath (Projects or Libraries tab). -+ModuleDependenciesPage_moduleIsRequired_error_hint=\nIt is required along the path {0} - - ModuleDependenciesAdapter_patchConflict_title=Patch module conflict - ModuleDependenciesAdapter_patchConflict_message=The {0} {1} was declared to patch module ''{2}''.\n\ -diff --git a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java -index ccc5c3317a..b813d22956 100644 ---- a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java -+++ b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java -@@ -614,7 +614,16 @@ public class ModuleDependenciesPage extends BuildPathBasePage { - return; - } - selectedModuleNames.add(moduleName); -- collectModulesToRemove(moduleName, allModulesToRemove); -+ String problemModule= collectModulesToRemove(moduleName, allModulesToRemove); -+ if (problemModule != null) { -+ int lastArrow= problemModule.lastIndexOf("->"); //$NON-NLS-1$ -+ String leafMod= lastArrow == -1 ? problemModule : problemModule.substring(lastArrow+2); -+ MessageDialog.openError(getShell(), NewWizardMessages.ModuleDependenciesPage_removeModule_dialog_title, -+ MessageFormat.format(NewWizardMessages.ModuleDependenciesPage_removeModule_error_with_hint, -+ leafMod, -+ MessageFormat.format(NewWizardMessages.ModuleDependenciesPage_moduleIsRequired_error_hint, problemModule))); -+ return; -+ } - } - String seedModules= String.join(", ", selectedModuleNames); //$NON-NLS-1$ - if (allModulesToRemove.size() == selectedModuleNames.size()) { -@@ -664,15 +673,20 @@ public class ModuleDependenciesPage extends BuildPathBasePage { - } - } - -- private void collectModulesToRemove(String mod, Set modulesToRemove) { -+ private String collectModulesToRemove(String mod, Set modulesToRemove) { - if (fModuleList.fNames.contains(mod) && modulesToRemove.add(mod)) { - List requireds= fModuleRequiredByModules.get(mod); - if (requireds != null) { - for (String required : requireds) { -- collectModulesToRemove(required, modulesToRemove); -+ if (fModuleList.getModuleKind(required) == ModuleKind.Focus) -+ return required + "->" + mod; //$NON-NLS-1$ -+ String problemModule= collectModulesToRemove(required, modulesToRemove); -+ if (problemModule != null) -+ return problemModule + "->" + mod; //$NON-NLS-1$ - } - } - } -+ return null; - } - - private boolean confirmRemoveModule(String message) { -@@ -741,7 +755,7 @@ public class ModuleDependenciesPage extends BuildPathBasePage { - List dominators= fModuleRequiredByModules.get(name); - if (dominators != null) { - for (String dominator : dominators) { -- if (names.contains(dominator)) { -+ if (names.contains(dominator) && fModuleList.getModuleKind(dominator) == ModuleKind.System) { - continue outer; - } - } --- -cgit v1.2.1 - diff --git a/eclipse-fix-dropins.patch b/eclipse-fix-dropins.patch index c35b86d..ad260ea 100644 --- a/eclipse-fix-dropins.patch +++ b/eclipse-fix-dropins.patch @@ -37,17 +37,17 @@ String baseTimestamp = getBaseTimestamp(profile.getProfileId()); String extTimestamp = getExtTimeStamp(); if (baseTimestamp == null) { ---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java -+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java -@@ -563,6 +563,7 @@ +--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java.orig 2019-09-13 14:45:20.806922186 +0100 ++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java 2019-09-13 14:46:41.124689025 +0100 +@@ -560,6 +560,7 @@ - // get all IUs from all our repos + // get all IUs from all our repos IQueryResult allIUs = getAllIUsFromRepos(); + HashSet removedFromAllIUs = new HashSet(); for (Iterator iter = allIUs.iterator(); iter.hasNext();) { final IInstallableUnit iu = iter.next(); IInstallableUnit existing = profileIUs.get(iu); -@@ -576,6 +577,7 @@ +@@ -573,6 +574,7 @@ // (and more expensive) way to find this out is to do an IU profile property query. if (two == null) { // the IU is already installed so don't mark it as a dropin now - see bug 404619. @@ -55,7 +55,7 @@ iter.remove(); continue; } -@@ -618,7 +620,7 @@ +@@ -614,7 +616,7 @@ } // if the IU from the profile is in the "all available" list, then it is already added // otherwise if it isn't in the repo then we have to remove it from the profile. @@ -64,25 +64,25 @@ toRemove.add(iu); } -@@ -792,8 +794,8 @@ - IStatus installerPlanStatus = engine.perform(plan.getInstallerPlan(), phaseSet, monitor); +@@ -787,7 +789,8 @@ if (!installerPlanStatus.isOK()) return installerPlanStatus; -- + - applyConfiguration(true); + if (isReconciliationApplicationRunning()) + applyConfiguration(true); } return engine.perform(plan, phaseSet, monitor); } ---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java.orig 2018-04-25 20:31:57.931223008 +0100 -+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java 2018-04-25 20:32:11.069144336 +0100 -@@ -151,7 +151,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 @@ @Override public boolean performCancel() { -- String[] buttons = new String[] {IDialogConstants.YES_LABEL, ProvUIMessages.MigrationPage_LATER_BUTTON, IDialogConstants.NO_LABEL}; -+ String[] buttons = new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL}; - MessageDialog dialog = new MessageDialog(getShell(), ProvUIMessages.MigrationPage_CONFIRMATION_TITLE, null, ProvUIMessages.MigrationPage_CONFIRMATION_DIALOG, MessageDialog.QUESTION, buttons, 2); +- String[] buttons = new String[] { IDialogConstants.YES_LABEL, ProvUIMessages.MigrationPage_LATER_BUTTON, +- IDialogConstants.NO_LABEL }; ++ String[] buttons = new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }; + MessageDialog dialog = new MessageDialog(getShell(), ProvUIMessages.MigrationPage_CONFIRMATION_TITLE, null, + ProvUIMessages.MigrationPage_CONFIRMATION_DIALOG, MessageDialog.QUESTION, buttons, 2); - return rememberCancellationDecision(dialog.open()); diff --git a/eclipse-pde-tp-support-droplets.patch b/eclipse-pde-tp-support-droplets.patch index dd23623..eed248a 100644 --- a/eclipse-pde-tp-support-droplets.patch +++ b/eclipse-pde-tp-support-droplets.patch @@ -14,7 +14,7 @@ diff --git eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF eclipse.p 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 -@@ -104,6 +104,7 @@ Require-Bundle: +@@ -105,6 +105,7 @@ Require-Bundle: org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)" Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -113,7 +113,7 @@ index fbd4b81..55cd40e 100644 } - return srcBundles; + return allSrcBundles.toArray(new BundleInfo[0]); - } catch (MalformedURLException e) { + } catch (IOException e) { PDECore.log(e); return null; -- diff --git a/eclipse.spec b/eclipse.spec index cbaf4e7..4cefa53 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -10,10 +10,10 @@ Epoch: 1 %global eb_commit c985e357223668b4bc1fb76ea6b9e0c12829b7e8 %global eclipse_rel %{version}RC2 -%global eclipse_tag S-%{eclipse_rel}-201906051800 +%global eclipse_tag S-%{eclipse_rel}-201909071130 -%global _jetty_version 9.4.19 -%global _lucene_version 8.0.0 +%global _jetty_version 9.4.20 +%global _lucene_version 8.1.1 %global _batik_version 1.11 %ifarch %{ix86} @@ -41,8 +41,8 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse -Version: 4.12 -Release: 6%{?dist} +Version: 4.13 +Release: 1%{?dist} License: EPL-2.0 URL: http://www.eclipse.org/ @@ -119,15 +119,8 @@ Patch24: eclipse-swt-avoid-javascript-at-build.patch # Avoid optional dep used only for tests Patch25: eclipse-patch-out-fileupload-dep.patch -# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=548211 -Patch26: eclipse-ebz548211.patch -Patch27: eclipse-ebz548211-2.patch - -# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=542708 -Patch28: eclipse-ebz542708.patch - # Fix regression in ant support -Patch29: fix-ant-execution.patch +Patch26: fix-ant-execution.patch # Upstream no longer supports non-64bit arches ExcludeArch: s390 %{arm} %{ix86} @@ -198,7 +191,7 @@ BuildRequires: xmlgraphics-commons >= 2.3 BuildRequires: xml-commons-apis BuildRequires: atinject BuildRequires: eclipse-ecf-core >= 3.14.5 -BuildRequires: eclipse-emf-core >= 1:2.18.0 +BuildRequires: eclipse-emf-core >= 1:2.19.0 BuildRequires: eclipse-license2 BuildRequires: glassfish-annotation-api BuildRequires: glassfish-el-api >= 3.0.1 @@ -283,7 +276,7 @@ Requires: xmlgraphics-commons >= 2.3 Requires: xml-commons-apis Requires: atinject Requires: eclipse-ecf-core >= 3.14.5 -Requires: eclipse-emf-core >= 1:2.18.0 +Requires: eclipse-emf-core >= 1:2.19.0 Requires: glassfish-annotation-api Requires: glassfish-el-api >= 3.0.1 Requires: glassfish-el >= 3.0.1 @@ -415,9 +408,6 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/ %patch24 %patch25 %patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -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 @@ -1110,6 +1100,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Mon Sep 09 2019 Mat Booth - 1:4.13-1 +- Update to latest upstream release + * Wed Jul 24 2019 Mat Booth - 1:4.12-6 - Reenable normal debuginfo generation for the launcher binary on Fedora diff --git a/fix-ant-execution.patch b/fix-ant-execution.patch index 5ba0ebb..7507593 100644 --- a/fix-ant-execution.patch +++ b/fix-ant-execution.patch @@ -2,12 +2,13 @@ diff --git a/eclipse.platform/ant/org.eclipse.ant.launching/remote/org/eclipse/a 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 -@@ -19,12 +19,6 @@ import java.net.SocketPermission; +@@ -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; @@ -15,12 +16,14 @@ index b6c0d1e68..a35e683d7 100644 /** * 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 -@@ -453,8 +447,6 @@ public class AntSecurityManager extends SecurityManager { - return super.getInCheck(); - } - catch (NoSuchMethodException | SecurityException e) { -- Platform.getLog(AntCorePlugin.getPlugin().getBundle()).log(new Status(IStatus.WARNING, "org.eclipse.ant.launching", //$NON-NLS-1$ -- RemoteAntMessages.getString("AntSecurityManager.getInCheck"))); //$NON-NLS-1$ - return false; - } +@@ -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/sources b/sources index 5cc49f3..03815ef 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8.tar.xz) = 79780efe9eed0082ea6de6978c5b65ccf5c65a242bff24f34cd763c0ca19a695e7735442aba20f5d2fca4153f7b59c5804fdcb67fa050480dcad137d664d3ce3 -SHA512 (eclipse-platform-sources-4.12RC2.tar.xz) = dcdcb9a193e35146844cab3500e94f5186b2d16e792d246d7e83766bf495d1a3f1b09cb91d9fa1b6e22c7f817d4e63d5dbe8e72af387fc04f73026bb8bbc51ea +SHA512 (eclipse-platform-sources-4.13RC2.tar.xz) = 4e3430cae6249a5d1552dbdd8071743dd6b5a2f92b7b9ee1534064f0e1f959fa4f9528c6267af5d610c9d45583135d24fd6c8d86bb8c90ece19944a35482e34b