diff --git a/ebz550606.patch b/ebz550606.patch new file mode 100644 index 0000000..5e68ac8 --- /dev/null +++ b/ebz550606.patch @@ -0,0 +1,32 @@ +From 890b5826e457d87824a6c61a9fdda45bd407811a Mon Sep 17 00:00:00 2001 +From: Eric Williams +Date: Mon, 9 Sep 2019 15:20:17 -0400 +Subject: Bug 550606: [GTK] Right-click > Rename from Project Explorer + non-functional when starting with only hidden projects + +Adjust the conditions for gdk_window_ensure_native() to ensure it only +gets applied to the right cases. + +Change-Id: I3a57d8674d79bbdc123f11352ab7c7d6b0e807f5 +Signed-off-by: Eric Williams +--- + .../org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java +index 95776fc898..411b8e0540 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 +@@ -2419,7 +2419,8 @@ long gtk_draw (long widget, long cairo) { + * if the Tree has no items. In such cases, the fix is to ensure that the Tree's GdkWindow + * is a native one. Only X11 is affected by this issue, see bug 541427 for more info. + */ +- if (firstDraw && OS.isX11() && getItemCount() == 0 && GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) { ++ if (firstDraw && OS.isX11() && getItemCount() == 0 && GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ++ && !hasChildren && headerVisible) { + long binWindow = GTK.gtk_tree_view_get_bin_window(handle); + GDK.gdk_window_ensure_native(binWindow); + } +-- +cgit v1.2.1 + diff --git a/eclipse-debug-symbols.patch b/eclipse-debug-symbols.patch index ef45ac3..3338e0b 100644 --- a/eclipse-debug-symbols.patch +++ b/eclipse-debug-symbols.patch @@ -17,44 +17,10 @@ -DGIO_LIB="\"libgio-2.0.so.0\"" -DGLIB_LIB="\"libglib-2.0.so.0\"" LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic -CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -s -Wall\ -+CFLAGS = ${M_CFLAGS} ${M_ARCH} -Wall\ ++CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -Wall\ -fpic \ -DLINUX \ -DDEFAULT_OS="\"$(DEFAULT_OS)\"" \ -@@ -140,7 +140,7 @@ - - $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS) - $(info Linking and generating: $(EXEC)) -- $(CC) ${M_ARCH} -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS) -+ $(CC) -s ${M_ARCH} -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS) - - $(DLL): $(DLL_OBJS) $(COMMON_OBJS) - $(info Linking and generating: $(DLL)) ---- 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-feature-plugins-to-category-ius.patch b/eclipse-feature-plugins-to-category-ius.patch index 24dffb5..b255cc7 100644 --- a/eclipse-feature-plugins-to-category-ius.patch +++ b/eclipse-feature-plugins-to-category-ius.patch @@ -161,7 +161,7 @@ index 4197cffde..85ab44540 100644 @@ -186,7 +186,7 @@ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xm index f3432dba5..c70631e90 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 -@@ -60,12 +60,7 @@ +@@ -78,12 +78,7 @@ eclipse-plugin @@ -222,7 +222,7 @@ diff --git a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.x index 853db711d..5195b6d59 100644 --- a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml -@@ -22,69 +22,6 @@ +@@ -21,69 +21,6 @@ %license @@ -292,7 +292,7 @@ index 853db711d..5195b6d59 100644 @@ -348,7 +348,7 @@ index 853db711d..5195b6d59 100644 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-fix-tests.patch b/eclipse-fix-tests.patch index 6b3e8ec..39bf472 100644 --- a/eclipse-fix-tests.patch +++ b/eclipse-fix-tests.patch @@ -1,26 +1,19 @@ --- 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 -@@ -77,7 +77,7 @@ +@@ -76,7 +76,7 @@ */ protected IPath getJdtFeatureLocation() { IPath path = new Path(TargetPlatform.getDefaultLocation()); - path = path.append("features"); -+ path = path.append("droplets").append("eclipse-jdt").append("eclipse").append("features"); ++ path = path.append("droplets").append("eclipse-jdt").append("features"); File dir = path.toFile(); assertTrue("Missing features directory", dir.exists() && !dir.isFile()); String[] files = dir.list(); -@@ -613,4 +613,4 @@ - assertTrue(iubc.getIncludeSource()); - } - --} -\ No newline at end of file -+} diff --git 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 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 -@@ -214,7 +214,7 @@ +@@ -217,7 +217,7 @@ if (parent != null) { File[] children = parent.listFiles((FileFilter) pathname -> { String name = pathname.getName(); @@ -33,7 +26,7 @@ diff --git eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties index 376daa6..1742a8d 100644 --- eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties +++ eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties -@@ -14,6 +14,7 @@ bin.includes = .,\ +@@ -17,6 +17,7 @@ bin.includes = .,\ resources/,\ lib/ src.includes = about.html @@ -47,7 +40,7 @@ diff --git eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties eclipse.j index f34ae40..0f9877d 100644 --- eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties +++ eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties -@@ -21,4 +21,6 @@ bin.includes = plugin.xml,\ +@@ -24,4 +24,6 @@ bin.includes = plugin.xml,\ plugin.properties src.includes = about.html src.excludes = src-resources/ @@ -62,7 +55,7 @@ index bc8963d..fbe4da3 100644 @@ -25,3 +25,6 @@ src.includes = about.html compilerArg=-proc:none - jars.extra.classpath = java10/java10api.jar + jars.extra.classpath = lib/java10api.jar +source.lib/apttestprocessors.jar = processors/ +jars.compile.order = lib/apttestprocessors.jar,\ + . diff --git a/eclipse-ignore-version-when-calculating-home.patch b/eclipse-ignore-version-when-calculating-home.patch index fa39522..b5e77b2 100644 --- a/eclipse-ignore-version-when-calculating-home.patch +++ b/eclipse-ignore-version-when-calculating-home.patch @@ -1,6 +1,6 @@ --- 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 -@@ -1383,7 +1383,7 @@ +@@ -1351,7 +1351,7 @@ String appVersion = props.getProperty(PRODUCT_SITE_VERSION); if (appVersion == null || appVersion.trim().length() == 0) appVersion = ""; //$NON-NLS-1$ diff --git a/eclipse-make-droplets-runnable.patch b/eclipse-make-droplets-runnable.patch index 800fce5..e1d1abc 100644 --- a/eclipse-make-droplets-runnable.patch +++ b/eclipse-make-droplets-runnable.patch @@ -19,7 +19,7 @@ diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/or index 342e33e..425a166 100644 --- rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java +++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java -@@ -260,6 +260,22 @@ public class ExtensionLocationArtifactRepository extends AbstractRepository ---- eclipse.platform.releng/features/org.eclipse.sdk/feature.xml.orig 2016-04-27 09:18:50.421221722 +0100 -+++ eclipse.platform.releng/features/org.eclipse.sdk/feature.xml 2016-04-27 09:19:08.454957280 +0100 +--- eclipse.platform.releng/features/org.eclipse.sdk/feature.xml.orig 2019-06-17 13:00:29.410091487 +0100 ++++ eclipse.platform.releng/features/org.eclipse.sdk/feature.xml 2019-06-17 13:00:36.270076080 +0100 @@ -51,16 +51,6 @@ id="org.eclipse.help.source" version="0.0.0"/> @@ -64,10 +64,10 @@ - - - -- -- +- - - - +- + + +- + + + +--- rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java.orig 2019-06-20 11:48:48.317887414 +0100 ++++ rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java 2019-06-20 11:49:35.106774459 +0100 +@@ -79,10 +79,6 @@ + import javax.servlet.http.HttpSessionListener; + import javax.servlet.http.Part; + +-import org.apache.commons.fileupload.FileItem; +-import org.apache.commons.fileupload.FileUploadException; +-import org.apache.commons.fileupload.disk.DiskFileItemFactory; +-import org.apache.commons.fileupload.servlet.ServletFileUpload; + import org.eclipse.equinox.http.servlet.ExtendedHttpService; + import org.eclipse.equinox.http.servlet.RangeAwareServletContextHelper; + import org.eclipse.equinox.http.servlet.context.ContextPathCustomizer; +@@ -2665,65 +2661,6 @@ + Assert.assertEquals("bundleresource", requestAdvisor.request("testDefaultHttpContextResource")); + } + +- @Test +- public void test_commonsFileUpload() throws Exception { +- Servlet servlet = new HttpServlet() { +- private static final long serialVersionUID = 1L; +- +- @Override +- protected void doPost(HttpServletRequest req, HttpServletResponse resp) +- throws IOException, ServletException { +- +- boolean isMultipart = ServletFileUpload.isMultipartContent(req); +- Assert.assertTrue(isMultipart); +- +- DiskFileItemFactory factory = new DiskFileItemFactory(); +- +- ServletContext servletContext = this.getServletConfig().getServletContext(); +- File repository = (File) servletContext.getAttribute("javax.servlet.context.tempdir"); +- factory.setRepository(repository); +- ServletFileUpload upload = new ServletFileUpload(factory); +- +- List items = null; +- try { +- List parseRequest = upload.parseRequest(req); +- items = parseRequest; +- } catch (FileUploadException e) { +- e.printStackTrace(); +- } +- +- Assert.assertNotNull(items); +- Assert.assertFalse(items.isEmpty()); +- +- FileItem fileItem = items.get(0); +- +- String submittedFileName = fileItem.getName(); +- String contentType = fileItem.getContentType(); +- long size = fileItem.getSize(); +- +- PrintWriter writer = resp.getWriter(); +- +- writer.write(submittedFileName); +- writer.write("|"); +- writer.write(contentType); +- writer.write("|" + size); +- } +- }; +- +- Dictionary props = new Hashtable(); +- props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME, "S16"); +- props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/Servlet16/*"); +- registrations.add(getBundleContext().registerService(Servlet.class, servlet, props)); +- +- Map> map = new HashMap>(); +- +- map.put("file", Arrays.asList(getClass().getResource("blue.png"))); +- +- Map> result = requestAdvisor.upload("Servlet16/do", map); +- +- Assert.assertEquals("200", result.get("responseCode").get(0)); +- Assert.assertEquals("blue.png|image/png|292", result.get("responseBody").get(0)); +- } + + @Test + public void test_PathEncodings_Bug540970() throws Exception { diff --git a/eclipse-pde-tp-support-droplets.patch b/eclipse-pde-tp-support-droplets.patch index 40dc673..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 -@@ -102,6 +102,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 @@ -57,7 +57,7 @@ index fbd4b81..55cd40e 100644 import org.osgi.framework.Constants; /** -@@ -111,7 +114,16 @@ public class P2Utils { +@@ -139,7 +143,16 @@ try { URL bundlesTxt = new URL(configurationArea.getProtocol(), configurationArea.getHost(), new File(configurationArea.getFile(), SimpleConfiguratorManipulator.BUNDLES_INFO_PATH).getAbsolutePath()); File home = basePath.toFile(); @@ -75,7 +75,7 @@ index fbd4b81..55cd40e 100644 if (bundles == null || bundles.length == 0) { return null; } -@@ -143,11 +154,38 @@ public class P2Utils { +@@ -171,11 +184,38 @@ try { File home = basePath.toFile(); URL srcBundlesTxt = new URL(configurationArea.getProtocol(), configurationArea.getHost(), configurationArea.getFile().concat(SimpleConfiguratorManipulator.SOURCE_INFO_PATH)); @@ -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-secondary-arches.patch b/eclipse-secondary-arches.patch index 4750e9b..caa42a8 100644 --- a/eclipse-secondary-arches.patch +++ b/eclipse-secondary-arches.patch @@ -2,20 +2,10 @@ 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 -@@ -393,6 +393,46 @@ +@@ -393,6 +393,26 @@ unpack="false"/> -+ -+ + + -+ -+ + + -+ -+ -+ -+ --- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2014-11-28 15:09:42.000000000 +0000 +++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2014-11-28 16:52:00.315007846 +0000 -@@ -123,7 +123,11 @@ +@@ -123,7 +123,9 @@ - + -+ + + -+ --- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:44:03.436891441 +0000 +++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:45:25.232480509 +0000 -@@ -32,3 +32,15 @@ +@@ -32,3 +32,9 @@ root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root root.linux.gtk.x86_64.permissions.755=libcairo-swt.so + -+root.linux.gtk.arm=bin/gtk/linux/arm,gtk_root -+root.linux.gtk.arm.permissions.755=launcher -+ +root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root +root.linux.gtk.aarch64.permissions.755=launcher + +root.linux.gtk.s390x=bin/gtk/linux/s390x,gtk_root +root.linux.gtk.s390x.permissions.755=launcher -+ -+root.linux.gtk.x86=bin/gtk/linux/x86,gtk_root -+root.linux.gtk.x86.permissions.755=launcher --- a/eclipse.platform.swt.binaries/pom.xml 2017-04-05 01:57:59.142576722 +0100 +++ b/eclipse.platform.swt.binaries/pom.xml 2017-04-05 02:00:00.153247342 +0100 -@@ -54,7 +54,11 @@ +@@ -54,7 +54,9 @@ bundles/org.eclipse.swt.cocoa.macosx.x86_64 -+ 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.s390x -+ bundles/org.eclipse.swt.gtk.linux.x86 bundles/org.eclipse.swt.gtk.linux.x86_64 bundles/org.eclipse.swt.win32.win32.x86_64 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2017-04-21 10:15:34.857977599 +0100 +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2017-04-21 10:18:22.878025820 +0100 -@@ -24,3 +24,23 @@ +@@ -24,3 +24,13 @@ requires.5.name = org.eclipse.swt.gtk.linux.ppc64le requires.5.range = [$version$,$version$] requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true))) + +requires.6.namespace = org.eclipse.equinox.p2.iu -+requires.6.name = org.eclipse.swt.gtk.linux.arm ++requires.6.name = org.eclipse.swt.gtk.linux.aarch64 +requires.6.range = [$version$,$version$] -+requires.6.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true))) ++requires.6.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true))) + +requires.7.namespace = org.eclipse.equinox.p2.iu -+requires.7.name = org.eclipse.swt.gtk.linux.aarch64 ++requires.7.name = org.eclipse.swt.gtk.linux.s390x +requires.7.range = [$version$,$version$] -+requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true))) -+ -+requires.8.namespace = org.eclipse.equinox.p2.iu -+requires.8.name = org.eclipse.swt.gtk.linux.s390x -+requires.8.range = [$version$,$version$] -+requires.8.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true))) -+ -+requires.9.namespace = org.eclipse.equinox.p2.iu -+requires.9.name = org.eclipse.swt.gtk.linux.x86 -+requires.9.range = [$version$,$version$] -+requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86)(!(org.eclipse.swt.buildtime=true))) ++requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true))) --- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2017-04-19 13:31:15.000000000 +0100 +++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2017-04-23 16:58:34.022207885 +0100 @@ -109,7 +109,7 @@ @@ -185,7 +123,7 @@ index 7e1f520..734dd10 100644 defaultOSArch="arm" --- a/rt.equinox.framework/pom.xml 2017-04-26 22:19:15.548461372 +0100 +++ b/rt.equinox.framework/pom.xml 2017-04-26 22:20:41.348571492 +0100 -@@ -73,6 +73,30 @@ +@@ -77,6 +77,18 @@ bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64 @@ -201,18 +139,6 @@ index 7e1f520..734dd10 100644 + bundles/org.eclipse.equinox.launcher.gtk.linux.s390x + + -+ -+ build-native-launchers-gtk.linux.x86 -+ -+ -+ native -+ gtk.linux.x86 -+ -+ -+ -+ bundles/org.eclipse.equinox.launcher.gtk.linux.x86 -+ -+ diff --git a/eclipse-swt-avoid-javascript-at-build.patch b/eclipse-swt-avoid-javascript-at-build.patch index f11b37d..8864089 100644 --- a/eclipse-swt-avoid-javascript-at-build.patch +++ b/eclipse-swt-avoid-javascript-at-build.patch @@ -13,7 +13,7 @@ - - org.apache.ant - ant-apache-bsf -- 1.10.5 +- 1.10.6 - - diff --git a/eclipse.spec b/eclipse.spec index c110ae3..e7c6714 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -1,19 +1,20 @@ # Set to build Eclipse without circular dependency to eclipse-pde, API # generation and docs will not be built and a second run will be required, but # this is a way to bootstrap Eclipse on secondary archs. -%bcond_with bootstrap +%bcond_without bootstrap # Set this to avoid building contributor tools and tests -%bcond_without contrib_tools +%bcond_with contrib_tools Epoch: 1 %global eb_commit c985e357223668b4bc1fb76ea6b9e0c12829b7e8 %global eclipse_rel %{version}RC2 -%global eclipse_tag S-%{eclipse_rel}-201903070500 +%global eclipse_tag S-%{eclipse_rel}-201909071130 -%global _jetty_version 9.4.18 -%global _lucene_version 7.7.0 +%global _jetty_version 9.4.20 +%global _lucene_version 8.1.1 +%global _batik_version 1.11 %ifarch %{ix86} %global eclipse_arch x86 @@ -40,12 +41,12 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse -Version: 4.11 -Release: 8%{?dist} +Version: 4.13 +Release: 6%{?dist} License: EPL-2.0 URL: http://www.eclipse.org/ -Source0: http://download.eclipse.org/eclipse/downloads/drops4/%{eclipse_tag}/eclipse-platform-sources-%{eclipse_rel}.tar.xz +Source0: https://download.eclipse.org/eclipse/downloads/drops4/%{eclipse_tag}/eclipse-platform-sources-%{eclipse_rel}.tar.xz # Can generate locally with: # git archive --format=tar --prefix=org.eclipse.linuxtools.eclipse-build-%%{eb_commit}/ \ @@ -115,6 +116,15 @@ Patch23: eclipse-hide-droplets-from-install-wizard.patch # Avoid the need for a javascript interpreter at build time 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 + +# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=550606 +Patch27: ebz550606.patch + # Upstream no longer supports non-64bit arches ExcludeArch: s390 %{arm} %{ix86} @@ -149,14 +159,12 @@ BuildRequires: pkgconfig(webkit2gtk-4.0) BuildRequires: icu4j >= 1:64.2 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 +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 BuildRequires: jsch >= 0:0.1.46-2 -BuildRequires: apache-commons-el >= 1.0-22 BuildRequires: apache-commons-logging BuildRequires: apache-commons-codec BuildRequires: apache-commons-jxpath -BuildRequires: apache-commons-fileupload -BuildRequires: apache-sshd +BuildRequires: bouncycastle BuildRequires: osgi(org.apache.felix.gogo.shell) >= 1.1.0 BuildRequires: osgi(org.apache.felix.gogo.command) >= 1.0.2 BuildRequires: osgi(org.apache.felix.gogo.runtime) >= 1.1.0 @@ -179,13 +187,14 @@ BuildRequires: hamcrest BuildRequires: sat4j BuildRequires: objectweb-asm >= 7.0 BuildRequires: sac -BuildRequires: batik >= 1.10 -BuildRequires: batik-css >= 1.10 -BuildRequires: xmlgraphics-commons >= 2.2 +BuildRequires: batik-css >= %{_batik_version} +BuildRequires: batik-util >= %{_batik_version} +BuildRequires: google-gson +BuildRequires: xmlgraphics-commons >= 2.3 BuildRequires: xml-commons-apis BuildRequires: atinject -BuildRequires: eclipse-ecf-core >= 3.14.4 -BuildRequires: eclipse-emf-core >= 1:2.16.0 +BuildRequires: eclipse-ecf-core >= 3.14.5 +BuildRequires: eclipse-emf-core >= 1:2.19.0 BuildRequires: eclipse-license2 BuildRequires: glassfish-annotation-api BuildRequires: glassfish-el-api >= 3.0.1 @@ -236,14 +245,12 @@ Eclipse OSGi - Equinox %package platform Summary: Eclipse platform common files -Recommends: eclipse-abrt Recommends: eclipse-usage Requires: ant >= 1.10.5 Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf -Requires: ant-commons-net ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf ant-xz +Requires: ant-commons-net ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf ant-xz ant-junit5 Requires: jsch >= 0.1.46-2 -Requires: apache-commons-el >= 1.0-23 Requires: apache-commons-logging Requires: apache-commons-codec Requires: apache-commons-jxpath @@ -264,13 +271,13 @@ Requires: lucene-queryparser >= %{_lucene_version} Requires: lucene-analyzers-smartcn >= %{_lucene_version} Requires: sat4j Requires: sac -Requires: batik >= 1.10 -Requires: batik-css >= 1.10 -Requires: xmlgraphics-commons >= 2.2 +Requires: batik-css >= %{_batik_version} +Requires: batik-util >= %{_batik_version} +Requires: xmlgraphics-commons >= 2.3 Requires: xml-commons-apis Requires: atinject -Requires: eclipse-ecf-core >= 3.14.4 -Requires: eclipse-emf-core >= 1:2.16.0 +Requires: eclipse-ecf-core >= 3.14.5 +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 @@ -291,6 +298,10 @@ Requires: osgi(org.tukaani.xz) Provides: eclipse-nls = %{version}-%{release} Obsoletes: eclipse-nls < %{version}-%{release} +# Obsoletes added in F31 +Obsoletes: eclipse-epp-logging <= 2.0.8-4 +Obsoletes: eclipse-abrt <= 0.0.3-10 + %description platform The Eclipse Platform is the base of all IDE plugins. This does not include the Java Development Tools or the Plugin Development Environment. @@ -400,6 +411,12 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/ %patch22 %patch23 -p1 %patch24 +%patch25 +%patch26 -p1 +%patch27 -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 # Remove python-based test rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/accessibility/Bug543949_ComponentExtentsTest.py @@ -453,9 +470,11 @@ sed -i -e '/org\.eclipse\.jdt\.annotation;bundle-version="\[1\.1\.0,2\.0\.0)"/d' eclipse.jdt.core/org.eclipse.jdt.core.tests.{model,builder,compiler}/META-INF/MANIFEST.MF \ eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF \ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/META-INF/MANIFEST.MF -sed -i -e 's/javax.annotation/javax.annotation-api/' eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF +sed -i -e 's/javax.annotation/javax.annotation-api/' eclipse-platform-parent/pom.xml \ + eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF # Disable examples +%pom_disable_module examples rt.equinox.p2 %pom_disable_module examples eclipse.platform.ui %pom_disable_module org.eclipse.debug.examples.core eclipse.platform.debug %pom_disable_module org.eclipse.debug.examples.memory eclipse.platform.debug @@ -470,6 +489,8 @@ sed -i -e 's/javax.annotation/javax.annotation-api/' eclipse.jdt.core/org.eclips %pom_disable_module org.eclipse.ui.genericeditor.examples eclipse.platform.text %pom_disable_module org.eclipse.ui.intro.quicklinks.examples eclipse.platform.ua %pom_disable_module org.eclipse.ui.intro.solstice.examples eclipse.platform.ua +# Except for this one example, which is used by tests +%pom_xpath_inject "pom:modules" "examples/org.eclipse.jface.examples.databinding" eclipse.platform.ui # Disable servletbridge stuff %pom_disable_module bundles/org.eclipse.equinox.http.servletbridge rt.equinox.bundles @@ -542,7 +563,7 @@ for f in eclipse.jdt/org.eclipse.jdt-feature/feature.xml \ %pom_xpath_remove -f "plugin[@os='macosx']" $f %pom_xpath_remove -f "plugin[@os='win32']" $f %pom_xpath_remove -f "plugin[@ws='win32']" $f - for arch in x86 x86_64 arm aarch64 ppc64le s390x ; do + for arch in x86_64 aarch64 ppc64le s390x ; do if [ "$arch" != "%{eclipse_arch}" ] ; then %pom_xpath_remove -f "plugin[@arch='$arch']" $f fi @@ -568,7 +589,7 @@ done %pom_disable_module bundles/org.eclipse.test.performance eclipse.platform.releng %pom_disable_module bundles/org.eclipse.test.performance.win32 eclipse.platform.releng %pom_disable_module bundles/org.eclipse.ant.optional.junit eclipse.platform.releng -for pom in eclipse.jdt.core{,.binaries} eclipse.jdt.debug eclipse.jdt.ui eclipse.pde.build eclipse.pde.ui \ +for pom in eclipse.jdt.core{,.binaries} eclipse.jdt.debug eclipse.jdt.ui eclipse.pde.build eclipse.pde.ui{,/apitools} \ eclipse.platform eclipse.platform.debug eclipse.platform.releng eclipse.platform.resources eclipse.platform.runtime \ eclipse.platform.swt eclipse.platform.team eclipse.platform.text eclipse.platform.ui eclipse.platform.ua \ rt.equinox.bundles rt.equinox.framework rt.equinox.p2 ; do @@ -576,6 +597,7 @@ for pom in eclipse.jdt.core{,.binaries} eclipse.jdt.debug eclipse.jdt.ui eclipse done %pom_disable_module bundles/org.eclipse.equinox.frameworkadmin.test rt.equinox.p2 %pom_disable_module eclipse-junit-tests eclipse.platform.releng.tychoeclipsebuilder +%pom_disable_module examples/org.eclipse.jface.examples.databinding eclipse.platform.ui %endif # Include some extra features with the product that some other projects may need at @@ -662,6 +684,7 @@ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse. %mvn_package "org.eclipse.cvs{,.feature}:" cvs %mvn_package "org.eclipse.team:org.eclipse.team.cvs*" cvs %mvn_package "org.eclipse.pde{,.ui,.feature}:" pde +%mvn_package ":org.eclipse.pde.api.tools*" pde %mvn_package "org.eclipse.ui:org.eclipse.ui.trace" pde %mvn_package "org.eclipse.sdk{,.feature}:" sdk %mvn_package ":" __noinstall @@ -827,7 +850,6 @@ popd # Generate addition Maven metadata rm -rf .xmvn/ .xmvn-reactor %mvn_package "org.eclipse.osgi:" equinox-osgi -%mvn_package "org.eclipse.equinox.http:" platform %mvn_package "org.eclipse.swt:" swt # Install Maven metadata for OSGi jars @@ -835,20 +857,9 @@ for J in $OSGI_JARS ; do JAR=%{buildroot}%{_eclipsedir}/plugins/org.eclipse.${J}_*.jar VER=$(echo $JAR | sed -e "s/.*${J}_\(.*\)\.jar/\1/") %mvn_artifact "org.eclipse.osgi:$J:jar:$VER" $JAR - if [ "$J" = "osgi" ] ; then - %mvn_alias "org.eclipse.osgi:$J" "org.eclipse.osgi:org.eclipse.$J" "org.eclipse.tycho:org.eclipse.$J" "org.eclipse:$J" - else - %mvn_alias "org.eclipse.osgi:$J" "org.eclipse.osgi:org.eclipse.$J" "org.eclipse.tycho:org.eclipse.$J" - fi + %mvn_alias "org.eclipse.osgi:$J" "org.eclipse.osgi:org.eclipse.$J" "org.eclipse.platform:org.eclipse.$J" done - -# Install Maven metadata for Equinox HTTP Servlet -JAR=%{buildroot}%{_eclipsedir}/plugins/org.eclipse.equinox.http.servlet_*.jar -VER=$(echo $JAR | sed -e "s/.*_\(.*\)\.jar/\1/") -%mvn_artifact "org.eclipse.equinox.http:equinox.http.servlet:jar:$VER" $JAR -%mvn_alias "org.eclipse.equinox.http:equinox.http.servlet" "org.eclipse.equinox.http:servlet" - # Install Maven metadata for SWT JAR=%{buildroot}%{_eclipsedir}/plugins/org.eclipse.swt_*.jar VER=$(echo $JAR | sed -e "s/.*_\(.*\)\.jar/\1/") @@ -891,7 +902,7 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/swt.jar %{_jnidir}/swt.jar -%files platform -f .mfiles-platform +%files platform %{_bindir}/eclipse %{_eclipsedir}/eclipse %{_eclipsedir}/.eclipseproduct @@ -1034,6 +1045,7 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.team.genericeditor.diff.extension_* %{_eclipsedir}/plugins/org.eclipse.team.ui_* %{_eclipsedir}/plugins/org.eclipse.text_* +%{_eclipsedir}/plugins/org.eclipse.text.quicksearch_* %{_eclipsedir}/plugins/org.eclipse.ui_* %{_eclipsedir}/plugins/org.eclipse.ui.browser_* %{_eclipsedir}/plugins/org.eclipse.ui.cheatsheets_* @@ -1096,8 +1108,66 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog -* Wed Jul 24 2019 Fedora Release Engineering - 1:4.11-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Wed Dec 18 2019 Mat Booth - 1:4.13-6 +- Remove unnecessary dep on apache-commons-el +- Enable bootstrap mode + +* Wed Nov 20 2019 Mat Booth - 1:4.13-5 +- Obsolete retired packages + +* Mon Sep 23 2019 Mat Booth - 1:4.13-4 +- Add patch for ebz#550606 + +* Mon Sep 23 2019 Mat Booth - 1:4.13-3 +- Fix explicit hamcrest reqs + +* Mon Sep 16 2019 Mat Booth - 1:4.13-2 +- Fix PDE installation + +* 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 + +* Thu Jun 27 2019 Mat Booth - 1:4.12-5 +- Fix NoClassDefFoundError regression in ant support + +* Thu Jun 20 2019 Mat Booth - 1:4.12-4 +- Fix deps on batik stack + +* Thu Jun 20 2019 Mat Booth - 1:4.12-3 +- Disable more examples and allow contrib-tools mode to build properly + +* Wed Jun 19 2019 Mat Booth - 1:4.12-2 +- Additional fixes for ebz548211 + +* Mon Jun 17 2019 Mat Booth - 1:4.12-1 +- Update to 2019-06 release + +* Sun Jun 16 2019 Mat Booth - 1:4.11-15 +- Rebuild against new Jetty, ECF and EMF + +* Wed Jun 12 2019 Mat Booth - 1:4.11-14 +- Full rebuild + +* Wed Jun 12 2019 Mat Booth - 1:4.11-13 +- Add patch for lucene 8 and rebootstrap + +* Thu May 30 2019 Mat Booth - 1:4.11-12 +- Avoid requirement on optional test dependency commons-fileupload + +* Fri May 24 2019 Mat Booth - 1:4.11-11 +- Clean up unused maven metadata + +* Fri May 24 2019 Mat Booth - 1:4.11-10 +- Add missing BR on google-gson + +* Thu May 23 2019 Mat Booth - 1:4.11-9 +- Bump deps on batik and xmlgraphics + +* Tue May 07 2019 Mat Booth - 1:4.11-8 +- Re-instate junit5 dep since dependent modules were fixed * Wed May 01 2019 Mat Booth - 1:4.11-7 - Bump requirements on Jetty diff --git a/explicit-hamcrest.patch b/explicit-hamcrest.patch index 0db6601..cc0042c 100644 --- a/explicit-hamcrest.patch +++ b/explicit-hamcrest.patch @@ -17,3 +17,43 @@ -Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)" +Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)", + org.hamcrest.core;bundle-version="1.3.0" +--- eclipse.pde.ui/ui/org.eclipse.pde.ui.templates.tests/META-INF/MANIFEST.MF.orig 2019-06-20 11:25:47.959981490 +0100 ++++ eclipse.pde.ui/ui/org.eclipse.pde.ui.templates.tests/META-INF/MANIFEST.MF 2019-06-20 11:26:06.444935061 +0100 +@@ -9,6 +9,7 @@ + Require-Bundle: org.eclipse.pde.ui;bundle-version="3.10.0", + org.eclipse.pde.ui.templates;bundle-version="3.6.0", + org.junit;bundle-version="4.12.0", ++ org.hamcrest.core;bundle-version="1.3.0", + org.eclipse.core.runtime;bundle-version="3.13.0", + org.eclipse.core.resources;bundle-version="3.12.0", + org.eclipse.ui.ide;bundle-version="3.13.0", +--- eclipse.platform.text/org.eclipse.text.tests/META-INF/MANIFEST.MF.orig 2019-09-21 16:37:52.645515694 +0100 ++++ eclipse.platform.text/org.eclipse.text.tests/META-INF/MANIFEST.MF 2019-09-21 16:38:25.034443980 +0100 +@@ -13,6 +13,7 @@ + org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", + org.eclipse.text;bundle-version="[3.6.3,4.0.0)", ++ org.hamcrest.core;bundle-version="1.3.0", + org.junit;bundle-version="4.12.0" + Bundle-RequiredExecutionEnvironment: JavaSE-1.8 + Eclipse-BundleShape: dir +--- eclipse.pde.ui/ui/org.eclipse.pde.junit.runtime.tests/META-INF/MANIFEST.MF.orig 2019-09-21 17:06:17.944749329 +0100 ++++ eclipse.pde.ui/ui/org.eclipse.pde.junit.runtime.tests/META-INF/MANIFEST.MF 2019-09-21 17:06:43.846692344 +0100 +@@ -9,6 +9,7 @@ + Bundle-ActivationPolicy: lazy + Eclipse-BundleShape: dir + Require-Bundle: org.junit, ++ org.hamcrest.core;bundle-version="1.3.0", + org.hamcrest.library;bundle-version="1.3.0", + org.eclipse.core.runtime;bundle-version="3.15.400", + org.eclipse.pde.launching;bundle-version="3.7.700", +--- eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF.orig 2019-09-23 09:46:23.507897561 +0100 ++++ eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF 2019-09-23 09:46:45.658839342 +0100 +@@ -7,6 +7,7 @@ + Bundle-Activator: org.eclipse.pde.ui.tests.PDETestsPlugin + Bundle-Vendor: Eclipse.org + Require-Bundle: org.junit, ++ org.hamcrest.core, + org.eclipse.pde.ui, + org.eclipse.ui, + org.eclipse.core.resources, diff --git a/fix-ant-execution.patch b/fix-ant-execution.patch new file mode 100644 index 0000000..7507593 --- /dev/null +++ b/fix-ant-execution.patch @@ -0,0 +1,29 @@ +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_ant_build.patch b/fix_ant_build.patch index da2811a..40f51d8 100644 --- a/fix_ant_build.patch +++ b/fix_ant_build.patch @@ -1,6 +1,6 @@ --- eclipse.platform/ant/org.eclipse.ant.launching/build.properties.orig 2017-01-09 10:24:16.258243377 +0000 +++ eclipse.platform/ant/org.eclipse.ant.launching/build.properties 2017-01-09 10:25:08.302620557 +0000 -@@ -20,18 +20,14 @@ +@@ -23,18 +23,14 @@ about.html jars.compile.order = .,\ @@ -29,7 +29,7 @@ javacWarnings..=-unavoidableGenericProblems --- eclipse.platform/ant/org.eclipse.ant.ui/build.properties.orig 2017-04-03 18:40:41.033489412 +0100 +++ eclipse.platform/ant/org.eclipse.ant.ui/build.properties 2017-04-03 18:43:21.614928391 +0100 -@@ -14,8 +14,8 @@ +@@ -17,8 +17,8 @@ source.lib/antrunner.jar = Ant Runner Support/ output.lib/antrunner.jar = ant_runner_support_bin/ # Compiled with 1.6 locally, see bug 495617: @@ -40,7 +40,7 @@ src.includes = about.html,\ about_files/,\ Remote Ant Support/ -@@ -31,6 +31,5 @@ +@@ -34,6 +34,5 @@ lib/antrunner.jar,\ lib/remoteAnt.jar,\ css/ diff --git a/sources b/sources index 8f09089..03815ef 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (eclipse-platform-sources-4.11RC2.tar.xz) = 8f60458ba88dce8552c9d9a518d90d5659dc2033f375da0ce9de54fd9328b6a7f921bf35c3c82597b8485157ffd2cb087595e36cd4dd0a273226cf07c0de9fce SHA512 (org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8.tar.xz) = 79780efe9eed0082ea6de6978c5b65ccf5c65a242bff24f34cd763c0ca19a695e7735442aba20f5d2fca4153f7b59c5804fdcb67fa050480dcad137d664d3ce3 +SHA512 (eclipse-platform-sources-4.13RC2.tar.xz) = 4e3430cae6249a5d1552dbdd8071743dd6b5a2f92b7b9ee1534064f0e1f959fa4f9528c6267af5d610c9d45583135d24fd6c8d86bb8c90ece19944a35482e34b