Hello community,
here is the log from the commit of package eclipse for openSUSE:Factory checked
in at 2020-07-16 12:13:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/eclipse (Old)
and /work/SRC/openSUSE:Factory/.eclipse.new.3592 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eclipse"
Thu Jul 16 12:13:18 2020 rev:12 rq:818887 version:4.15
Changes:
--------
--- /work/SRC/openSUSE:Factory/eclipse/eclipse.changes 2020-06-04
17:56:11.728956975 +0200
+++ /work/SRC/openSUSE:Factory/.eclipse.new.3592/eclipse.changes
2020-07-16 12:15:15.834771272 +0200
@@ -1,0 +2,44 @@
+Mon Jul 6 04:53:01 UTC 2020 - Fridrich Strba <fst...@suse.com>
+
+- Update to 4.15
+- Build only on 64-bit architectures, since 32-bit support was
+ dropped upstream
+- Modified patches:
+ * eclipse-debug-symbols.patch
+ * eclipse-disable-droplets-in-dropins.patch
+ * eclipse-disable-uses-constraints.patch
+ * eclipse-feature-plugins-to-category-ius.patch
+ * eclipse-fix-dropins.patch
+ * eclipse-fix-tests.patch
+ * eclipse-hide-droplets-from-install-wizard.patch
+ * eclipse-ignore-version-when-calculating-home.patch
+ * eclipse-make-droplets-runnable.patch
+ * eclipse-no-source-for-dependencies.patch
+ * eclipse-p2-pick-up-renamed-jars.patch
+ * eclipse-pde-tp-support-droplets.patch
+ * eclipse-secondary-arches.patch
+ * eclipse-support-symlink-bundles.patch
+ * eclipse-suse-batik.patch
+ * fix_ant_build.patch
+ * prefer_x11_backend.patch
+- Removed patches:
+ * eclipse-adjust-droplets.patch
+ * eclipse-arm32.patch
+ * eclipse-asm7.patch
+ * eclipse-felix-scr-dependencies.patch
+ * eclipse-force-gtk2.patch
+ * eclipse-gcc10.patch
+ * eclipse-imagedescriptor.patch
+ * eclipse-lucene-8.patch
+ * eclipse-mockito.patch
+ * eclipse-remove-jgit-provider.patch
+ * eclipse-swt-disable-gtk2.patch
+ * eclipse-test-support.patch
+- Added patches:
+ * compiler-release.patch
+ * eclipse-patch-out-fileupload-dep.patch
+ * eclipse-swt-avoid-javascript-at-build.patch
+ * explicit-hamcrest.patch
+ * force-clean-after-p2-operations.patch
+
+-------------------------------------------------------------------
Old:
----
eclipse-adjust-droplets.patch
eclipse-arm32.patch
eclipse-asm7.patch
eclipse-felix-scr-dependencies.patch
eclipse-force-gtk2.patch
eclipse-gcc10.patch
eclipse-imagedescriptor.patch
eclipse-lucene-8.patch
eclipse-mockito.patch
eclipse-platform-sources-4.9-clean.tar.xz
eclipse-remove-jgit-provider.patch
eclipse-swt-disable-gtk2.patch
eclipse-test-support.patch
org.eclipse.linuxtools.eclipse-build-44643cbda3dfd6f00fbf1b346dae7068df2a9ef9.tar.xz
New:
----
compiler-release.patch
eclipse-patch-out-fileupload-dep.patch
eclipse-platform-sources-4.15-clean.tar.xz
eclipse-swt-avoid-javascript-at-build.patch
explicit-hamcrest.patch
force-clean-after-p2-operations.patch
org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ eclipse.spec ++++++
++++ 926 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/eclipse/eclipse.spec
++++ and /work/SRC/openSUSE:Factory/.eclipse.new.3592/eclipse.spec
++++++ compiler-release.patch ++++++
---
rt.equinox.p2/bundles/org.eclipse.equinox.p2.artifact.repository/pom.xml.orig
2020-03-23 00:19:02.052686148 +0000
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.artifact.repository/pom.xml
2020-03-23 00:19:10.187688146 +0000
@@ -11,4 +11,7 @@
<artifactId>org.eclipse.equinox.p2.artifact.repository</artifactId>
<version>1.3.400-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+ <properties>
+ <maven.compiler.release>8</maven.compiler.release>
+ </properties>
</project>
++++++ eclipse-create-tarball.sh ++++++
--- /var/tmp/diff_new_pack.PwNZ6p/_old 2020-07-16 12:15:24.286779817 +0200
+++ /var/tmp/diff_new_pack.PwNZ6p/_new 2020-07-16 12:15:24.290779822 +0200
@@ -1,8 +1,8 @@
#!/bin/bash
-ECLIPSE_DATE=20180906
-ECLIPSE_TIME=0745
-VERSION=4.9
+ECLIPSE_DATE=20200305
+ECLIPSE_TIME=0155
+VERSION=4.15
NAME="eclipse-platform-sources"
tmp_dir=$(mktemp -d)
@@ -11,7 +11,7 @@
pushd ${tmp_dir}
-wget
http://archive.eclipse.org/eclipse/downloads/drops4/R-${VERSION}-${ECLIPSE_DATE}${ECLIPSE_TIME}/${NAME}-${VERSION}.tar.xz
+wget
https://archive.eclipse.org/eclipse/downloads/drops4/R-${VERSION}-${ECLIPSE_DATE}${ECLIPSE_TIME}/${NAME}-${VERSION}.tar.xz
tar -xf ${NAME}-${VERSION}.tar.xz
rm ${NAME}-${VERSION}.tar.xz
++++++ eclipse-debug-symbols.patch ++++++
--- /var/tmp/diff_new_pack.PwNZ6p/_old 2020-07-16 12:15:24.302779833 +0200
+++ /var/tmp/diff_new_pack.PwNZ6p/_new 2020-07-16 12:15:24.302779833 +0200
@@ -1,6 +1,6 @@
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT
PI/gtk/library/build.sh.orig 2018-08-19 12:37:52.764590467 +0100
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT
PI/gtk/library/build.sh 2018-08-19 12:38:15.032503913 +0100
-@@ -75,7 +75,8 @@
+@@ -74,7 +74,8 @@
MAKE_TYPE=make
@@ -10,9 +10,9 @@
# Determine which OS we are on
if [ "${OS}" = "" ]; then
----
rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak.orig
2014-03-12 14:47:37.513191381 +0000
-+++
rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak
2014-03-12 14:47:45.672200015 +0000
-@@ -94,7 +94,7 @@
+---
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
+@@ -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
@@ -21,3 +21,18 @@
-fpic \
-DLINUX \
-DDEFAULT_OS="\"$(DEFAULT_OS)\"" \
+---
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 @@
+ OS_TYPE = linux
+ JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE}
+ INCLUDE = `pkg-config --cflags gio-2.0`
+-COMPILER_FLAGS = -O0 -fPIC -g3 -Wall -c -fmessage-length=0
${TARGET_ENVIRONMENT}
++COMPILER_FLAGS = $(CFLAGS) -fPIC -c ${TARGET_ENVIRONMENT}
+
+ LIBS := `pkg-config --libs gio-2.0`
+-LINKER_FLAGS= ${TARGET_ENVIRONMENT}
++LINKER_FLAGS = $(LDFLAGS) ${TARGET_ENVIRONMENT}
+
+ all: link
+
++++++ eclipse-disable-droplets-in-dropins.patch ++++++
--- /var/tmp/diff_new_pack.PwNZ6p/_old 2020-07-16 12:15:24.314779846 +0200
+++ /var/tmp/diff_new_pack.PwNZ6p/_new 2020-07-16 12:15:24.314779846 +0200
@@ -17,7 +17,7 @@
index 802ee1b..74023fe 100644
---
rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java
+++
rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java
-@@ -168,11 +168,24 @@ public class PlatformXmlListener extends
DirectoryChangeListener {
+@@ -172,11 +172,24 @@ public class PlatformXmlListener extends
DirectoryChangeListener {
* Ensure that we have a repository for each site in the given
configuration.
*/
protected void synchronizeConfiguration(Configuration config) {
++++++ eclipse-disable-uses-constraints.patch ++++++
--- /var/tmp/diff_new_pack.PwNZ6p/_old 2020-07-16 12:15:24.322779854 +0200
+++ /var/tmp/diff_new_pack.PwNZ6p/_new 2020-07-16 12:15:24.326779858 +0200
@@ -12,7 +12,7 @@
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
-@@ -1230,7 +1230,9 @@ public class ResolverImpl implements Resolver
+@@ -1234,7 +1234,9 @@ public class ResolverImpl implements Resolver
{
public void run()
{
++++++ eclipse-feature-plugins-to-category-ius.patch ++++++
++++ 671 lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/eclipse/eclipse-feature-plugins-to-category-ius.patch
++++ and
/work/SRC/openSUSE:Factory/.eclipse.new.3592/eclipse-feature-plugins-to-category-ius.patch
++++++ eclipse-fix-dropins.patch ++++++
--- /var/tmp/diff_new_pack.PwNZ6p/_old 2020-07-16 12:15:24.346779878 +0200
+++ /var/tmp/diff_new_pack.PwNZ6p/_new 2020-07-16 12:15:24.350779882 +0200
@@ -1,6 +1,6 @@
---
rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java.orig
2014-03-24 10:49:00.000000000 +0000
+++
rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java
2014-03-24 15:39:32.122246214 +0000
-@@ -39,6 +39,7 @@
+@@ -44,6 +44,7 @@
public class SimpleProfileRegistry implements IProfileRegistry, IAgentService
{
@@ -8,7 +8,7 @@
private static final String SIMPLE_PROFILE_REGISTRY_INTERNAL =
"_simpleProfileRegistry_internal_"; //$NON-NLS-1$
private static final String PROFILE_REGISTRY = "profile registry";
//$NON-NLS-1$
private static final String PROFILE_PROPERTIES_FILE =
"state.properties"; //$NON-NLS-1$
-@@ -266,6 +267,14 @@
+@@ -274,6 +275,14 @@
//fragments support - remeber the
property
internalSetProfileStateProperty(profile, profile.getTimestamp(),
SIMPLE_PROFILE_REGISTRY_INTERNAL + getExtTimeStamp(), getExtTimeStamp());
agent.registerService(SERVICE_SHARED_INSTALL_NEW_TIMESTAMP,
Long.toString(profile.getTimestamp()));
@@ -23,7 +23,7 @@
} else {
//This is the first time we create the
shared profile. Tag it as such and also remember the timestamp of the base
internalSetProfileStateProperty(profile, profile.getTimestamp(),
IProfile.STATE_PROP_SHARED_INSTALL,
IProfile.STATE_SHARED_INSTALL_VALUE_INITIAL);
-@@ -299,6 +308,13 @@
+@@ -307,6 +316,13 @@
if (agent.getService(SERVICE_SHARED_INSTALL_NEW_TIMESTAMP) !=
null)
return false;
@@ -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
-@@ -570,6 +570,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<IInstallableUnit> allIUs = getAllIUsFromRepos();
+ HashSet<IInstallableUnit> removedFromAllIUs = new
HashSet<IInstallableUnit>();
for (Iterator<IInstallableUnit> iter = allIUs.iterator();
iter.hasNext();) {
final IInstallableUnit iu = iter.next();
IInstallableUnit existing = profileIUs.get(iu);
-@@ -583,6 +584,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;
}
-@@ -625,7 +627,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);
}
-@@ -799,8 +801,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
-@@ -148,7 +148,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
+@@ -158,8 +158,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());
++++++ eclipse-fix-tests.patch ++++++
--- /var/tmp/diff_new_pack.PwNZ6p/_old 2020-07-16 12:15:24.358779890 +0200
+++ /var/tmp/diff_new_pack.PwNZ6p/_new 2020-07-16 12:15:24.362779894 +0200
@@ -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 @@
+@@ -80,7 +80,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 @@
+@@ -246,7 +246,7 @@
if (parent != null) {
File[] children =
parent.listFiles((FileFilter) pathname -> {
String name =
pathname.getName();
@@ -33,7 +26,7 @@
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 @@
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/
@@ -59,16 +52,16 @@
index bc8963d..fbe4da3 100644
--- eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties
+++ eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties
-@@ -25,3 +25,6 @@
+@@ -28,3 +28,6 @@
src.includes = about.html
compilerArg=-proc:none
- jars.extra.classpath = java10/java10api.jar
+ jars.extra.classpath = lib/java13api.jar
+source.lib/apttestprocessors.jar = processors/
+jars.compile.order = lib/apttestprocessors.jar,\
+ .
--- eclipse.platform/ant/org.eclipse.ant.tests.ui/build.properties.orig
2016-03-24 14:25:47.076289150 +0000
+++ eclipse.platform/ant/org.eclipse.ant.tests.ui/build.properties
2016-03-24 14:26:39.528660802 +0000
-@@ -25,6 +25,8 @@
+@@ -28,6 +28,8 @@
Ant Tests/
source.lib/antUITestsSupport.jar = test support/
@@ -80,7 +73,7 @@
output.anttestsui.jar = bin/
--- eclipse.jdt.ui/org.eclipse.jdt.ui.tests/build.properties.orig
2016-03-25 15:09:40.557786910 +0000
+++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/build.properties 2016-03-25
15:12:08.476059326 +0000
-@@ -22,3 +22,5 @@
+@@ -25,3 +25,5 @@
leaks/,\
performance/
javacWarnings..=-raw,-unchecked
@@ -195,7 +188,7 @@
+SearchResultView.removed_resource= <removed resource>
--- eclipse.platform/ant/org.eclipse.ant.tests.core/build.properties.orig
2017-03-03 14:20:53.868573338 +0000
+++ eclipse.platform/ant/org.eclipse.ant.tests.core/build.properties
2017-03-06 14:26:42.382365639 +0000
-@@ -23,6 +23,8 @@
+@@ -26,6 +26,8 @@
source.anttestscore.jar = test plugin/,\
tests/
source.lib/antTestsSupport.jar = test support/
@@ -231,36 +224,9 @@
+ }
+}
+
---- eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/pom.xml.orig
2017-04-07 10:44:33.764607961 +0100
-+++ eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/pom.xml
2017-04-07 11:26:44.511961798 +0100
-@@ -26,4 +26,24 @@
- <testClass>org.eclipse.jdt.core.tests.builder.BuilderTests</testClass>
- <testSuite>${project.artifactId}</testSuite>
- </properties>
-+
-+ <build>
-+ <plugins>
-+ <plugin>
-+ <groupId>org.eclipse.tycho</groupId>
-+ <artifactId>target-platform-configuration</artifactId>
-+ <configuration>
-+ <dependency-resolution>
-+ <extraRequirements>
-+ <requirement>
-+ <type>eclipse-plugin</type>
-+ <id>org.eclipse.jdt.annotation</id>
-+ <versionRange>0.0.0</versionRange>
-+ </requirement>
-+ </extraRequirements>
-+ </dependency-resolution>
-+ </configuration>
-+ </plugin>
-+ </plugins>
-+ </build>
- </project>
--- eclipse.pde.build/org.eclipse.pde.build.tests/test.xml.orig
2017-04-28 11:49:47.046123546 +0100
+++ eclipse.pde.build/org.eclipse.pde.build.tests/test.xml 2017-04-28
12:05:11.947521737 +0100
-@@ -156,13 +156,6 @@
+@@ -159,13 +159,6 @@
id="org.eclipse.jdt.source.feature.group"
version="" />
<iu
@@ -274,3 +240,41 @@
id="org.eclipse.e4.rcp.feature.group"
version="" />
<iu
+--- eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/pom.xml.orig
2019-03-11 12:52:52.879124384 +0000
++++ eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/pom.xml
2019-03-11 12:54:16.445849939 +0000
+@@ -39,7 +39,22 @@
+ </includes>
+ <argLine>${tycho.surefire.argLine}</argLine>
+ </configuration>
+- </plugin>
++ </plugin>
++ <plugin>
++ <groupId>org.eclipse.tycho</groupId>
++ <artifactId>target-platform-configuration</artifactId>
++ <configuration>
++ <dependency-resolution>
++ <extraRequirements>
++ <requirement>
++ <type>eclipse-plugin</type>
++ <id>org.eclipse.jdt.annotation</id>
++ <versionRange>0.0.0</versionRange>
++ </requirement>
++ </extraRequirements>
++ </dependency-resolution>
++ </configuration>
++ </plugin>
+ </plugins>
+ </build>
+
+--- eclipse.jdt.debug/org.eclipse.jdt.debug.ui/build.properties.orig
2019-12-19 05:19:24.194321737 +0000
++++ eclipse.jdt.debug/org.eclipse.jdt.debug.ui/build.properties
2019-12-19 05:20:03.702264652 +0000
+@@ -21,6 +21,9 @@
+
+ src.includes = about.html,\
+ schema/
++source.snippetsupport.jar=Snippet Support/
+ source.. = ui/
+ output.. = bin/
++output.snippetsupport.jar = snippet_bin/
+ javacWarnings..=-unavoidableGenericProblems
++javacWarnings.snippersupport.jar=-unavoidableGenericProblems
++++++ eclipse-hide-droplets-from-install-wizard.patch ++++++
--- /var/tmp/diff_new_pack.PwNZ6p/_old 2020-07-16 12:15:24.370779902 +0200
+++ /var/tmp/diff_new_pack.PwNZ6p/_new 2020-07-16 12:15:24.374779907 +0200
@@ -1,20 +1,22 @@
-commit 4bfc5a7c6d8c2aaf954c113d805419472de2bcaf
-Author: Mat Booth <mat.bo...@redhat.com>
-Date: Thu May 3 15:58:49 2018 +0100
+From a23545ef5b4cbb94ff048fda2839ba08c3593d50 Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.bo...@redhat.com>
+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
+ <mat.bo...@redhat.com>
- 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 <mat.bo...@redhat.com>
+---
+ .../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
-@@ -300,6 +300,19 @@ public class RepositorySelectionGroup {
+@@ -303,6 +303,19 @@ public class RepositorySelectionGroup {
void fillRepoCombo(final String selection) {
RepositoryTracker tracker = ui.getRepositoryTracker();
URI[] sites = tracker.getKnownRepositories(ui.getSession());
@@ -35,30 +37,33 @@
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
-@@ -130,9 +130,22 @@ public class RepositoryManipulationPage extends
PreferencePage implements IWorkb
+@@ -133,9 +133,22 @@ public class RepositoryManipulationPage extends
PreferencePage implements IWorkb
if (cachedElements == null) {
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
+
++++++ eclipse-ignore-version-when-calculating-home.patch ++++++
--- /var/tmp/diff_new_pack.PwNZ6p/_old 2020-07-16 12:15:24.386779918 +0200
+++ /var/tmp/diff_new_pack.PwNZ6p/_new 2020-07-16 12:15:24.386779918 +0200
@@ -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
-@@ -1383,7 +1383,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.
++++++ eclipse-make-droplets-runnable.patch ++++++
--- /var/tmp/diff_new_pack.PwNZ6p/_old 2020-07-16 12:15:24.398779931 +0200
+++ /var/tmp/diff_new_pack.PwNZ6p/_new 2020-07-16 12:15:24.398779931 +0200
@@ -19,7 +19,7 @@
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<IArt
+@@ -284,6 +284,22 @@ public class ExtensionLocationArtifactRepository extends
AbstractRepository<IArt
return artifactRepository.getProperties();
}
++++++ eclipse-no-source-for-dependencies.patch ++++++
--- /var/tmp/diff_new_pack.PwNZ6p/_old 2020-07-16 12:15:24.410779943 +0200
+++ /var/tmp/diff_new_pack.PwNZ6p/_new 2020-07-16 12:15:24.410779943 +0200
@@ -26,68 +26,17 @@
</excludes>
</configuration>
</execution>
---- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak
2012-07-31 07:43:57.000000000 +0200
-+++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml
2012-07-31 08:05:24.279277920 +0200
-@@ -34,6 +34,17 @@
- <goals>
- <goal>source-feature</goal>
- </goals>
-+ <configuration>
-+ <excludes>
-+ <plugin id="javax.servlet-api" /><plugin id="javax.el"
/><plugin id="com.sun.el.javax.el" /><plugin id="org.apache.el" /><plugin
id="org.apache.commons.logging" />
-+ <plugin id="javax.servlet.jsp" /><plugin
id="org.apache.lucene.analysis" /><plugin id="org.apache.lucene.core" />
-+ <plugin id="org.apache.tomcat" /><plugin
id="org.eclipse.jetty.continuation" /><plugin id="org.eclipse.jetty.http" />
-+ <plugin id="org.apache.juli" /><plugin
id="org.eclipse.jetty.io" /><plugin id="org.eclipse.jetty.security" />
-+ <plugin id="org.eclipse.jetty.util" /><plugin
id="org.eclipse.jetty.server" />
-+ <plugin id="org.glassfish.web.javax.servlet.jsp" /><plugin
id="org.eclipse.jetty.servlet" />
-+ <plugin id="org.apache.commons.el" /><plugin
id="org.glassfish.web.javax.servlet.jsp" />
-+ </excludes>
-+ </configuration>
- </execution>
- </executions>
- </plugin>
---- eclipse.pde.ui/features/org.eclipse.pde-feature/pom.xml.bak
2013-01-29 11:22:47.065953870 +0100
-+++ eclipse.pde.ui/features/org.eclipse.pde-feature/pom.xml 2013-01-29
11:23:18.630196529 +0100
-@@ -38,6 +38,8 @@
- <configuration>
- <excludes>
- <plugin id="org.eclipse.pde"/>
-+ <plugin id="org.objectweb.asm"/>
-+ <plugin id="org.objectweb.asm.tree"/>
- <plugin id="org.eclipse.pde.doc.user"/>
- </excludes>
- </configuration>
---- eclipse.jdt/org.eclipse.jdt-feature/pom.xml.orig 2013-02-20
16:32:38.000000000 +0100
-+++ eclipse.jdt/org.eclipse.jdt-feature/pom.xml 2013-02-21
10:08:50.404275226 +0100
-@@ -57,6 +57,8 @@
- <excludes>
- <plugin id="org.eclipse.jdt"/>
- <plugin id="org.eclipse.jdt.doc.user"/>
-+ <plugin id="org.junit" />
-+ <plugin id="org.hamcrest.core" />
- </excludes>
- </configuration>
- </execution>
---- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.orig
2014-11-28 15:27:07.874872769 +0000
-+++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml
2014-11-28 15:31:02.592652099 +0000
-@@ -68,6 +68,8 @@
- <plugin id="org.eclipse.core.net.linux.x86_64"/>
- <plugin id="org.eclipse.core.net.win32.x86"/>
- <plugin id="org.eclipse.core.net.win32.x86_64"/>
-+ <plugin id="com.jcraft.jsch"/>
-+ <plugin id="org.apache.ant"/>
- </excludes>
- </configuration>
- </execution>
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.orig
2014-05-26 18:37:25.406426611 +0300
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2014-05-26
18:37:47.327449374 +0300
-@@ -44,6 +44,22 @@
+@@ -42,6 +42,24 @@
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc64le"/>
<plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/>
- <plugin id="org.eclipse.equinox.launcher.win32.win32.x86"/>
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.arm" />
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.aarch64" />
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.s390x" />
++ <plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc64" />
++ <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86" />
+ <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa"
/>
+ <plugin id="org.apache.commons.jxpath" />
+ <plugin id="org.apache.felix.gogo.command" />
@@ -104,8 +53,8 @@
</excludes>
</configuration>
</execution>
---- 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"/>
@@ -116,10 +65,10 @@
- <import feature="org.eclipse.ecf.core.feature.source" version="1.4.0"
match="compatible"/>
- <import feature="org.eclipse.ecf.core.ssl.feature.source"
version="1.1.0" match="compatible"/>
- <import feature="org.eclipse.ecf.filetransfer.feature.source"
version="3.13.7" match="compatible"/>
-- <import
feature="org.eclipse.ecf.filetransfer.httpclient4.feature.source"
version="3.13.7" match="compatible"/>
-- <import
feature="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source"
version="1.1.0" match="compatible"/>
+- <import
feature="org.eclipse.ecf.filetransfer.httpclient45.feature.source"
version="1.0.0" match="compatible"/>
- <import feature="org.eclipse.ecf.filetransfer.ssl.feature.source"
version="1.1.0" match="compatible"/>
- </requires>
-
+-
<plugin
id="org.eclipse.sdk"
+ download-size="0"
++++++ eclipse-p2-pick-up-renamed-jars.patch ++++++
--- /var/tmp/diff_new_pack.PwNZ6p/_old 2020-07-16 12:15:24.422779955 +0200
+++ /var/tmp/diff_new_pack.PwNZ6p/_new 2020-07-16 12:15:24.426779959 +0200
@@ -1,6 +1,6 @@
---
rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java.orig
2018-04-25 15:35:44.914031196 +0100
+++
rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java
2018-04-25 15:36:17.546856697 +0100
-@@ -885,7 +885,7 @@
+@@ -884,7 +884,7 @@
//First check to see if there is already an IU around
for this
IInstallableUnit bundleIU = queryForIU(result,
bd.getSymbolicName(), PublisherHelper.fromOSGiVersion(bd.getVersion()));
IArtifactKey bundleArtKey =
createBundleArtifactKey(bd.getSymbolicName(), bd.getVersion().toString());
++++++ eclipse-patch-out-fileupload-dep.patch ++++++
---
rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF.orig
2019-05-30 16:37:50.444183989 +0100
+++
rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
2019-05-30 16:39:53.635849673 +0100
@@ -11,10 +11,7 @@
org.eclipse.equinox.http.servlet.context;version="1.0.0";x-internal:=true,
org.eclipse.equinox.http.servlet.session;version="1.0.0";x-internal:=true,
org.eclipse.equinox.http.servlet.dto;version="1.0.0";x-internal:=true
-Import-Package: org.apache.commons.fileupload;version="[1.2.2,
2.0.0)";resolution:=optional,
- org.apache.commons.fileupload.disk;version="[1.2.2,
2.0.0)";resolution:=optional,
- org.apache.commons.fileupload.servlet;version="[1.2.2,
2.0.0)";resolution:=optional,
- javax.servlet;version="[3.1.0,5.0.0)",
+Import-Package: javax.servlet;version="[3.1.0,5.0.0)",
javax.servlet.annotation;version="[3.1.0,5.0.0)";resolution:=optional,
javax.servlet.descriptor;version="[3.1.0,5.0.0)";resolution:=optional,
javax.servlet.http;version="[3.1.0,5.0.0)",
---
rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet.tests/META-INF/MANIFEST.MF.orig
2019-05-30 16:55:25.117321897 +0100
+++
rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet.tests/META-INF/MANIFEST.MF
2019-05-30 16:55:36.792290214 +0100
@@ -8,9 +8,6 @@
Require-Bundle: org.junit;bundle-version="4.0"
Import-Package: javax.servlet;version="2.6.0",
javax.servlet.http;version="2.6.0",
- org.apache.commons.fileupload;version="1.2.2",
- org.apache.commons.fileupload.disk;version="1.2.2",
- org.apache.commons.fileupload.servlet;version="1.2.2",
org.eclipse.equinox.http.jetty;version="1.4.0",
org.eclipse.equinox.http.servlet;version="1.1.0",
org.eclipse.equinox.http.servlet.context;version="1.0.0",
--- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml.orig
2019-06-20 11:07:22.539088841 +0100
+++ eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
2019-06-20 11:07:27.679071742 +0100
@@ -20,7 +20,6 @@
</license>
<requires>
- <import plugin="org.apache.commons.fileupload" />
<import plugin="org.apache.commons.io" />
<import plugin="org.hamcrest.core" />
<import plugin="org.hamcrest.library" />
---
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;
@@ -2657,66 +2653,6 @@
}
@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 {
-
- 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<FileItem> items = null;
- try {
- List<FileItem> 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<String, Object> 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<String, List<Object>> map = new HashMap<>();
-
- map.put("file",
Arrays.<Object>asList(getClass().getResource("blue.png")));
-
- Map<String, List<String>> 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 {
Servlet servlet = new HttpServlet() {
private static final long serialVersionUID = 1L;
++++++ eclipse-pde-tp-support-droplets.patch ++++++
--- /var/tmp/diff_new_pack.PwNZ6p/_old 2020-07-16 12:15:24.442779975 +0200
+++ /var/tmp/diff_new_pack.PwNZ6p/_new 2020-07-16 12:15:24.446779980 +0200
@@ -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 <rgrun...@redhat.com>
Date: Thu, 7 Apr 2016 10:23:49 -0400
Subject: [PATCH] Support reading BundleInfo from p2 Droplets enabled
@@ -6,51 +6,56 @@
- 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
-@@ -102,6 +102,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
-@@ -15,11 +15,12 @@
- package org.eclipse.pde.internal.core;
-
- import java.io.*;
+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;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.*;
+import java.nio.file.Paths;
- import java.util.*;
- import org.eclipse.core.runtime.*;
++import java.util.Arrays;
+ import java.util.ArrayList;
+ import java.util.Collection;
+ import java.util.HashMap;
+@@ -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;
++import org.eclipse.core.runtime.URIUtil;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
+import
org.eclipse.equinox.internal.simpleconfigurator.utils.SimpleConfiguratorUtils;
import org.eclipse.equinox.p2.core.IProvisioningAgent;
import org.eclipse.equinox.p2.core.IProvisioningAgentProvider;
- import org.eclipse.equinox.p2.engine.*;
-@@ -32,6 +33,7 @@ import org.eclipse.osgi.service.resolver.*;
- import org.eclipse.pde.core.plugin.*;
+ import org.eclipse.equinox.p2.engine.IEngine;
+@@ -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;
+import org.eclipse.pde.internal.core.util.ManifestUtils;
import org.osgi.framework.Constants;
/**
-@@ -111,7 +113,16 @@ public class P2Utils {
+@@ -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();
@@ -68,7 +73,7 @@
if (bundles == null || bundles.length == 0) {
return null;
}
-@@ -143,11 +154,38 @@ public class P2Utils {
+@@ -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));
@@ -106,9 +111,9 @@
}
- return srcBundles;
+ return allSrcBundles.toArray(new BundleInfo[0]);
- } catch (MalformedURLException e) {
+ } catch (IOException e) {
PDECore.log(e);
return null;
--
-2.7.4
+2.21.1
++++++ eclipse-platform-sources-4.9-clean.tar.xz ->
eclipse-platform-sources-4.15-clean.tar.xz ++++++
/work/SRC/openSUSE:Factory/eclipse/eclipse-platform-sources-4.9-clean.tar.xz
/work/SRC/openSUSE:Factory/.eclipse.new.3592/eclipse-platform-sources-4.15-clean.tar.xz
differ: char 26, line 1
++++++ eclipse-secondary-arches.patch ++++++
--- /var/tmp/diff_new_pack.PwNZ6p/_old 2020-07-16 12:15:24.478780011 +0200
+++ /var/tmp/diff_new_pack.PwNZ6p/_new 2020-07-16 12:15:24.478780011 +0200
@@ -1,100 +1,94 @@
----
eclipse-platform-sources-I20180906-0745/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
2018-06-13 09:08:26.000000000 +0200
-+++
eclipse-platform-sources-I20180906-0745/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
2019-11-23 19:43:05.635964482 +0100
-@@ -34,3 +34,23 @@
- requires.7.name = org.eclipse.swt.gtk.linux.ppc64le
- requires.7.range = [$version$,$version$]
- requires.7.filter =
(&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
+diff -urEbwB
eclipse-platform-sources-I20200305-0155/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
eclipse-platform-sources-I20200305-0155.new/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
+---
eclipse-platform-sources-I20200305-0155/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
2020-03-05 08:07:32.000000000 +0100
++++
eclipse-platform-sources-I20200305-0155.new/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
2020-04-29 14:34:16.387156867 +0200
+@@ -24,3 +24,18 @@
+ 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.aarch64
++requires.6.range = [$version$,$version$]
++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.s390x
++requires.7.range = [$version$,$version$]
++requires.7.filter =
(&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
+
+requires.8.namespace = org.eclipse.equinox.p2.iu
+requires.8.name = org.eclipse.swt.gtk.linux.ppc64
+requires.8.range = [$version$,$version$]
+requires.8.filter =
(&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64)(!(org.eclipse.swt.buildtime=true)))
-+
-+requires.9.namespace = org.eclipse.equinox.p2.iu
-+requires.9.name = org.eclipse.swt.gtk.linux.arm
-+requires.9.range = [$version$,$version$]
-+requires.9.filter =
(&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true)))
-+
-+requires.10.namespace = org.eclipse.equinox.p2.iu
-+requires.10.name = org.eclipse.swt.gtk.linux.aarch64
-+requires.10.range = [$version$,$version$]
-+requires.10.filter =
(&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
-+
-+requires.11.namespace = org.eclipse.equinox.p2.iu
-+requires.11.name = org.eclipse.swt.gtk.linux.s390x
-+requires.11.range = [$version$,$version$]
-+requires.11.filter =
(&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
----
eclipse-platform-sources-I20180906-0745/eclipse.platform.swt.binaries/pom.xml
2018-09-06 13:47:25.000000000 +0200
-+++
eclipse-platform-sources-I20180906-0745/eclipse.platform.swt.binaries/pom.xml
2019-11-23 19:43:05.635964482 +0100
-@@ -54,7 +54,11 @@
+diff -urEbwB
eclipse-platform-sources-I20200305-0155/eclipse.platform.swt.binaries/pom.xml
eclipse-platform-sources-I20200305-0155.new/eclipse.platform.swt.binaries/pom.xml
+---
eclipse-platform-sources-I20200305-0155/eclipse.platform.swt.binaries/pom.xml
2020-03-05 08:07:32.000000000 +0100
++++
eclipse-platform-sources-I20200305-0155.new/eclipse.platform.swt.binaries/pom.xml
2020-04-29 14:32:52.690665564 +0200
+@@ -54,7 +54,10 @@
<modules>
<module>bundles/org.eclipse.swt.cocoa.macosx.x86_64</module>
-+ <module>bundles/org.eclipse.swt.gtk.linux.arm</module>
+ <module>bundles/org.eclipse.swt.gtk.linux.aarch64</module>
+ <module>bundles/org.eclipse.swt.gtk.linux.ppc64</module>
<module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
+ <module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
- <module>bundles/org.eclipse.swt.gtk.linux.x86</module>
<module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
- <module>bundles/org.eclipse.swt.win32.win32.x86</module>
----
eclipse-platform-sources-I20180906-0745/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
2018-09-06 06:27:51.000000000 +0200
-+++
eclipse-platform-sources-I20180906-0745/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
2019-11-23 19:44:52.823489642 +0100
-@@ -420,6 +420,46 @@
- fragment="true"/>
+ <module>bundles/org.eclipse.swt.win32.win32.x86_64</module>
+ </modules>
+diff -urEbwB
eclipse-platform-sources-I20200305-0155/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
eclipse-platform-sources-I20200305-0155.new/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
+---
eclipse-platform-sources-I20200305-0155/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
2020-03-05 08:07:35.000000000 +0100
++++
eclipse-platform-sources-I20200305-0155.new/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
2020-04-29 14:30:52.145958027 +0200
+@@ -393,6 +393,26 @@
+ unpack="false"/>
<plugin
-+ id="org.eclipse.equinox.launcher.gtk.linux.ppc64"
-+ os="linux"
-+ ws="gtk"
-+ arch="ppc64"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ fragment="true"/>
-+
-+ <plugin
-+ id="org.eclipse.equinox.launcher.gtk.linux.arm"
++ id="org.eclipse.equinox.launcher.gtk.linux.aarch64"
+ os="linux"
+ ws="gtk"
-+ arch="arm"
++ arch="aarch64"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"/>
+
+ <plugin
-+ id="org.eclipse.equinox.launcher.gtk.linux.aarch64"
++ id="org.eclipse.equinox.launcher.gtk.linux.s390x"
+ os="linux"
+ ws="gtk"
-+ arch="aarch64"
++ arch="s390x"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"/>
+
+ <plugin
-+ id="org.eclipse.equinox.launcher.gtk.linux.s390x"
+ id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"
+ os="macosx"
+ ws="cocoa"
+@@ -403,6 +423,16 @@
+ fragment="true"/>
+
+ <plugin
++ id="org.eclipse.equinox.launcher.gtk.linux.ppc64"
+ os="linux"
+ ws="gtk"
-+ arch="s390x"
++ arch="ppc64"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"/>
+
+ <plugin
- id="org.eclipse.equinox.launcher.gtk.linux.x86"
+ id="org.eclipse.equinox.launcher.gtk.linux.ppc64le"
os="linux"
ws="gtk"
-@@ -500,6 +540,39 @@
+@@ -451,6 +481,17 @@
unpack="false"/>
<plugin
-+ id="org.eclipse.swt.gtk.linux.s390x"
++ id="org.eclipse.swt.gtk.linux.ppc64"
+ os="linux"
+ ws="gtk"
-+ arch="s390x"
++ arch="ppc64"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
@@ -102,21 +96,21 @@
+ unpack="false"/>
+
+ <plugin
-+ id="org.eclipse.swt.gtk.linux.arm"
-+ os="linux"
-+ ws="gtk"
-+ arch="arm"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
+ id="org.eclipse.swt.gtk.linux.ppc64le"
+ os="linux"
+ ws="gtk"
+@@ -480,6 +521,28 @@
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+
+ <plugin
-+ id="org.eclipse.swt.gtk.linux.aarch64"
++ id="org.eclipse.swt.gtk.linux.s390x"
+ os="linux"
+ ws="gtk"
-+ arch="aarch64"
++ arch="s390x"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
@@ -124,108 +118,102 @@
+ unpack="false"/>
+
+ <plugin
- id="org.eclipse.swt.gtk.linux.ppc64le"
- os="linux"
- ws="gtk"
-@@ -507,6 +580,17 @@
- download-size="0"
- install-size="0"
- version="0.0.0"
-+ fragment="true"
-+ unpack="false"/>
-+
-+ <plugin
-+ id="org.eclipse.swt.gtk.linux.ppc64"
++ id="org.eclipse.swt.gtk.linux.aarch64"
+ os="linux"
+ ws="gtk"
-+ arch="ppc64"
++ arch="aarch64"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
fragment="true"
unpack="false"/>
----
eclipse-platform-sources-I20180906-0745/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml
2019-11-23 19:40:36.264645015 +0100
-+++
eclipse-platform-sources-I20180906-0745/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml
2019-11-23 20:29:03.687864708 +0100
-@@ -46,6 +46,7 @@
- <plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
- <plugin id="org.eclipse.equinox.launcher.gtk.linux.arm" />
- <plugin id="org.eclipse.equinox.launcher.gtk.linux.aarch64" />
-+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc64" />
- <plugin id="org.eclipse.equinox.launcher.gtk.linux.s390x" />
- <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa"
/>
- <plugin id="org.apache.commons.jxpath" />
----
eclipse-platform-sources-I20180906-0745/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
2018-08-23 02:04:10.000000000 +0200
-+++
eclipse-platform-sources-I20180906-0745/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
2019-11-23 19:43:05.631964499 +0100
-@@ -37,3 +37,15 @@
+diff -urEbwB
eclipse-platform-sources-I20200305-0155/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
eclipse-platform-sources-I20200305-0155.new/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
+---
eclipse-platform-sources-I20200305-0155/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
2020-03-05 08:07:38.000000000 +0100
++++
eclipse-platform-sources-I20200305-0155.new/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
2020-04-29 14:32:29.866531591 +0200
+@@ -24,6 +24,9 @@
+ root.win32.win32.x86_64=bin/win32/win32/x86_64
+ root.win32.win32.x86_64.permissions.755=launcher.exe
+
++root.linux.gtk.ppc64=bin/gtk/linux/ppc64,gtk_root
++root.linux.gtk.ppc64.permissions.755=launcher
++
+ root.linux.gtk.ppc64le=bin/gtk/linux/ppc64le,gtk_root
+ root.linux.gtk.ppc64le.permissions.755=launcher
+
+@@ -32,3 +35,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.ppc64=bin/gtk/linux/ppc64,gtk_root
-+root.linux.gtk.ppc64.permissions.755=launcher
-+
+root.linux.gtk.s390x=bin/gtk/linux/s390x,gtk_root
+root.linux.gtk.s390x.permissions.755=launcher
----
eclipse-platform-sources-I20180906-0745/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
2018-08-23 02:04:10.000000000 +0200
-+++
eclipse-platform-sources-I20180906-0745/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
2019-11-23 19:43:05.635964482 +0100
-@@ -109,7 +109,7 @@
+diff -urEbwB
eclipse-platform-sources-I20200305-0155/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
eclipse-platform-sources-I20200305-0155.new/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
+---
eclipse-platform-sources-I20200305-0155/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
2020-03-05 08:07:38.000000000 +0100
++++
eclipse-platform-sources-I20200305-0155.new/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
2020-04-29 14:36:12.123836247 +0200
+@@ -97,10 +97,15 @@
+ defaultJavaHome=`readlink -f /usr/bin/java |
sed "s:jre/bin/java::"`
+
OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
+ ;;
++ "ppc64")
++ defaultOSArch="ppc64"
++ defaultJava=DEFAULT_JAVA_EXEC
++
OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
++ ;;
"s390x")
defaultOSArch="s390x"
defaultJava=DEFAULT_JAVA_EXEC
-
OUTPUT_DIR="$EXEC_DIR/contributed/$defaultWS/$defaultOS/$defaultOSArch"
+
OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
;;
- arm*)
- defaultOSArch="arm"
----
eclipse-platform-sources-I20180906-0745/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
2018-09-06 13:47:31.000000000 +0200
-+++
eclipse-platform-sources-I20180906-0745/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
2019-11-23 19:43:05.631964499 +0100
-@@ -123,7 +123,11 @@
+ "aarch64")
+ defaultOSArch="aarch64"
+diff -urEbwB
eclipse-platform-sources-I20200305-0155/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
eclipse-platform-sources-I20200305-0155.new/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
+---
eclipse-platform-sources-I20200305-0155/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
2020-03-05 08:07:38.000000000 +0100
++++
eclipse-platform-sources-I20200305-0155.new/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
2020-04-29 14:31:40.098239474 +0200
+@@ -123,7 +123,10 @@
<copy todir="bin" verbose="true" includeEmptyDirs="false"
failonerror="true">
- <fileset
dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/">
+ <fileset
dir="${rt.equinox.binaries.loc}/org.eclipse.equinox.executable/bin/">
<include name="cocoa/macosx/x86_64/**/*"/>
-+ <include name="gtk/linux/arm/**/*"/>
+ <include name="gtk/linux/aarch64/**/*"/>
+ <include name="gtk/linux/ppc64/**/*"/>
<include name="gtk/linux/ppc64le/**/*"/>
+ <include name="gtk/linux/s390x/**/*"/>
- <include name="gtk/linux/x86/**/*"/>
<include name="gtk/linux/x86_64/**/*"/>
- <include name="win32/win32/x86/**/*"/>
---- eclipse-platform-sources-I20180906-0745/rt.equinox.framework/pom.xml
2018-09-06 13:47:31.000000000 +0200
-+++ eclipse-platform-sources-I20180906-0745/rt.equinox.framework/pom.xml
2019-11-23 19:43:05.635964482 +0100
-@@ -73,6 +73,30 @@
+ <include name="win32/win32/x86_64/**/*"/>
+ </fileset>
+diff -urEbwB
eclipse-platform-sources-I20200305-0155/rt.equinox.framework/pom.xml
eclipse-platform-sources-I20200305-0155.new/rt.equinox.framework/pom.xml
+--- eclipse-platform-sources-I20200305-0155/rt.equinox.framework/pom.xml
2020-03-05 08:07:38.000000000 +0100
++++ eclipse-platform-sources-I20200305-0155.new/rt.equinox.framework/pom.xml
2020-04-29 14:38:40.772708813 +0200
+@@ -77,6 +77,30 @@
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
</modules>
</profile>
+ <profile>
-+ <id>build-native-launchers-gtk.linux.ppc64</id>
++ <id>build-native-launchers-gtk.linux.s390x</id>
+ <activation>
+ <property>
+ <name>native</name>
-+ <value>gtk.linux.ppc64</value>
++ <value>gtk.linux.s390x</value>
+ </property>
+ </activation>
+ <modules>
-+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
++ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390x</module>
+ </modules>
+ </profile>
+ <profile>
-+ <id>build-native-launchers-gtk.linux.s390x</id>
++ <id>build-native-launchers-gtk.linux.ppc64</id>
+ <activation>
+ <property>
+ <name>native</name>
-+ <value>gtk.linux.s390x</value>
++ <value>gtk.linux.ppc64</value>
+ </property>
+ </activation>
+ <modules>
-+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390x</module>
++ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
+ </modules>
+ </profile>
</profiles>
++++++ eclipse-support-symlink-bundles.patch ++++++
--- /var/tmp/diff_new_pack.PwNZ6p/_old 2020-07-16 12:15:24.490780024 +0200
+++ /var/tmp/diff_new_pack.PwNZ6p/_new 2020-07-16 12:15:24.494780027 +0200
@@ -24,14 +24,14 @@
+ 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
+++
rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
-@@ -15,8 +15,12 @@ package
org.eclipse.equinox.internal.simpleconfigurator.utils;
- import java.net.*;
+@@ -20,8 +20,12 @@
import java.nio.file.Files;
+ import java.nio.file.attribute.FileTime;
import java.util.*;
+import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
@@ -43,7 +43,7 @@
public class SimpleConfiguratorUtils {
-@@ -277,6 +281,16 @@ public class SimpleConfiguratorUtils {
+@@ -282,6 +286,16 @@
String symbolicName = tok.nextToken().trim();
String version = tok.nextToken().trim();
URI location = parseLocation(tok.nextToken().trim());
@@ -60,9 +60,9 @@
int startLevel = Integer.parseInt(tok.nextToken().trim());
boolean markedAsStarted = Boolean.parseBoolean(tok.nextToken());
BundleInfo result = new BundleInfo(symbolicName, version,
location, startLevel, markedAsStarted);
-@@ -400,4 +414,93 @@ public class SimpleConfiguratorUtils {
+@@ -420,4 +434,93 @@
}
- return regularTimestamp;
+ return lastModified;
}
+
+ private static Dictionary<String, String> getOSGiManifest(URI location)
{
@@ -154,6 +154,3 @@
+ return result;
+ }
}
---
-2.5.0
-
++++++ eclipse-suse-batik.patch ++++++
--- /var/tmp/diff_new_pack.PwNZ6p/_old 2020-07-16 12:15:24.506780040 +0200
+++ /var/tmp/diff_new_pack.PwNZ6p/_new 2020-07-16 12:15:24.506780040 +0200
@@ -1,18 +1,20 @@
----
eclipse-platform-sources-I20180906-0745/dependencies/replace_platform_plugins_with_symlinks.sh
2019-01-21 00:06:48.212694105 +0100
-+++
eclipse-platform-sources-I20180906-0745/dependencies/replace_platform_plugins_with_symlinks.sh
2019-01-21 00:09:22.629481027 +0100
-@@ -35,9 +35,12 @@
+diff -urEbwB
org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8/dependencies/replace_platform_plugins_with_symlinks.sh
org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8.new/dependencies/replace_platform_plugins_with_symlinks.sh
+---
org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8/dependencies/replace_platform_plugins_with_symlinks.sh
2018-12-11 14:46:07.000000000 +0100
++++
org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8.new/dependencies/replace_platform_plugins_with_symlinks.sh
2020-04-07 08:45:07.442357431 +0200
+@@ -36,11 +36,11 @@
_symlink javax.servlet.jsp_
glassfish-jsp-api/javax.servlet.jsp-api.jar
_symlink javax.servlet-api_ glassfish-servlet-api.jar
_symlink javax.xml_ xml-commons-apis.jar
+- _symlink org.apache.batik.constants_ batik/batik-constants.jar
- _symlink org.apache.batik.css_ batik/batik-css.jar
+- _symlink org.apache.batik.i18n_ batik/batik-i18n.jar
- _symlink org.apache.batik.util_ batik/batik-util.jar
- _symlink org.apache.batik.util.gui_ batik/batik-gui-util.jar
++ _symlink org.apache.batik.constants_
xmlgraphics-batik/constants.jar
+ _symlink org.apache.batik.css_ xmlgraphics-batik/css.jar
-+ _symlink org.apache.batik.util_ xmlgraphics-batik/util.jar
+ _symlink org.apache.batik.i18n_ xmlgraphics-batik/i18n.jar
-+ _symlink org.apache.batik.constants_
xmlgraphics-batik/constants.jar
-+ _symlink org.apache.xmlgraphics_ xmlgraphics-commons.jar
-+ _symlink org.apache.commons.io_ commons-io.jar
++ _symlink org.apache.batik.util_ xmlgraphics-batik/util.jar
++ _symlink org.apache.batik.util.gui_
xmlgraphics-batik/gui-util.jar
_symlink org.apache.commons.codec_ commons-codec.jar
+ _symlink org.apache.commons.io_ commons-io.jar
_symlink org.apache.commons.jxpath_ commons-jxpath.jar
- _symlink org.apache.commons.logging_ commons-logging.jar
++++++ eclipse-swt-avoid-javascript-at-build.patch ++++++
>From dd7d5dd0a820b3efd1a7955a7b80c881a40ddafc Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.bo...@redhat.com>
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 @@
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.mozilla</groupId>
- <artifactId>rhino-runtime</artifactId>
- <version>1.7.12</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.10.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-apache-bsf</artifactId>
- <version>1.10.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
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 @@
<!-- Set swt_version, new_version, (and rev, min_ver, maj_ver, new_rev,
new_min_ver, new_maj_ver) from the make_common.mak -->
<target name="get_version" unless="swt_version">
<loadproperties srcFile="${repo.src}/${file_make_common}"/>
- <script language="javascript">
- <![CDATA[
- rev = project.getProperty("rev");
- min_ver = project.getProperty("min_ver");
- maj_ver = project.getProperty("maj_ver");
- new_rev = parseInt(rev) + 1;
- new_min_ver = min_ver;
- new_maj_ver = maj_ver;
- one = new_maj_ver;
- two = new_min_ver;
- three = new_rev;
- four = 0;
- project.setProperty("new_rev", new_rev);
- project.setProperty("new_min_ver", new_min_ver);
- project.setProperty("new_maj_ver", new_maj_ver);
- project.setProperty("new_comma_ver", one + "," + two +
"," + three + "," + four);
- ]]>
- </script>
<property name="swt_version"
value="${maj_ver}${min_ver}r${rev}"/>
- <property name="new_version"
value="${new_maj_ver}${new_min_ver}r${new_rev}"/>
- <echo>Version=${swt_version}; New=${new_version}; New
comma_ver=${new_comma_ver}</echo>
+ <echo>Version=${swt_version}</echo>
</target>
<target name="get_new_release_version" unless="min_ver">
@@ -523,11 +504,7 @@
</condition>
<property name="fragment_dir"
value="${repo.bin}/bundles/${fragment}"/>
<property name="sha1_file" value="${fragment_dir}/build.sha1"/>
- <script language="javascript">
- <![CDATA[
- project.setProperty("library_src",
project.getProperty("src_" + project.getProperty("swt.ws")));
- ]]>
- </script>
+ <property name="library_src" value="${src_gtk}"/>
</target>
<target name="update_sha1_file_in_fragment">
@@ -661,23 +638,15 @@
</target>
<target name="copy.library.src">
- <script language="javascript">
- <![CDATA[
- var File = java.io.File;
- var StreamTokenizer = java.io.StreamTokenizer;
- var StringReader = java.io.StringReader;
- task = project.createTask("copy");
- projectDir = project.getProperty("project_dir");
- task.setTodir(new
File(project.getProperty("build_dir")));
- tk = new StreamTokenizer(new
StringReader(project.getProperty("library_src")));
- while ((token = tk.nextToken()) !=
StreamTokenizer.TT_EOF) {
- fileset =
project.createDataType("fileset");
- fileset.setDir(new File(projectDir +
"/" + tk.sval + "/"));
- task.addFileset(fileset);
- }
- task.execute();
- ]]>
- </script>
+ <copy todir="${build_dir}">
+ <fileset
dir="${project_dir}/bundles/org.eclipse.swt/Eclipse SWT/common/library/"/>
+ <fileset
dir="${project_dir}/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/"/>
+ <fileset
dir="${project_dir}/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/"/>
+ <fileset
dir="${project_dir}/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/library/"/>
+ <fileset
dir="${project_dir}/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/"/>
+ <fileset
dir="${project_dir}/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/"/>
+ <fileset
dir="${project_dir}/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/"/>
+ </copy>
</target>
<!-- Params: swt.ws, swt.os, swt.arch -->
--
2.21.1
++++++ explicit-hamcrest.patch ++++++
--- eclipse.jdt.debug/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF.orig
2018-08-20 12:54:25.245305107 +0100
+++ eclipse.jdt.debug/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF
2018-08-20 12:54:37.952261537 +0100
@@ -33,6 +33,7 @@
org.eclipse.ui.workbench.texteditor;resolution:=optional,
org.eclipse.ui.editors;resolution:=optional,
org.junit,
+ org.hamcrest.core,
org.eclipse.core.resources,
org.eclipse.core.variables,
org.eclipse.ui,
---
eclipse.platform.ui/tests/org.eclipse.tests.urischeme/META-INF/MANIFEST.MF.orig
2018-08-20 13:22:04.987695821 +0100
+++ eclipse.platform.ui/tests/org.eclipse.tests.urischeme/META-INF/MANIFEST.MF
2018-08-20 13:22:28.507613518 +0100
@@ -7,4 +7,5 @@
Fragment-Host: org.eclipse.urischeme;bundle-version="1.0.0"
Automatic-Module-Name: org.eclipse.urischeme.tests
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-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,
++++++ fix_ant_build.patch ++++++
--- /var/tmp/diff_new_pack.PwNZ6p/_old 2020-07-16 12:15:24.534780068 +0200
+++ /var/tmp/diff_new_pack.PwNZ6p/_new 2020-07-16 12:15:24.534780068 +0200
@@ -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/
++++++ force-clean-after-p2-operations.patch ++++++
>From d964680827a248e8a312c000c4c2443f96c8c459 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.bo...@redhat.com>
Date: Fri, 27 Sep 2019 14:52:54 +0100
Subject: [PATCH] Force a clean on the restart after p2 operations
---
.../META-INF/MANIFEST.MF | 2 +-
.../bundles/org.eclipse.equinox.launcher/pom.xml | 2 +-
.../src/org/eclipse/equinox/launcher/Main.java | 13 +++++++++++++
.../internal/p2/ui/ProvisioningOperationRunner.java | 6 ++++++
4 files changed, 21 insertions(+), 2 deletions(-)
diff --git
a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF
b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF
index 497e5d6fa..a118a0e4c 100644
---
a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF
+++
b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.launcher;singleton:=true
-Bundle-Version: 1.5.700.qualifier
+Bundle-Version: 1.5.701.qualifier
Main-Class: org.eclipse.equinox.launcher.Main
Bundle-ClassPath: .
Bundle-Vendor: %providerName
diff --git a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml
b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml
index 43849b5b8..c5d2cdfea 100644
--- a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml
+++ b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.launcher</artifactId>
- <version>1.5.700-SNAPSHOT</version>
+ <version>1.5.701-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 d013ff7c2..65f4cfd8a 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
@@ -560,6 +560,18 @@
setupVMProperties();
processConfiguration();
+ File oca = new File(getConfigurationLocation().toURI());
+ File ocaFile = new File(oca, "clean_on_restart");
+ if (ocaFile.exists()) {
+ System.err.println("Clean triggered."); //$NON-NLS-1$
+ ocaFile.delete();
+ commands = Arrays.copyOf(args, args.length + 1);
+ commands[commands.length-1] = CLEAN;
+ passThruArgs = Arrays.copyOf(passThruArgs,
passThruArgs.length + 1);
+ passThruArgs[passThruArgs.length-1] = CLEAN;
+ setupVMProperties();
+ }
+
if (protectBase && (System.getProperty(PROP_SHARED_CONFIG_AREA)
== null)) {
System.err.println("This application is configured to
run in a cascaded mode only."); //$NON-NLS-1$
System.setProperty(PROP_EXITCODE, Integer.toString(14));
diff --git
a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvisioningOperationRunner.java
b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvisioningOperationRunner.java
index a70b640ba..8a002ebc2 100644
---
a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvisioningOperationRunner.java
+++
b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvisioningOperationRunner.java
@@ -72,6 +72,12 @@ public class ProvisioningOperationRunner {
* @param restartPolicy
*/
void requestRestart(final int restartPolicy) {
+ String oca = System.getProperty("osgi.configuration.area");
+ try {
+ java.io.File ocaCleanFile = new java.io.File(new
java.net.URL(oca).toURI());
+ new java.io.File(ocaCleanFile,
"clean_on_restart").createNewFile();
+ } catch (Exception e) { /* Eh, we tried... */ }
+
// Global override of restart (used in test cases).
if (suppressRestart)
return;
--
2.20.1
++++++
org.eclipse.linuxtools.eclipse-build-44643cbda3dfd6f00fbf1b346dae7068df2a9ef9.tar.xz
->
org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/org.eclipse.linuxtools.eclipse-build-44643cbda3dfd6f00fbf1b346dae7068df2a9ef9/dependencies/fake_ant_dependency.sh
new/org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8/dependencies/fake_ant_dependency.sh
---
old/org.eclipse.linuxtools.eclipse-build-44643cbda3dfd6f00fbf1b346dae7068df2a9ef9/dependencies/fake_ant_dependency.sh
2018-09-11 15:49:10.000000000 +0200
+++
new/org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8/dependencies/fake_ant_dependency.sh
2018-12-11 14:46:07.000000000 +0100
@@ -22,31 +22,9 @@
pushd $adir 2>&1 >/dev/null
mkdir -p lib bin
rm -f lib/*.jar
- build-jar-repository -s -p lib \
- ant/ant-antlr \
- ant/ant-apache-bcel \
- ant/ant-apache-bsf \
- ant/ant-apache-log4j \
- ant/ant-apache-oro \
- ant/ant-apache-regexp \
- ant/ant-apache-resolver \
- ant/ant-apache-xalan2 \
- ant/ant-commons-logging \
- ant/ant-commons-net \
- ant/ant-javamail \
- ant/ant-jdepend \
- ant/ant-jmf \
- ant/ant-jsch \
- ant/ant-junit4 \
- ant/ant-junit \
- ant/ant-junitlauncher \
- ant/ant-launcher \
- ant/ant-swing \
- ant/ant-testutil \
- ant/ant-xz \
- ant/ant
- for j in lib/*.jar ; do
- mv $j $(echo $j | sed -e 's/ant_//')
+ antlibdir="$(realpath $(dirname $(which ant) )/../share/ant/lib)"
+ for antlib in $(ls -1 $antlibdir) ; do
+ ln -s $antlibdir/$antlib lib/$antlib
done
rm -f bin/ant
ln -s $(which ant) bin/ant
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/org.eclipse.linuxtools.eclipse-build-44643cbda3dfd6f00fbf1b346dae7068df2a9ef9/dependencies/replace_platform_plugins_with_symlinks.sh
new/org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8/dependencies/replace_platform_plugins_with_symlinks.sh
---
old/org.eclipse.linuxtools.eclipse-build-44643cbda3dfd6f00fbf1b346dae7068df2a9ef9/dependencies/replace_platform_plugins_with_symlinks.sh
2018-09-11 15:49:10.000000000 +0200
+++
new/org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8/dependencies/replace_platform_plugins_with_symlinks.sh
2018-12-11 14:46:07.000000000 +0100
@@ -28,17 +28,21 @@
# Remove and symlink all duplicate jars in the platform
pushd plugins
_symlink com.ibm.icu_ icu4j/icu4j.jar
- _symlink com.jcraft.jsch_ jsch.jar
+ _symlink com.jcraft.jsch_ jsch.jar
_symlink com.sun.el.javax.el_ glassfish-el.jar
+ _symlink javax.annotation-api_ glassfish-annotation-api.jar
_symlink javax.el-api_ glassfish-el-api.jar
_symlink javax.inject_ atinject.jar
_symlink javax.servlet.jsp_
glassfish-jsp-api/javax.servlet.jsp-api.jar
_symlink javax.servlet-api_ glassfish-servlet-api.jar
_symlink javax.xml_ xml-commons-apis.jar
+ _symlink org.apache.batik.constants_ batik/batik-constants.jar
_symlink org.apache.batik.css_ batik/batik-css.jar
+ _symlink org.apache.batik.i18n_ batik/batik-i18n.jar
_symlink org.apache.batik.util_ batik/batik-util.jar
_symlink org.apache.batik.util.gui_ batik/batik-gui-util.jar
_symlink org.apache.commons.codec_ commons-codec.jar
+ _symlink org.apache.commons.io_ commons-io.jar
_symlink org.apache.commons.jxpath_ commons-jxpath.jar
_symlink org.apache.commons.logging_ commons-logging.jar
_symlink org.apache.felix.gogo.command_
felix/org.apache.felix.gogo.command.jar
@@ -51,6 +55,7 @@
_symlink org.apache.lucene.analyzers-smartcn_
lucene/lucene-analyzers-smartcn.jar
_symlink org.apache.lucene.core_ lucene/lucene-core.jar
_symlink org.apache.lucene.misc_ lucene/lucene-misc.jar
+ _symlink org.apache.xmlgraphics_ xmlgraphics-commons.jar
_symlink org.eclipse.jetty.util_ jetty/jetty-util.jar
_symlink org.eclipse.jetty.server_ jetty/jetty-server.jar
_symlink org.eclipse.jetty.http_ jetty/jetty-http.jar
++++++ prefer_x11_backend.patch ++++++
--- /var/tmp/diff_new_pack.PwNZ6p/_old 2020-07-16 12:15:24.662780198 +0200
+++ /var/tmp/diff_new_pack.PwNZ6p/_new 2020-07-16 12:15:24.662780198 +0200
@@ -1,6 +1,6 @@
---
rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c.orig
2018-08-22 15:19:04.602623018 +0100
+++
rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c
2018-08-22 15:20:03.453348722 +0100
-@@ -111,6 +111,11 @@
+@@ -114,6 +114,11 @@
#define DLFLAGS RTLD_LAZY
#endif
@@ -11,4 +11,4 @@
+
void *gioLib = NULL, *glibLib = NULL, *gdkLib = NULL, *gtkLib = NULL,
*objLib = NULL, *pixLib = NULL;
- char *gtk3 = getenv("SWT_GTK3");
+ gdkLib = dlopen(GDK3_LIB, DLFLAGS);
