diff --git a/README.en.md b/README.en.md deleted file mode 100644 index fd2b941b1d35e38cace40aa2ab0cbc53b41b0f18..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# eclipse - -#### Description -{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index d8212fb5f9779a595961bb58857eae40b2421da7..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# eclipse - -#### 介绍 -{**以下是码云平台说明，您可以替换此简介** -码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/eclipse-adjust-droplets.patch b/eclipse-adjust-droplets.patch index 01fb1f65693fd0d37da60b87f56a21842dd80b2e..c751924f8e0480aadd4917bc26aced48a5c8dd92 100644 --- a/eclipse-adjust-droplets.patch +++ b/eclipse-adjust-droplets.patch @@ -1,8 +1,8 @@ -diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java +diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java index 5fc0e73..ed7e4fa 100644 ---- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java -+++ b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java -@@ -147,7 +147,20 @@ public class EngineActivator implements BundleActivator { +--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java ++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java +@@ -150,7 +150,20 @@ public class EngineActivator implements BundleActivator { } continue; } @@ -24,11 +24,11 @@ index 5fc0e73..ed7e4fa 100644 // new magic - multiple info files, f.e. // egit.info (git feature) // cdt.link (properties file containing link=path) to other info file -diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java b/rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java +diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java index 12e4d89..77945ef 100644 ---- a/rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java -+++ b/rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java -@@ -155,7 +155,20 @@ public class SimpleConfiguratorUtils { +--- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java ++++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java +@@ -160,7 +160,20 @@ public class SimpleConfiguratorUtils { } continue; } diff --git a/eclipse-debug-symbols.patch b/eclipse-debug-symbols.patch index 582ab94a9097e3016abec83bab87d6c246356333..ef45ac3b5c73b7ffb891f0a362d6f16f83bcf92d 100644 --- a/eclipse-debug-symbols.patch +++ b/eclipse-debug-symbols.patch @@ -1,6 +1,6 @@ ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig 2018-08-19 12:37:52.764590467 +0100 -+++ b/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 @@ +--- 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 +@@ -74,7 +74,8 @@ MAKE_TYPE=make @@ -10,14 +10,63 @@ # Determine which OS we are on if [ "${OS}" = "" ]; then ---- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak.orig 2014-03-12 14:47:37.513191381 +0000 -+++ b/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 +@@ -92,7 +92,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 -CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -s -Wall\ -+CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -Wall\ ++CFLAGS = ${M_CFLAGS} ${M_ARCH} -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 @@ + 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 + diff --git a/eclipse-disable-droplets-in-dropins.patch b/eclipse-disable-droplets-in-dropins.patch index cc0a5496c1c671c558745df0cb7a94eaa19739b9..b45995e12b8dede4c7d7d73cb6d0f30bbc01b34c 100644 --- a/eclipse-disable-droplets-in-dropins.patch +++ b/eclipse-disable-droplets-in-dropins.patch @@ -13,11 +13,11 @@ Change-Id: Iaf07aacb2d7eaabf3730654e757e69d22f0bc4ab .../internal/p2/reconciler/dropins/PlatformXmlListener.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) -diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java +diff --git 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 index 802ee1b..74023fe 100644 ---- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java -+++ b/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 { +--- 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 +@@ -171,11 +171,24 @@ public class PlatformXmlListener extends DirectoryChangeListener { * Ensure that we have a repository for each site in the given configuration. */ protected void synchronizeConfiguration(Configuration config) { diff --git a/eclipse-disable-uses-constraints.patch b/eclipse-disable-uses-constraints.patch index 460e40c7c9defcd7c08f8a6429c5b30c40043c23..5a56e61b492798552046370429b076720e75b803 100644 --- a/eclipse-disable-uses-constraints.patch +++ b/eclipse-disable-uses-constraints.patch @@ -8,11 +8,11 @@ Subject: [PATCH] Disable uses by default (osgi.resolver.usesMode=ignore). .../felix/src/org/apache/felix/resolver/ResolverImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java b/rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java +diff --git 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 index ded683f..7216865 100755 ---- a/rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java -+++ b/rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java -@@ -1230,7 +1230,9 @@ public class ResolverImpl implements Resolver +--- rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java ++++ rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java +@@ -1231,7 +1231,9 @@ public class ResolverImpl implements Resolver { public void run() { diff --git a/eclipse-feature-plugins-to-category-ius.patch b/eclipse-feature-plugins-to-category-ius.patch index a49d729bc9abcfb265925bd5b2beea2fc208f7ca..24dffb571f2b98bba944fb7dc4feb4f2d93803b3 100644 --- a/eclipse-feature-plugins-to-category-ius.patch +++ b/eclipse-feature-plugins-to-category-ius.patch @@ -1,5 +1,25 @@ ---- a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml.orig 2018-08-17 01:24:16.000000000 +0100 -+++ b/eclipse.jdt/org.eclipse.jdt-feature/feature.xml 2018-08-19 12:50:33.575708475 +0100 +From 42b1d14319f47d477f057a14aa1e2481729c6b13 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Thu, 6 Dec 2018 11:38:58 +0000 +Subject: [PATCH 1/2] Change features bundling third-party modules to feature + requirements + +--- + .../org.eclipse.jdt-feature/feature.xml | 114 ++----------- + .../org.eclipse.pde-feature/feature.xml | 16 +- + .../org.eclipse.platform.doc.isv/pom.xml | 11 +- + .../org.eclipse.help-feature/feature.xml | 130 +++------------ + .../org.eclipse.platform-feature/feature.xml | 18 +-- + .../org.eclipse.sdk.tests/feature.xml | 58 ++----- + .../org.eclipse.test-feature/feature.xml | 56 +------ + .../org.eclipse.tips.feature/feature.xml | 11 +- + .../features/org.eclipse.e4.rcp/feature.xml | 150 ++---------------- + 9 files changed, 83 insertions(+), 481 deletions(-) + +diff --git a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml b/eclipse.jdt/org.eclipse.jdt-feature/feature.xml +index 06887d901..364cae9d8 100644 +--- a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml ++++ b/eclipse.jdt/org.eclipse.jdt-feature/feature.xml @@ -19,6 +19,23 @@ %license @@ -24,12 +44,10 @@ -- + unpack="false"/> + - - +- unpack="false"/> +- @@ -139,12 +161,10 @@ -- + unpack="false"/> + - - +- unpack="false"/> +- + + eclipse-plugin +- javax.annotation +- 0.0.0 +- +- +- eclipse-plugin +- javax.el ++ javax.el-api + 0.0.0 + + +@@ -75,7 +70,7 @@ + + + eclipse-plugin +- javax.servlet ++ javax.servlet-api + 0.0.0 + + +@@ -95,7 +90,7 @@ + + + eclipse-plugin +- org.apache.jasper.glassfish ++ org.glassfish.web.javax.servlet.jsp + 0.0.0 + + +diff --git a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml +index 853db711d..5195b6d59 100644 +--- 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 @@ + %license - - -- - - -- @@ -311,35 +371,270 @@ + + ---- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.orig 2018-08-19 13:57:13.249904259 +0100 -+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2018-08-19 14:03:19.527742984 +0100 -@@ -22,6 +22,22 @@ +diff --git a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml +index f825d4539..a9b974ca5 100644 +--- a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml ++++ b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml +@@ -19,6 +19,11 @@ + %license + + ++ ++ ++ ++ ++ + +@@ -32,12 +37,6 @@ + id="org.eclipse.help" + version="0.0.0"/> + +- +- + + +- +- + + ++ ++ ++ ++ ++ ++ ++ ++ ++ + +@@ -421,20 +430,6 @@ + install-size="0" + version="0.0.0"/> + +- +- +- +- + + +- +- +- +- +- +- +- +- +- +- + + ++ ++ ++ ++ ++ ++ ++ ++ + + +- +- +- +- +- +- +- +- +- +- +- +- + + +- +- + +diff --git a/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml b/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml +index 88d843b0f..d5b8195bc 100644 +--- a/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml ++++ b/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml +@@ -32,6 +32,10 @@ + %license + + ++ ++ ++ ++ + + +- +- + +diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml +index ba217da7b..464451193 100644 +--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml ++++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml +@@ -22,6 +22,23 @@ -+ + -+ -+ -+ + ++ + + ++ ++ ++ ++ ++ ++ + + + + + -+ + -+ - - -- - +- +- - -- - - -- - - -- - - -- -- + unpack="false"/> + - - +- unpack="false"/> +- - - eclipse-plugin -- javax.annotation -- 0.0.0 -- -- -- eclipse-plugin -- javax.el -+ javax.el-api - 0.0.0 - - -@@ -75,7 +70,7 @@ - - - eclipse-plugin -- javax.servlet -+ javax.servlet-api - 0.0.0 - - -@@ -95,7 +90,7 @@ - - - eclipse-plugin -- org.apache.jasper.glassfish -+ org.glassfish.web.javax.servlet.jsp - 0.0.0 - - ---- a/eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF.orig 2017-02-15 10:01:24.202436806 +0000 -+++ b/eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF 2017-02-15 10:01:35.454301845 +0000 -@@ -39,8 +39,7 @@ - org.eclipse.e4.ui.dialogs;bundle-version="1.0.0", - org.eclipse.e4.emf.xpath - Bundle-ActivationPolicy: lazy --Import-Package: javax.annotation, -- javax.inject;version="1.0.0", -+Import-Package: javax.inject;version="1.0.0", - org.osgi.framework;version="1.5.0", - org.osgi.service.event;version="1.3.1" - Export-Package: org.eclipse.e4.tools.emf.ui.common;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.model.spy", ---- a/eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF.orig 2017-02-15 10:00:56.352770853 +0000 -+++ b/eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF 2017-02-15 10:01:06.757646050 +0000 -@@ -14,7 +14,6 @@ - org.eclipse.e4.core.di;bundle-version="0.9.0" - Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml - Bundle-ActivationPolicy: lazy --Import-Package: javax.annotation, -- javax.inject;version="1.0.0" -+Import-Package: javax.inject;version="1.0.0" - Bundle-Activator: org.eclipse.e4.tools.services.ToolsServicesActivator - Automatic-Module-Name: org.eclipse.e4.tools.services + id="org.eclipse.e4.emf.xpath" + download-size="0" +-- +2.19.1 + diff --git a/eclipse-fix-dropins.patch b/eclipse-fix-dropins.patch index 757ac47880deae2a8c806821067d3245e4030f6c..c35b86d846d00fd66b7dddcde0c81b5fc5a2ed68 100644 --- a/eclipse-fix-dropins.patch +++ b/eclipse-fix-dropins.patch @@ -1,6 +1,6 @@ ---- a/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 -+++ b/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 @@ +--- 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 +@@ -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 @@ +@@ -279,6 +280,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 @@ +@@ -312,6 +321,13 @@ if (agent.getService(SERVICE_SHARED_INSTALL_NEW_TIMESTAMP) != null) return false; @@ -37,9 +37,9 @@ String baseTimestamp = getBaseTimestamp(profile.getProfileId()); String extTimestamp = getExtTimeStamp(); if (baseTimestamp == null) { ---- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java -+++ b/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 ++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java +@@ -563,6 +563,7 @@ // get all IUs from all our repos IQueryResult allIUs = getAllIUsFromRepos(); @@ -47,7 +47,7 @@ for (Iterator iter = allIUs.iterator(); iter.hasNext();) { final IInstallableUnit iu = iter.next(); IInstallableUnit existing = profileIUs.get(iu); -@@ -583,6 +584,7 @@ +@@ -576,6 +577,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 @@ +@@ -618,7 +620,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,7 +64,7 @@ toRemove.add(iu); } -@@ -799,8 +801,8 @@ +@@ -792,8 +794,8 @@ IStatus installerPlanStatus = engine.perform(plan.getInstallerPlan(), phaseSet, monitor); if (!installerPlanStatus.isOK()) return installerPlanStatus; @@ -75,9 +75,9 @@ } return engine.perform(plan, phaseSet, monitor); } ---- a/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 -+++ b/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 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 @@ @Override public boolean performCancel() { diff --git a/eclipse-fix-tests.patch b/eclipse-fix-tests.patch index 6eb48b42025cbceda2349bf49a5e6c5387fac7c7..6b3e8ec37b3522d7de83487ea20d140930bc3a1f 100644 --- a/eclipse-fix-tests.patch +++ b/eclipse-fix-tests.patch @@ -1,5 +1,5 @@ ---- a/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 -+++ b/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 +--- 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 @@ */ protected IPath getJdtFeatureLocation() { @@ -16,10 +16,10 @@ -} \ No newline at end of file +} -diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java +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 ---- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java -+++ b/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 ++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java @@ -214,7 +214,7 @@ if (parent != null) { File[] children = parent.listFiles((FileFilter) pathname -> { @@ -29,10 +29,10 @@ index f1f38f0..f9111e6 100644 }); if (children != null && children.length == 1) file = children[0]; -diff --git a/eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties b/eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties +diff --git eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties index 376daa6..1742a8d 100644 ---- a/eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties -+++ b/eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties +--- 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 = .,\ resources/,\ lib/ @@ -43,10 +43,10 @@ index 376daa6..1742a8d 100644 source.. = src/ -output.. = bin/ +source.lib/annotations.jar = src/ -diff --git a/eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties b/eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties +diff --git eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties index f34ae40..0f9877d 100644 ---- a/eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties -+++ b/eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties +--- 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,\ plugin.properties src.includes = about.html @@ -55,10 +55,10 @@ index f34ae40..0f9877d 100644 +jars.compile.order = aptext.jar,apt.jar,.,\ + resources/question.jar +source.resources/question.jar = src-resources/ -diff --git a/eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties b/eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties +diff --git eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties index bc8963d..fbe4da3 100644 ---- a/eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties -+++ b/eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties +--- 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 @@ src.includes = about.html compilerArg=-proc:none @@ -66,8 +66,8 @@ index bc8963d..fbe4da3 100644 +source.lib/apttestprocessors.jar = processors/ +jars.compile.order = lib/apttestprocessors.jar,\ + . ---- a/eclipse.platform/ant/org.eclipse.ant.tests.ui/build.properties.orig 2016-03-24 14:25:47.076289150 +0000 -+++ b/eclipse.platform/ant/org.eclipse.ant.tests.ui/build.properties 2016-03-24 14:26:39.528660802 +0000 +--- 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 @@ Ant Tests/ @@ -78,8 +78,8 @@ index bc8963d..fbe4da3 100644 output.lib/antUITestsSupport.jar = test_support_bin/ +output.testbuildfiles/antUITestsSupport.jar = test_support_bin/ output.anttestsui.jar = bin/ ---- a/eclipse.jdt.ui/org.eclipse.jdt.ui.tests/build.properties.orig 2016-03-25 15:09:40.557786910 +0000 -+++ b/eclipse.jdt.ui/org.eclipse.jdt.ui.tests/build.properties 2016-03-25 15:12:08.476059326 +0000 +--- 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 @@ leaks/,\ performance/ @@ -87,7 +87,7 @@ index bc8963d..fbe4da3 100644 +source.testresources/nls.jar = nls/ +jars.compile.order = .,testresources/nls.jar --- /dev/null 1970-01-01 01:00:00.000000000 +0100 -+++ b/eclipse.jdt.ui/org.eclipse.jdt.ui.tests/nls/pkg/Client.java 2004-11-12 14:37:36.000000000 +0000 ++++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/nls/pkg/Client.java 2004-11-12 14:37:36.000000000 +0000 @@ -0,0 +1,25 @@ +/******************************************************************************* + * Copyright (c) 2000, 2004 IBM Corporation and others. @@ -115,7 +115,7 @@ index bc8963d..fbe4da3 100644 + +} --- /dev/null 1970-01-01 01:00:00.000000000 +0100 -+++ b/eclipse.jdt.ui/org.eclipse.jdt.ui.tests/nls/pkg/Messages.java 2004-11-12 14:37:28.000000000 +0000 ++++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/nls/pkg/Messages.java 2004-11-12 14:37:28.000000000 +0000 @@ -0,0 +1,58 @@ +/******************************************************************************* + * Copyright (c) 2000, 2004 IBM Corporation and others. @@ -176,7 +176,7 @@ index bc8963d..fbe4da3 100644 + } +} --- /dev/null 1970-01-01 01:00:00.000000000 +0100 -+++ b/eclipse.jdt.ui/org.eclipse.jdt.ui.tests/nls/pkg/Messages.properties 2004-11-12 14:38:06.000000000 +0000 ++++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/nls/pkg/Messages.properties 2004-11-12 14:38:06.000000000 +0000 @@ -0,0 +1,15 @@ +############################################################################### +# Copyright (c) 2000, 2004 IBM Corporation and others. @@ -193,8 +193,8 @@ index bc8963d..fbe4da3 100644 +test.long.key= Hello World Long +duplicate= Duplicate 2 +SearchResultView.removed_resource= ---- a/eclipse.platform/ant/org.eclipse.ant.tests.core/build.properties.orig 2017-03-03 14:20:53.868573338 +0000 -+++ b/eclipse.platform/ant/org.eclipse.ant.tests.core/build.properties 2017-03-06 14:26:42.382365639 +0000 +--- 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 @@ source.anttestscore.jar = test plugin/,\ tests/ @@ -206,7 +206,7 @@ index bc8963d..fbe4da3 100644 output.lib/antTestsSupport.jar = test_support_bin/ output.anttestscore.jar = bin/ --- /dev/null 2017-02-12 18:27:14.283389371 +0000 -+++ b/eclipse.platform/ant/org.eclipse.ant.tests.core/testlib_src/classpathOrdering1/ClasspathOrdering.java 2017-03-06 14:28:57.742879825 +0000 ++++ eclipse.platform/ant/org.eclipse.ant.tests.core/testlib_src/classpathOrdering1/ClasspathOrdering.java 2017-03-06 14:28:57.742879825 +0000 @@ -0,0 +1,10 @@ +import java.io.PrintStream; + @@ -219,7 +219,7 @@ index bc8963d..fbe4da3 100644 +} + --- /dev/null 2017-02-12 18:27:14.283389371 +0000 -+++ b/eclipse.platform/ant/org.eclipse.ant.tests.core/testlib_src/classpathOrdering2/ClasspathOrdering.java 2017-03-06 14:29:45.759352762 +0000 ++++ eclipse.platform/ant/org.eclipse.ant.tests.core/testlib_src/classpathOrdering2/ClasspathOrdering.java 2017-03-06 14:29:45.759352762 +0000 @@ -0,0 +1,10 @@ +import java.io.PrintStream; + @@ -231,15 +231,30 @@ index bc8963d..fbe4da3 100644 + } +} + ---- a/eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/pom.xml.orig 2017-04-07 10:44:33.764607961 +0100 -+++ b/eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/pom.xml 2017-04-07 11:26:44.511961798 +0100 -@@ -26,4 +26,24 @@ - org.eclipse.jdt.core.tests.builder.BuilderTests - ${project.artifactId} - -+ -+ -+ +--- 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 @@ + id="org.eclipse.jdt.source.feature.group" + version="" /> + +- +- +- + + ${tycho.surefire.argLine} + +- ++ + + org.eclipse.tycho + target-platform-configuration @@ -255,22 +270,6 @@ index bc8963d..fbe4da3 100644 + + + -+ -+ - ---- a/eclipse.pde.build/org.eclipse.pde.build.tests/test.xml.orig 2017-04-28 11:49:47.046123546 +0100 -+++ b/eclipse.pde.build/org.eclipse.pde.build.tests/test.xml 2017-04-28 12:05:11.947521737 +0100 -@@ -156,13 +156,6 @@ - id="org.eclipse.jdt.source.feature.group" - version="" /> - -- -- -- - + + diff --git a/eclipse-ignore-version-when-calculating-home.patch b/eclipse-ignore-version-when-calculating-home.patch index 5973643390d81a584a1f4308b4148c5a00c59f4a..fa39522e100760c8e4c99571ca03159c4c900a7a 100644 --- a/eclipse-ignore-version-when-calculating-home.patch +++ b/eclipse-ignore-version-when-calculating-home.patch @@ -1,5 +1,5 @@ ---- a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java.orig 2014-03-24 12:06:59.530918305 +0000 -+++ b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java 2014-03-24 12:07:42.709932098 +0000 +--- 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 @@ String appVersion = props.getProperty(PRODUCT_SITE_VERSION); if (appVersion == null || appVersion.trim().length() == 0) @@ -9,8 +9,8 @@ } catch (IOException e) { // Do nothing if we get an exception. We will default to a standard location // in the user's home dir. ---- a/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 -+++ b/rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java 2014-03-24 12:06:46.076914704 +0000 +--- 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 @@ String appVersion = props.getProperty(PRODUCT_SITE_VERSION); if (appVersion == null || appVersion.trim().length() == 0) diff --git a/eclipse-make-droplets-runnable.patch b/eclipse-make-droplets-runnable.patch index 94da798f59cf0922921bb0ab6c8e45a316ea965b..800fce51eaa30101937720091f7396f0bdc2ac2e 100644 --- a/eclipse-make-droplets-runnable.patch +++ b/eclipse-make-droplets-runnable.patch @@ -15,10 +15,10 @@ Change-Id: I0ad0a7557f998b4d032466f89e6cc76036d1fb38 .../ExtensionLocationArtifactRepository.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java +diff --git 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 index 342e33e..425a166 100644 ---- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java -+++ b/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 ++++ 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 - - @@ -26,68 +26,16 @@ ---- a/eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak 2012-07-31 07:43:57.000000000 +0200 -+++ b/eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml 2012-07-31 08:05:24.279277920 +0200 -@@ -34,6 +34,17 @@ - - source-feature - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - ---- a/eclipse.pde.ui/features/org.eclipse.pde-feature/pom.xml.bak 2013-01-29 11:22:47.065953870 +0100 -+++ b/eclipse.pde.ui/features/org.eclipse.pde-feature/pom.xml 2013-01-29 11:23:18.630196529 +0100 -@@ -38,6 +38,8 @@ - - - -+ -+ - - - ---- a/eclipse.jdt/org.eclipse.jdt-feature/pom.xml.orig 2013-02-20 16:32:38.000000000 +0100 -+++ b/eclipse.jdt/org.eclipse.jdt-feature/pom.xml 2013-02-21 10:08:50.404275226 +0100 -@@ -57,6 +57,8 @@ - - - -+ -+ - - - ---- a/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.orig 2014-11-28 15:27:07.874872769 +0000 -+++ b/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2014-11-28 15:31:02.592652099 +0000 -@@ -68,6 +68,8 @@ - - - -+ -+ - - - ---- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.orig 2014-05-26 18:37:25.406426611 +0300 -+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2014-05-26 18:37:47.327449374 +0300 -@@ -44,6 +44,22 @@ +--- 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 +@@ -42,6 +42,23 @@ + - + + + ++ + + + @@ -104,8 +52,8 @@ ---- a/eclipse.platform.releng/features/org.eclipse.sdk/feature.xml.orig 2016-04-27 09:18:50.421221722 +0100 -+++ b/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 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 @@ -51,16 +51,6 @@ id="org.eclipse.help.source" version="0.0.0"/> diff --git a/eclipse-p2-pick-up-renamed-jars.patch b/eclipse-p2-pick-up-renamed-jars.patch index a14ff1487c5443bcb3700f9615859eae7791a7b9..bd26b09ca724be08f8011e8e5b4d40bb1e568ffb 100644 --- a/eclipse-p2-pick-up-renamed-jars.patch +++ b/eclipse-p2-pick-up-renamed-jars.patch @@ -1,5 +1,5 @@ ---- a/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 -+++ b/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 +--- 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 @@ //First check to see if there is already an IU around for this IInstallableUnit bundleIU = queryForIU(result, bd.getSymbolicName(), PublisherHelper.fromOSGiVersion(bd.getVersion())); diff --git a/eclipse-pde-tp-support-droplets.patch b/eclipse-pde-tp-support-droplets.patch index 66fb594f2c6aa8aeb5bbf6e0263a0fb185ef52c2..40dc6730eb0c2bbec640519ff4be5dfebbc5045f 100644 --- a/eclipse-pde-tp-support-droplets.patch +++ b/eclipse-pde-tp-support-droplets.patch @@ -10,10 +10,10 @@ Subject: [PATCH] Support reading BundleInfo from p2 Droplets enabled .../src/org/eclipse/pde/internal/core/P2Utils.java | 48 +++++++++++++++++++--- 2 files changed, 45 insertions(+), 6 deletions(-) -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 +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 ---- 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 +--- 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: org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)" Eclipse-LazyStart: true @@ -23,34 +23,41 @@ index 7c20994..ab702e3 100644 + org.eclipse.equinox.internal.simpleconfigurator.utils Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.pde.core -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 +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 ---- 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 -@@ -15,11 +15,12 @@ - package org.eclipse.pde.internal.core; - - import java.io.*; +--- eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java ++++ eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java +@@ -17,8 +17,9 @@ + 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.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.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 { +@@ -111,7 +114,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(); @@ -111,4 +118,3 @@ index fbd4b81..55cd40e 100644 return null; -- 2.7.4 - diff --git a/eclipse-platform-sources-I20180906-0745.tar.xz b/eclipse-platform-sources-4.11RC2.tar.xz similarity index 90% rename from eclipse-platform-sources-I20180906-0745.tar.xz rename to eclipse-platform-sources-4.11RC2.tar.xz index c62a6525cfd779f8f61ddc1671da5e0b257c79bf..a6ab41b4c8e687b80d2d065a8aecd18617fd2261 100644 Binary files a/eclipse-platform-sources-I20180906-0745.tar.xz and b/eclipse-platform-sources-4.11RC2.tar.xz differ diff --git a/eclipse-remove-jgit-provider.patch b/eclipse-remove-jgit-provider.patch deleted file mode 100644 index dfe63ad892a62ff49bd471c7d491e5e133b6f9ea..0000000000000000000000000000000000000000 --- a/eclipse-remove-jgit-provider.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/eclipse-platform-parent/pom.xml.orig 2014-11-28 14:54:50.000000000 +0000 -+++ b/eclipse-platform-parent/pom.xml 2014-11-28 15:32:51.700154985 +0000 -@@ -491,7 +491,7 @@ - tycho-packaging-plugin - ${tycho.version} - -- -+ - - - false - ${qualifier.format} -- jgit -+ - - pom.xml - - ${jgit.dirtyWorkingTree-platformDefault} -- -+ - - false - diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch index 9b3ddb49ef3372a92420caebd4e66bdc97f8bd82..4750e9b639cad8eb2db521a017945d07fe629a78 100644 --- a/eclipse-secondary-arches.patch +++ b/eclipse-secondary-arches.patch @@ -2,12 +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 -@@ -418,6 +418,36 @@ - install-size="0" - version="0.0.0" - fragment="true"/> -+ -+ + + - - ++ ++ ++ ++ @@ -83,19 +104,19 @@ index 7e1f520..734dd10 100644 +++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2014-11-28 16:52:00.315007846 +0000 @@ -123,7 +123,11 @@ - + + + -+ + - ++ - + + --- 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 -@@ -37,3 +37,15 @@ +@@ -32,3 +32,15 @@ root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root root.linux.gtk.x86_64.permissions.755=libcairo-swt.so @@ -106,11 +127,11 @@ index 7e1f520..734dd10 100644 +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 ++ ++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 @@ @@ -119,38 +140,38 @@ index 7e1f520..734dd10 100644 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.ppc64 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 bundles/org.eclipse.swt.gtk.linux.x86_64 - bundles/org.eclipse.swt.win32.win32.x86 + 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 -@@ -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))) +@@ -24,3 +24,23 @@ + 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.range = [$version$,$version$] ++requires.6.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true))) ++ ++requires.7.namespace = org.eclipse.equinox.p2.iu ++requires.7.name = org.eclipse.swt.gtk.linux.aarch64 ++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.ppc64 ++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=ppc64)(!(org.eclipse.swt.buildtime=true))) ++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.arm ++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=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))) ++requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86)(!(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 @@ @@ -169,27 +190,27 @@ index 7e1f520..734dd10 100644 + -+ build-native-launchers-gtk.linux.ppc64 ++ build-native-launchers-gtk.linux.s390x + + + native -+ gtk.linux.ppc64 ++ gtk.linux.s390x + + + -+ bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64 ++ bundles/org.eclipse.equinox.launcher.gtk.linux.s390x + + + -+ build-native-launchers-gtk.linux.s390x ++ build-native-launchers-gtk.linux.x86 + + + native -+ gtk.linux.s390x ++ gtk.linux.x86 + + + -+ bundles/org.eclipse.equinox.launcher.gtk.linux.s390x ++ bundles/org.eclipse.equinox.launcher.gtk.linux.x86 + + diff --git a/eclipse-support-symlink-bundles.patch b/eclipse-support-symlink-bundles.patch index 487fc2cd1a1f406a0ae5186de9c1ac7b64e4a22d..17f2e56a3f89dc8d12b81afc2802fb878291498c 100644 --- a/eclipse-support-symlink-bundles.patch +++ b/eclipse-support-symlink-bundles.patch @@ -13,10 +13,10 @@ Change-Id: Ifbe8efed2218a8a1250fd1ac59f0cdd6bdd5f309 .../utils/SimpleConfiguratorUtils.java | 106 ++++++++++++++++++++- 2 files changed, 106 insertions(+), 1 deletion(-) -diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF b/rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF +diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF index d88d0a6..07fe087 100644 ---- a/rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF -+++ b/rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF +--- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF ++++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF @@ -9,6 +9,7 @@ Bundle-Activator: org.eclipse.equinox.internal.simpleconfigurator.Activator Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.osgi.framework.console;version="1.0.0";resolution:=optional, @@ -25,13 +25,13 @@ index d88d0a6..07fe087 100644 org.osgi.framework;version="1.3.0", org.osgi.framework.namespace;version="1.0.0", org.osgi.framework.wiring;version="1.2.0", -diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java b/rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java +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 ---- a/rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java -+++ b/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.*; +--- 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 +@@ -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 @@ index ab69b88..d6bf121 100644 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 @@ index ab69b88..d6bf121 100644 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 getOSGiManifest(URI location) { @@ -154,6 +154,3 @@ index ab69b88..d6bf121 100644 + return result; + } } --- -2.5.0 - diff --git a/eclipse-swt-disable-gtk2.patch b/eclipse-swt-disable-gtk2.patch deleted file mode 100644 index 2024e0e2dede801335711d462012e4d8dfd43fd4..0000000000000000000000000000000000000000 --- a/eclipse-swt-disable-gtk2.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml.orig -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml -@@ -898,15 +898,19 @@ - - - -+ -+ -+ -+ -+ -+ -+ - - - - - - -- -- -- - - - diff --git a/eclipse.spec b/eclipse.spec index 2fd264b98b19da0b6b3adfd0b4a8f32323c5c188..89ba6e4cfd35b192f6433343496e24c7957fb043 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -1,313 +1,344 @@ -Name: eclipse -Epoch: 1 -Version: 4.9.0 -Release: 4 -Summary: Eclipse is an open source, Java-based, extensible development platform. -License: EPL-2.0 -URL: http://www.eclipse.org/ -Source0: http://download.eclipse.org/eclipse/downloads/drops4/I20180906-0745/eclipse-platform-sources-I20180906-0745.tar.xz -Source1: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/snapshot/org.eclipse.linuxtools.eclipse-build-44643cbda3dfd6f00fbf1b346dae7068df2a9ef9.tar.xz - -Patch0000: eclipse-no-source-for-dependencies.patch -Patch0001: eclipse-p2-pick-up-renamed-jars.patch -Patch0002: eclipse-ignore-version-when-calculating-home.patch -Patch0003: eclipse-remove-jgit-provider.patch -Patch0004: eclipse-secondary-arches.patch -Patch0005: eclipse-debug-symbols.patch -Patch0006: eclipse-fix-dropins.patch -Patch0007: eclipse-mockito.patch -Patch0008: eclipse-support-symlink-bundles.patch -Patch0009: eclipse-feature-plugins-to-category-ius.patch -Patch0010: eclipse-fix-tests.patch -Patch0011: eclipse-adjust-droplets.patch -Patch0012: eclipse-pde-tp-support-droplets.patch -Patch0013: eclipse-swt-disable-gtk2.patch -Patch0014: eclipse-disable-uses-constraints.patch -Patch0016: eclipse-make-droplets-runnable.patch -Patch0017: eclipse-disable-droplets-in-dropins.patch -Patch0018: prefer_x11_backend.patch -Patch0019: fix_ant_build.patch -Patch0020: eclipse-hide-droplets-from-install-wizard.patch - -BuildRequires: gdb-headless maven-local tycho tycho-extras cbi-plugins maven-assembly-plugin -BuildRequires: maven-antrun-plugin maven-dependency-plugin maven-enforcer-plugin maven-install-plugin -BuildRequires: maven-shade-plugin xml-maven-plugin rhino sonatype-oss-parent rsync make gcc zip -BuildRequires: unzip desktop-file-utils pkgconfig(glib-2.0) pkgconfig(gio-2.0) pkgconfig(nspr) -BuildRequires: pkgconfig(glu) pkgconfig(gl) pkgconfig(cairo) pkgconfig(xt) pkgconfig(xtst) -BuildRequires: pkgconfig(libsecret-1) pkgconfig(gtk+-2.0) pkgconfig(gtk+-3.0) pkgconfig(webkit2gtk-4.0) -BuildRequires: icu4j >= 1:62.1 ant >= 1.10.5 ant-antlr ant-apache-bcel ant-apache-log4j -BuildRequires: 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 -BuildRequires: jsch >= 0:0.1.46-2 ant-apache-xalan2 ant-jmf ant-xz ant-junit5 apache-commons-logging -BuildRequires: apache-commons-el >= 1.0-22 apache-commons-codec apache-commons-jxpath -BuildRequires: apache-commons-fileupload 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 -BuildRequires: osgi(org.apache.felix.scr) >= 2.0.14 osgi(org.eclipse.jetty.util) >= 9.4.11 -BuildRequires: osgi(org.eclipse.jetty.server) >= 9.4.11 osgi(org.eclipse.jetty.http) >= 9.4.11 -BuildRequires: osgi(org.eclipse.jetty.continuation) >= 9.4.11 -BuildRequires: osgi(org.eclipse.jetty.io) >= 9.4.11 osgi(org.eclipse.jetty.security) >= 9.4.11 -BuildRequires: osgi(org.eclipse.jetty.servlet) >= 9.4.11 lucene-core >= 7.1.0 -BuildRequires: lucene-analysis >= 7.1.0 lucene-queryparser >= 7.1.0 lucene-analyzers-smartcn >= 7.1.0 -BuildRequires: junit >= 4.12 junit5 apiguardian hamcrest sat4j objectweb-asm >= 6.1.1 sac -BuildRequires: batik >= 1.10 batik-css >= 1.10 xmlgraphics-commons >= 2.2 xml-commons-apis atinject -BuildRequires: eclipse-ecf-core >= 3.14.1-2 eclipse-emf-core >= 1:2.15.0-0.2 eclipse-license2 -BuildRequires: glassfish-el-api >= 3.0.1 glassfish-el >= 3.0.1 glassfish-jsp-api >= 2.2.1-4 -BuildRequires: glassfish-jsp >= 2.2.5 glassfish-servlet-api >= 3.1.0 httpcomponents-core -BuildRequires: httpcomponents-client jsoup xz-java mockito osgi(osgi.annotation) -BuildRequires: eclipse-pde eclipse-egit eclipse-emf-runtime eclipse-jgit - +%global bootstrap 0 +%global eb_commit c985e357223668b4bc1fb76ea6b9e0c12829b7e8 +%global eclipse_rel %{version}RC2 +%global eclipse_tag S-%{eclipse_rel}-201903070500 +%global _jetty_version 9.4.15 +%global _lucene_version 7.7.0 +%global app_name %{?app_name_prefix}%{!?app_name_prefix:Eclipse} +%global app_exec %{?app_exec_prefix} eclipse +%global _eclipsedir %{_prefix}/lib/eclipse +%global use_wayland 1 +Name: eclipse +Epoch: 1 +Version: 4.11 +Release: 1 +Summary: An open, extensible IDE +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 +Source1: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/snapshot/org.eclipse.linuxtools.eclipse-build-%{eb_commit}.tar.xz +Patch0: eclipse-no-source-for-dependencies.patch +Patch1: eclipse-p2-pick-up-renamed-jars.patch +Patch2: eclipse-ignore-version-when-calculating-home.patch +Patch3: explicit-hamcrest.patch +Patch4: eclipse-secondary-arches.patch +Patch5: eclipse-debug-symbols.patch +Patch12: eclipse-fix-dropins.patch +Patch13: eclipse-feature-plugins-to-category-ius.patch +Patch15: eclipse-support-symlink-bundles.patch +Patch20: eclipse-fix-tests.patch +Patch21: eclipse-adjust-droplets.patch +Patch22: eclipse-pde-tp-support-droplets.patch +Patch24: eclipse-disable-uses-constraints.patch +Patch26: eclipse-make-droplets-runnable.patch +Patch27: eclipse-disable-droplets-in-dropins.patch +Patch28: prefer_x11_backend.patch +Patch29: fix_ant_build.patch +Patch30: eclipse-hide-droplets-from-install-wizard.patch +ExcludeArch: s390 %{arm} %{ix86} +BuildRequires: maven-local tycho tycho-extras cbi-plugins maven-antrun-plugin +BuildRequires: maven-assembly-plugin maven-dependency-plugin maven-enforcer-plugin +BuildRequires: maven-install-plugin maven-shade-plugin xml-maven-plugin rhino +BuildRequires: sonatype-oss-parent rsync make, gcc zip, unzip desktop-file-utils +BuildRequires: pkgconfig(glib-2.0) pkgconfig(gio-2.0) pkgconfig(nspr) pkgconfig(glu) +BuildRequires: pkgconfig(gl) pkgconfig(cairo) pkgconfig(xt) pkgconfig(xtst) +BuildRequires: pkgconfig(libsecret-1) pkgconfig(gtk+-2.0) pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(webkit2gtk-4.0) icu4j >= 1:63.1 ant >= 1.10.5 +BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf +BuildRequires: ant-commons-net ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf ant-xz ant-junit5 +BuildRequires: jsch >= 0:0.1.46 apache-commons-el >= 1.0 apache-commons-logging +BuildRequires: apache-commons-codec apache-commons-jxpath apache-commons-fileupload +BuildRequires: apache-sshd 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 +BuildRequires: osgi(org.apache.felix.scr) >= 2.1.14 +BuildRequires: osgi(org.eclipse.jetty.util) >= %{_jetty_version} +BuildRequires: osgi(org.eclipse.jetty.server) >= %{_jetty_version} +BuildRequires: osgi(org.eclipse.jetty.http) >= %{_jetty_version} +BuildRequires: osgi(org.eclipse.jetty.continuation) >= %{_jetty_version} +BuildRequires: osgi(org.eclipse.jetty.io) >= %{_jetty_version} +BuildRequires: osgi(org.eclipse.jetty.security) >= %{_jetty_version} +BuildRequires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version} +BuildRequires: lucene-core >= %{_lucene_version} lucene-analysis >= %{_lucene_version} +BuildRequires: lucene-queryparser >= %{_lucene_version} +BuildRequires: lucene-analyzers-smartcn >= %{_lucene_version} junit >= 4.12 junit5 >= 5.4.0 +BuildRequires: apiguardian hamcrest sat4j objectweb-asm >= 7.0 sac batik >= 1.10 +BuildRequires: batik-css >= 1.10 xmlgraphics-commons >= 2.2 xml-commons-apis atinject +BuildRequires: eclipse-ecf-core >= 3.14.4 eclipse-emf-core >= 1:2.16.0 eclipse-license2 +BuildRequires: glassfish-annotation-api glassfish-el-api >= 3.0.1 glassfish-el >= 3.0.1 +BuildRequires: glassfish-jsp-api >= 2.2.1 glassfish-jsp >= 2.2.5 +BuildRequires: glassfish-servlet-api >= 3.1.0 httpcomponents-core httpcomponents-client jsoup +BuildRequires: xz-java mockito >= 2.23.9 osgi(osgi.annotation) +%if ! %{bootstrap} +BuildRequires: eclipse-pde eclipse-egit eclipse-emf-runtime eclipse-jgit +%endif %description -Eclipse is an integrated development environment (IDE) used in computer programming. -It contains a base workspace and an extensible plug-in system for customizing the environment. - -%package swt -Summary: Provides SWT Library for GTK+ -Requires: java-headless >= 1:1.8.0 javapackages-tools gtk3 webkitgtk4 +The Eclipse platform is designed for building integrated development +environments (IDEs), server-side applications, desktop applications, and +everything in between. +%package swt +Summary: SWT Library for GTK+ +Requires: java-headless >= 1:1.8.0 javapackages-tools gtk3 webkitgtk4 %description swt -This package provides SWT Library for GTK+. - -%package equinox-osgi -Summary: Open Service Gateway Initiative(OSGi) in eclipse -Requires: java-headless >= 1:1.8.0 javapackages-tools -Provides: osgi(system.bundle) = 1:4.9.0 - -%description equinox-osgi -This package provides the open Service Gateway Initiative(OSGi) in eclipse - Equinox - -%package platform -Summary: Provides eclipse platform common files -Recommends: eclipse-abrt eclipse-usage - -Requires: ant >= 1.10.5 ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro -Requires: 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 -Requires: ant-testutil ant-apache-xalan2 ant-jmf ant-xz ant-junit5 -Requires: jsch >= 0.1.46-2 apache-commons-el >= 1.0-23 apache-commons-logging -Requires: apache-commons-codec apache-commons-jxpath osgi(org.apache.felix.gogo.shell) >= 1.0.0 -Requires: osgi(org.apache.felix.gogo.command) >= 1.0.2 -Requires: osgi(org.apache.felix.gogo.runtime) >= 1.0.4 -Requires: osgi(org.apache.felix.scr) >= 2.0.14 -Requires: osgi(org.eclipse.jetty.util) >= 9.4.11 -Requires: osgi(org.eclipse.jetty.server) >= 9.4.11 -Requires: osgi(org.eclipse.jetty.http) >= 9.4.11 -Requires: osgi(org.eclipse.jetty.continuation) >= 9.4.11 -Requires: osgi(org.eclipse.jetty.io) >= 9.4.11 -Requires: osgi(org.eclipse.jetty.security) >= 9.4.11 -Requires: osgi(org.eclipse.jetty.servlet) >= 9.4.11 -Requires: lucene-core >= 7.1.0 lucene-analysis >= 7.1.0 lucene-queryparser >= 7.1.0 -Requires: lucene-analyzers-smartcn >= 7.1.0 sat4j sac batik >= 1.10 batik-css >= 1.10 -Requires: xmlgraphics-commons >= 2.2 xml-commons-apis atinject eclipse-ecf-core >= 3.14.0-1 -Requires: eclipse-emf-core >= 1:2.14.0-1 glassfish-el-api >= 3.0.1 glassfish-el >= 3.0.1 -Requires: glassfish-jsp-api >= 2.2.1-4 glassfish-jsp >= 2.2.5 glassfish-servlet-api >= 3.1.0 -Requires: icu4j >= 1:62.1 eclipse-swt osgi(org.tukaani.xz) -Requires: eclipse-equinox-osgi httpcomponents-core httpcomponents-client - -Provides: eclipse-nls = 4.9.0-3 -Obsoletes: eclipse-nls < 4.9.0-3 - -%description platform -The eclipse-platform is just the base of eclipse, -it provides some common files. - -%package jdt -Summary: Provides Development Tools for Java -BuildArch: noarch -Provides: eclipse = 1:4.9.0-3 -Requires: eclipse-platform osgi(org.junit) >= 4.12 osgi(org.hamcrest.core) -Recommends: eclipse-recommenders - -%description jdt -This package Provides Development Tools for Java - -%package pde -Summary: Provides Eclipse Plugin Development Environment -Requires: eclipse-platform eclipse-jdt objectweb-asm >= 6.1.1 - -%description pde -The eclipse-pde package is necessary for developing Eclipse plugins. - -%package p2-discovery -Summary: Provides Eclipse p2 Discovery -BuildArch: noarch -Requires: eclipse-platform - -%description p2-discovery -The eclipse-p2-discovery package is a tool to display and install -from existing P2 repositories or as a framework to build branded +SWT Library for GTK+. + +%package equinox-osgi +Summary: Eclipse OSGi - Equinox +Requires: java-headless >= 1:1.8.0 javapackages-tools +Provides: osgi(system.bundle) = %{epoch}:%{version} +%description equinox-osgi +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 ant-junit5 +Requires: jsch >= 0.1.46-2 apache-commons-el >= 1.0 apache-commons-logging +Requires: apache-commons-codec apache-commons-jxpath +Requires: osgi(org.apache.felix.gogo.shell) >= 1.1.0 +Requires: osgi(org.apache.felix.gogo.command) >= 1.0.2 +Requires: osgi(org.apache.felix.gogo.runtime) >= 1.1.0 +Requires: osgi(org.apache.felix.scr) >= 2.1.14 +Requires: osgi(org.eclipse.jetty.util) >= %{_jetty_version} +Requires: osgi(org.eclipse.jetty.server) >= %{_jetty_version} +Requires: osgi(org.eclipse.jetty.http) >= %{_jetty_version} +Requires: osgi(org.eclipse.jetty.continuation) >= %{_jetty_version} +Requires: osgi(org.eclipse.jetty.io) >= %{_jetty_version} +Requires: osgi(org.eclipse.jetty.security) >= %{_jetty_version} +Requires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version} +Requires: lucene-core >= %{_lucene_version} lucene-analysis >= %{_lucene_version} +Requires: lucene-queryparser >= %{_lucene_version} +Requires: lucene-analyzers-smartcn >= %{_lucene_version} sat4j sac batik >= 1.10 +Requires: batik-css >= 1.10 xmlgraphics-commons >= 2.2 xml-commons-apis atinject +Requires: eclipse-ecf-core >= 3.14.4 eclipse-emf-core >= 1:2.16.0 +Requires: glassfish-annotation-api glassfish-el-api >= 3.0.1 glassfish-el >= 3.0.1 +Requires: glassfish-jsp-api >= 2.2.1 glassfish-jsp >= 2.2.5 +Requires: glassfish-servlet-api >= 3.1.0 icu4j >= 1:63.1 +Requires: %{name}-swt = %{epoch}:%{version}-%{release} +Requires: %{name}-equinox-osgi = %{epoch}:%{version}-%{release} httpcomponents-core +Requires: httpcomponents-client osgi(org.tukaani.xz) +Provides: eclipse-nls = %{version}-%{release} +Obsoletes: eclipse-nls < %{version}-%{release} +%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. + +%package jdt +Summary: Eclipse Java Development Tools +BuildArch: noarch +Provides: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name}-platform = %{epoch}:%{version}-%{release} junit >= 4.12 junit5 >= 5.4.0 +Requires: osgi(org.hamcrest.core) +Obsoletes: eclipse-recommenders <= 2.5.4 +%description jdt +Eclipse Java Development Tools. This package is required to use Eclipse for +developing software written in the Java programming language. + +%package pde +Summary: Eclipse Plugin Development Environment +Requires: %{name}-platform = %{epoch}:%{version}-%{release} +Requires: %{name}-jdt = %{epoch}:%{version}-%{release} objectweb-asm >= 7.0 +%description pde +Eclipse Plugin Development Environment. This package is required for +developing Eclipse plugins. + +%package p2-discovery +Summary: Eclipse p2 Discovery +BuildArch: noarch +Requires: %{name}-platform = %{epoch}:%{version}-%{release} +%description p2-discovery +The p2 Discovery mechanism provides a simplified and branded front-end for the +p2 provisioning platform. Discovery can be used as a tool to display and +install from existing P2 repositories or as a framework to build branded installer UIs. -%package contributor-tools -Summary: Provides Eclipse Contributors Tools -Requires: eclipse-platform easymock mockito - -%description contributor-tools -The eclipse-contributor-tools consists of SWT tools, E4 tools, -Rel-Eng tools and Eclipse Test frameworks. And all these specifically for Eclipse contributors. +%package contributor-tools +Summary: Tools for Eclipse Contributors +Requires: %{name}-platform = %{epoch}:%{version}-%{release} easymock hamcrest +Requires: mockito >= 2.23.9 +%description contributor-tools +This package contains tools specifically for Eclipse contributors. It includes +SWT tools, E4 tools, Rel-Eng tools and Eclipse Test frameworks. -%package tests -Summary: Provides Eclipse Tests -Requires: eclipse-contributor-tools - -%description tests -This package provides a large number of test cases to ensure the smooth running of eclipse +%package tests +Summary: Eclipse Tests +Requires: %{name}-contributor-tools = %{epoch}:%{version}-%{release} +%description tests +Eclipse Tests. %prep -%autosetup %{SOURCE0} -n eclipse-platform-sources-I20180906-0745 -p1 +%setup -T -c +tar --strip-components=1 -xf %{SOURCE0} tar --strip-components=1 -xf %{SOURCE1} - find . ! -path "*/JCL/*" ! -name "rtstubs*.jar" ! -name "java10api.jar" ! -name "j9stubs.jar" \ -type f -name *.jar -delete -for file_type in class so dll jnilib ; do - find . -type f -name *.$file_type -delete ; -done - +find . -type f -name *.class -delete +find . -type f -name *.so -delete +find . -type f -name *.dll -delete +find . -type f -name *.jnilib -delete rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/ - +%patch0 +%patch1 +%patch2 +%patch3 +%patch4 -p1 +%patch5 +%patch12 +%patch13 -p1 +%patch15 +%patch20 +%patch21 +%patch22 +%patch24 +%patch26 +%patch27 +%if ! %{use_wayland} +%patch28 +%endif +%patch29 +%patch30 -p1 +rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/accessibility/Bug543949_ComponentExtentsTest.py +%pom_remove_dep :tycho-buildtimestamp-jgit eclipse-platform-parent +%pom_remove_dep :tycho-sourceref-jgit eclipse-platform-parent +%pom_xpath_remove 'pom:configuration/pom:timestampProvider' eclipse-platform-parent +%pom_xpath_remove 'pom:configuration/pom:sourceReferences' eclipse-platform-parent %pom_xpath_remove "pom:configuration/pom:target" eclipse-platform-parent +%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder +%pom_disable_module rcp eclipse.platform.releng.tychoeclipsebuilder +%pom_disable_module rcp.sdk eclipse.platform.releng.tychoeclipsebuilder +%pom_disable_module rcp.config eclipse.platform.releng.tychoeclipsebuilder +%pom_disable_module sdk eclipse.platform.releng.tychoeclipsebuilder +%pom_disable_module equinox-sdk eclipse.platform.releng.tychoeclipsebuilder +%pom_disable_module equinox.starterkit.product eclipse.platform.releng.tychoeclipsebuilder +%pom_disable_module eclipse.platform.repository eclipse.platform.releng.tychoeclipsebuilder +%pom_disable_module bundles/org.eclipse.equinox.cm.test rt.equinox.bundles +%pom_disable_module features/org.eclipse.equinox.sdk rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.console.jaas.fragment rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.console.ssh rt.equinox.bundles +%pom_disable_module bundles/org.eclipse.equinox.console.ssh.tests rt.equinox.bundles +%pom_disable_module bundles/org.eclipse.equinox.console.tests rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.ip rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.transforms.xslt rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.transforms.hook rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.weaving.caching.j9 rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.weaving.caching rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.weaving.hook rt.equinox.bundles -%pom_disable_module bundles/org.eclipse.equinox.cm.test rt.equinox.bundles -%pom_disable_module bundles/org.eclipse.equinox.p2.tests.reconciler.product rt.equinox.p2 -%pom_disable_module bundles/org.eclipse.equinox.p2.artifact.optimizers rt.equinox.p2 -%pom_disable_module bundles/org.eclipse.equinox.p2.artifact.processors rt.equinox.p2 -%pom_disable_module equinox-sdk eclipse.platform.releng.tychoeclipsebuilder -%pom_disable_module equinox.starterkit.product eclipse.platform.releng.tychoeclipsebuilder -%pom_disable_module eclipse.platform.repository eclipse.platform.releng.tychoeclipsebuilder -%pom_disable_module features/org.eclipse.equinox.sdk rt.equinox.bundles %pom_disable_module features/org.eclipse.equinox.compendium.sdk rt.equinox.bundles %pom_disable_module features/org.eclipse.equinox.core.sdk rt.equinox.bundles %pom_disable_module features/org.eclipse.equinox.p2.sdk rt.equinox.p2 %pom_disable_module features/org.eclipse.equinox.server.p2 rt.equinox.bundles %pom_disable_module features/org.eclipse.equinox.serverside.sdk rt.equinox.bundles +%pom_disable_module bundles/org.eclipse.equinox.p2.tests.reconciler.product rt.equinox.p2 +%pom_disable_module bundles/org.eclipse.equinox.p2.artifact.optimizers rt.equinox.p2 +%pom_disable_module bundles/org.eclipse.equinox.p2.tests.optimizers rt.equinox.p2 +%pom_disable_module bundles/org.eclipse.equinox.p2.artifact.processors rt.equinox.p2 %pom_disable_module org.eclipse.jdt.annotation_v1 eclipse.jdt.core -%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder -%pom_disable_module rcp eclipse.platform.releng.tychoeclipsebuilder -%pom_disable_module rcp.sdk eclipse.platform.releng.tychoeclipsebuilder -%pom_disable_module rcp.config eclipse.platform.releng.tychoeclipsebuilder -%pom_disable_module sdk eclipse.platform.releng.tychoeclipsebuilder - -%pom_xpath_remove "plugin[@version='1.1.300.qualifier']" eclipse.jdt/org.eclipse.jdt-feature/feature.xml +%pom_xpath_remove "plugin[@version='1.1.400.qualifier']" eclipse.jdt/org.eclipse.jdt-feature/feature.xml 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 %pom_disable_module bundles/org.eclipse.sdk.examples eclipse.platform.releng %pom_disable_module features/org.eclipse.sdk.examples-feature eclipse.platform.releng %pom_disable_module examples/org.eclipse.swt.examples.ole.win32 eclipse.platform.swt %pom_disable_module bundles/org.eclipse.equinox.http.servletbridge rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.servletbridge rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.servletbridge.template rt.equinox.bundles - -utils/ensure_arch.sh rt.equinox.binaries x86 arm -utils/ensure_arch.sh rt.equinox.framework/bundles x86 arm -utils/ensure_arch.sh eclipse.platform.swt.binaries/bundles x86 arm -utils/ensure_arch.sh rt.equinox.binaries x86_64 aarch64 ppc64 -utils/ensure_arch.sh rt.equinox.framework/bundles x86_64 aarch64 ppc64 -utils/ensure_arch.sh eclipse.platform.swt.binaries/bundles x86_64 aarch64 ppc64 - +%pom_disable_module ui/org.eclipse.pde.ui.tests.smartimport eclipse.pde.ui +%pom_remove_plugin :maven-enforcer-plugin eclipse-platform-parent +rm -rf eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.{aarch64,s390x} +rm -rf rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.{aarch64,s390x} +for dir in rt.equinox.binaries rt.equinox.framework/bundles eclipse.platform.swt.binaries/bundles ; do + utils/ensure_arch.sh "$dir" x86_64 aarch64 s390x +done TYCHO_ENV="linuxgtk%{_arch}" %pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" eclipse-platform-parent %pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests %pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk -for ids in `ls eclipse.platform.swt.binaries/bundles | grep -P -e 'org.eclipse.swt\.(?!gtk\.linux.%{_arch}$)'` ; do - module=$(grep ">bundles/$ids<" eclipse.platform.swt.binaries/pom.xml || :) +for b in `ls eclipse.platform.swt.binaries/bundles | grep -P -e 'org.eclipse.swt\.(?!gtk\.linux.%{_arch}$)'` ; do + module=$(grep ">bundles/$b<" eclipse.platform.swt.binaries/pom.xml || :) if [ -n "$module" ] ; then - %pom_disable_module bundles/$ids eclipse.platform.swt.binaries - %pom_xpath_inject "pom:excludes" "" eclipse.platform.ui/features/org.eclipse.e4.rcp + %pom_disable_module bundles/$b eclipse.platform.swt.binaries + %pom_xpath_inject "pom:excludes" "" eclipse.platform.ui/features/org.eclipse.e4.rcp fi done -for ids in `ls rt.equinox.framework/bundles | grep -P -e 'org.eclipse.equinox.launcher\.(?!gtk\.linux.%{_arch}$)'` ; do - module=$(grep ">bundles/$ids<" rt.equinox.framework/pom.xml || :) +for b in `ls rt.equinox.framework/bundles | grep -P -e 'org.eclipse.equinox.launcher\.(?!gtk\.linux.%{_arch}$)'` ; do + module=$(grep ">bundles/$b<" rt.equinox.framework/pom.xml || :) if [ -n "$module" ] ; then - %pom_disable_module bundles/$ids rt.equinox.framework - %pom_xpath_remove -f "plugin[@id='$ids']" rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml + %pom_disable_module bundles/$b rt.equinox.framework + %pom_xpath_remove -f "plugin[@id='$b']" rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml fi done -for ids in `(cd rt.equinox.bundles/bundles && ls -d *{macosx,win32,linux}*) | grep -P -e 'org.eclipse.equinox.security\.(?!linux\.%{_arch}$)'` ; do - %pom_disable_module bundles/$ids rt.equinox.bundles - %pom_xpath_remove "plugin[@id='$ids']" rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml +for b in `(cd rt.equinox.bundles/bundles && ls -d *{macosx,win32,linux}*) | grep -P -e 'org.eclipse.equinox.security\.(?!linux\.%{_arch}$)'` ; do + module=$(grep ">bundles/$b<" rt.equinox.bundles/pom.xml || :) + if [ -n "$module" ] ; then + %pom_disable_module bundles/$b rt.equinox.bundles + %pom_xpath_remove -f "plugin[@id='$b']" rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml + fi done -for ids in `ls eclipse.platform.team/bundles/org.eclipse.core.net/fragments/ | grep -P -e 'org.eclipse.core.net\.(?!linux.%{_arch}$)'` ; do - %pom_disable_module bundles/org.eclipse.core.net/fragments/$ids eclipse.platform.team +for b in `ls eclipse.platform.team/bundles/org.eclipse.core.net/fragments/ | grep -P -e 'org.eclipse.core.net\.(?!linux.%{_arch}$)'` ; do + %pom_disable_module bundles/org.eclipse.core.net/fragments/$b eclipse.platform.team done -for ids in `ls eclipse.platform.resources/bundles/ | grep -P -e 'org.eclipse.core.filesystem\.(?!linux\.%{_arch}$)'` ; do - module=$(grep ">bundles/$ids<" eclipse.platform.resources/pom.xml || :) +for b in `ls eclipse.platform.resources/bundles/ | grep -P -e 'org.eclipse.core.filesystem\.(?!linux\.%{_arch}$)'` ; do + module=$(grep ">bundles/$b<" eclipse.platform.resources/pom.xml || :) if [ -n "$module" ] ; then - %pom_disable_module bundles/$ids eclipse.platform.resources - %pom_xpath_remove -f "plugin[@id='$ids']" eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml + %pom_disable_module bundles/$b eclipse.platform.resources + %pom_xpath_remove -f "plugin[@id='$b']" eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml fi done -%pom_disable_module bundles/org.eclipse.compare.win32 eclipse.platform.team -%pom_disable_module bundles/org.eclipse.core.resources.win32.x86 eclipse.platform.resources -%pom_disable_module bundles/org.eclipse.core.resources.win32.x86_64 eclipse.platform.resources %pom_disable_module org.eclipse.jdt.launching.macosx eclipse.jdt.debug %pom_disable_module org.eclipse.jdt.launching.ui.macosx eclipse.jdt.debug +%pom_disable_module bundles/org.eclipse.compare.win32 eclipse.platform.team %pom_disable_module org.eclipse.e4.ui.workbench.renderers.swt.cocoa eclipse.platform.ui/bundles %pom_disable_module org.eclipse.ui.cocoa eclipse.platform.ui/bundles %pom_disable_module org.eclipse.ui.win32 eclipse.platform.ui/bundles -for xml_name in eclipse.jdt/org.eclipse.jdt-feature/feature.xml \ +%pom_disable_module bundles/org.eclipse.core.resources.win32.x86_64 eclipse.platform.resources +for f in eclipse.jdt/org.eclipse.jdt-feature/feature.xml \ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml \ eclipse.platform.releng/features/org.eclipse.rcp/feature.xml \ eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml ; do - %pom_xpath_remove -f "plugin[@os='macosx']" $xml_name - %pom_xpath_remove -f "plugin[@os='win32']" $xml_name - %pom_xpath_remove -f "plugin[@ws='win32']" $xml_name - for arch in x86 x86_64 arm aarch64 ppc64 ppc64le s390x ; do + %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 if [ "$arch" != "%{_arch}" ] ; then - %pom_xpath_remove -f "plugin[@arch='$arch']" $xml_name + %pom_xpath_remove -f "plugin[@arch='$arch']" $f fi done done - -fix_files=$(grep -lr 3.107.100 eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.*) -sed -i -e "s/3.107.100/3.108.0/" $fix_files - -fix_files=$(grep -lr '1\.1\.[67]00' rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.*) - -sed -i -e "s/1\.1\.[67]00/1.1.800/" -e "/Fragment-Host/s/\(bundle-version=\).*/\1\"1.0.0\"/" $fix_files - %pom_disable_module tests/org.eclipse.swt.tests.fragments.feature eclipse.platform.swt %pom_xpath_remove "pom:dependency-resolution" eclipse.platform.swt/tests/org.eclipse.swt.tests{,.gtk} - +%if %{bootstrap} +%pom_disable_module eclipse.platform.ui.tools +%pom_disable_module features/org.eclipse.releng.tools eclipse.platform.releng +%pom_disable_module bundles/org.eclipse.releng.tools eclipse.platform.releng +%pom_disable_module bundles/org.eclipse.releng.tests eclipse.platform.releng +%pom_xpath_remove "plugin[@id='org.eclipse.releng.tests']" \ + eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml +%endif sed -i -e '//a' \ eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product sed -i -e '/org.eclipse.ui.themes/i' \ eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml sed -i -e '/<\/excludes>/i' \ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml - -%pom_xpath_remove "plugin[@id='org.hamcrest']" eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml -%pom_xpath_remove "plugin[@id='org.hamcrest.text']" eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml - -%pom_xpath_remove "plugin[@id='org.mockito']" eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml -%pom_xpath_inject "feature" '' eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml -%pom_xpath_inject "feature" '' eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml %pom_xpath_remove "plugin[@id='org.eclipse.core.tests.harness']" eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml - %pom_xpath_set "pom:plugin[pom:artifactId = 'tycho-packaging-plugin']/pom:configuration/pom:archive/pom:addMavenDescriptor" "true" eclipse-platform-parent - -for props in rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties; do - grep '^root\.linux\.gtk\.%{_arch}[.=]' $props > tmp - sed -i -e '/^root\./d' $props && cat tmp >> $props +for f in rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties; do + grep '^root\.linux\.gtk\.%{_arch}[.=]' $f > tmp + sed -i -e '/^root\./d' $f && cat tmp >> $f done - -install -d rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/%{_arch} - -for mf_file in rt.equinox.bundles/bundles/org.eclipse.equinox.security.linux.*/META-INF/MANIFEST.MF \ - eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.*/META-INF/MANIFEST.MF \ +mkdir -p rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/%{_arch} +for f in eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.*/META-INF/MANIFEST.MF \ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.*/META-INF/MANIFEST.MF \ - eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.*/META-INF/MANIFEST.MF ; do - echo -e "Eclipse-BundleShape: dir\n\n" >> $mf_file; + eclipse.platform.team/bundles/org.eclipse.core.net.linux.*/META-INF/MANIFEST.MF ; do + echo -e "Eclipse-BundleShape: dir\n\n" >> $f; done - %pom_xpath_inject "pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId='tycho-compiler-plugin']/pom:dependencies" \ "org.eclipsejava10api10" eclipse-platform-parent dependencies/fake_ant_dependency.sh @@ -316,19 +347,15 @@ find -name feature.xml | xargs sed -i -e 's|"javax.servlet"|"javax.servlet-api"| sed -i -e "2iRequire-Bundle: javax.servlet-api" rt.equinox.bundles/bundles/org.eclipse.equinox.http.{jetty,servlet}/META-INF/MANIFEST.MF sed -i -e '/org.apache.felix.service.command/s/;status=provisional//' rt.equinox.bundles/bundles/org.eclipse.equinox.console{,.ssh}/META-INF/MANIFEST.MF %pom_remove_plugin org.eclipse.jetty:jetty-jspc-maven-plugin eclipse.platform.ua/org.eclipse.help.webapp - - -for files in rt.equinox.framework/bundles/org.eclipse.osgi/osgi/ \ - rt.equinox.framework/bundles/org.eclipse.osgi.services/lib/ \ - rt.equinox.framework/bundles/org.eclipse.osgi.util/lib/ \ - rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/osgi/ \ - rt.equinox.bundles/bundles/org.eclipse.equinox.coordinator/lib/ \ - rt.equinox.bundles/bundles/org.eclipse.equinox.log.stream/osgi/ ;do - ln -s $(build-classpath osgi-annotation) $files; -done - -rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug421127_Clipping_is_wrong.java - +%if %{bootstrap} +sed -i '22,51d' eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/assembly/assembly.xml +%endif +ln -s $(build-classpath osgi-annotation) rt.equinox.framework/bundles/org.eclipse.osgi/osgi/ +ln -s $(build-classpath osgi-annotation) rt.equinox.framework/bundles/org.eclipse.osgi.services/lib/ +ln -s $(build-classpath osgi-annotation) rt.equinox.framework/bundles/org.eclipse.osgi.util/lib/ +ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/osgi/ +ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.equinox.coordinator/lib/ +ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.equinox.log.stream/osgi/ %mvn_package "::pom::" __noinstall %mvn_package ":*tests*" tests %mvn_package ":org.eclipse.equinox.frameworkadmin.test" tests @@ -359,24 +386,27 @@ rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/ %mvn_package ":" __noinstall %build +export CFLAGS="%{optflags}" +export LDFLAGS="%{__global_ldflags}" +export M_CFLAGS="$CFLAGS" +export M_ARCH="$LDFLAGS" export MAVEN_OPTS="-Xmx1024m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}" export JAVA_HOME=%{_jvmdir}/java - sed -i -e '/createSourcesJar/d' eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/pom.xml -(cd eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent && xmvn -o -B clean verify) +(cd eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent && xmvn -e -o -B clean verify) mv eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/target/javaagent-shaded.jar \ eclipse.jdt.debug/org.eclipse.jdt.launching/lib - QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +v%Y%m%d-%H%M) -%mvn_build -j -f -- -DforceContextQualifier=$QUALIFIER \ +%mvn_build -j -f -- -e -DforceContextQualifier=$QUALIFIER \ +%if %{bootstrap} + -P !api-generation,!build-docs \ +%endif -Declipse.javadoc=/usr/bin/javadoc -Dnative=gtk.linux.%{_arch} \ -Dtycho.local.keepTarget \ -Dfedora.p2.repos=$(pwd)/.m2/p2/repo-sdk/plugins -DbuildType=X - product="eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{_arch}" dependencies/fake_ant_dependency.sh $product/eclipse/plugins/org.apache.ant_* dependencies/replace_platform_plugins_with_symlinks.sh $product/eclipse %{_javadir} %{_jnidir} - pushd $product/eclipse rm -rf configuration/org.eclipse.core.runtime rm -rf configuration/org.eclipse.equinox.app @@ -386,13 +416,13 @@ rm -rf p2/org.eclipse.equinox.p2.core/cache/* rm -f icon.xpm rm -rf features/org.eclipse.emf.* plugins/org.eclipse.emf.* \ features/org.eclipse.ecf.* plugins/org.eclipse.ecf.* plugins/org.eclipse.ecf_* - pushd p2/org.eclipse.equinox.p2.engine/.settings - sed -i -e "/repositories\/file/d" -e "/repositories\/memory/d" *.prefs ../profileRegistry/SDKProfile.profile/.data/.settings/*.prefs + sed -i "/repositories\/file/d" *.prefs ../profileRegistry/SDKProfile.profile/.data/.settings/*.prefs + sed -i "/repositories\/memory/d" *.prefs ../profileRegistry/SDKProfile.profile/.data/.settings/*.prefs popd - -sed -i -e "s|-Xms40m|-Xms512m|g" -e "s|-Xmx512m|-Xmx1024m|g" -e '1i-protect\nroot' eclipse.ini - +sed -i "s|-Xms40m|-Xms512m|g" eclipse.ini +sed -i "s|-Xmx512m|-Xmx1024m|g" eclipse.ini +sed -i '1i-protect\nroot' eclipse.ini cat >> eclipse.ini <> eclipse.ini < %{buildroot}%{_prefix}/lib/eclipse/.pkgs/Distro%{?dist} - -%post platform -touch --no-create /usr/share/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - gtk-update-icon-cache -q /usr/share/icons/hicolor -fi - -%postun platform -touch --no-create /usr/share/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - gtk-update-icon-cache -q /usr/share/icons/hicolor -fi +find $RPM_BUILD_ROOT/%{_eclipsedir} -name *.so -exec chmod a+x {} \; +install -d -m 755 %{buildroot}%{_eclipsedir}/.pkgs +echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %files swt -f .mfiles-swt -%{_prefix}/lib/eclipse/plugins/org.eclipse.swt* -%{_prefix}/lib/eclipse/swt.jar -%{_jnidir}/swt.* +%{_eclipsedir}/plugins/org.eclipse.swt_* +%{_eclipsedir}/plugins/org.eclipse.swt.gtk.linux.* +%{_eclipsedir}/swt.jar +%{_jnidir}/swt.jar %files platform -f .mfiles-platform %{_bindir}/eclipse -%{_prefix}/lib/eclipse/eclipse -%{_prefix}/lib/eclipse/.eclipseproduct -%{_prefix}/lib/eclipse/.pkgs -%config %{_prefix}/lib/eclipse/eclipse.ini +%{_eclipsedir}/eclipse +%{_eclipsedir}/.eclipseproduct +%{_eclipsedir}/.pkgs +%config %{_eclipsedir}/eclipse.ini %config %{_sysconfdir}/eclipse.ini /usr/share/applications/* /usr/share/pixmaps/* /usr/share/icons/*/*/apps/* %{_datadir}/appdata/eclipse.appdata.xml -%dir %{_prefix}/lib/eclipse/configuration/ -%dir %{_prefix}/lib/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/ -%{_prefix}/lib/eclipse/configuration/config.ini -%{_prefix}/lib/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info -%{_prefix}/lib/eclipse/features/org.eclipse.core.runtime.feature_* -%{_prefix}/lib/eclipse/features/org.eclipse.e4.rcp_* -%{_prefix}/lib/eclipse/features/org.eclipse.equinox.core.feature_* -%{_prefix}/lib/eclipse/features/org.eclipse.equinox.p2.core.feature_* -%{_prefix}/lib/eclipse/features/org.eclipse.equinox.p2.extras.feature_* -%{_prefix}/lib/eclipse/features/org.eclipse.equinox.p2.rcp.feature_* -%{_prefix}/lib/eclipse/features/org.eclipse.equinox.p2.user.ui_* -%{_prefix}/lib/eclipse/features/org.eclipse.help_* -%{_prefix}/lib/eclipse/features/org.eclipse.platform_* -%{_prefix}/lib/eclipse/features/org.eclipse.rcp_* -%{_prefix}/lib/eclipse/plugins/com.ibm.icu_* -%{_prefix}/lib/eclipse/plugins/com.jcraft.jsch_* -%{_prefix}/lib/eclipse/plugins/com.sun.el.javax.el_* -%{_prefix}/lib/eclipse/plugins/javax.* -%{_prefix}/lib/eclipse/plugins/org.apache.* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ant.core_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.compare_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.compare.core_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.core.commands_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.core.contenttype_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.core.databinding.beans_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.core.databinding.observable_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.core.databinding.property_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.core.databinding_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.core.expressions_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.core.externaltools_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.core.filebuffers_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.core.filesystem* -%{_prefix}/lib/eclipse/plugins/org.eclipse.core.jobs_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.core.net* -%{_prefix}/lib/eclipse/plugins/org.eclipse.core.resources_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.core.runtime_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.core.variables_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.debug.core_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.debug.ui_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.core.commands_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.core.contexts_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.core.di_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.core.di.annotations_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.core.di.extensions_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.core.di.extensions.supplier_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.core.services_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.emf.xpath_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.ui.bindings_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.ui.css.core_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.ui.css.swt_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.ui.css.swt.theme_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.ui.di_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.ui.dialogs_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.ui.model.workbench_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.ui.services_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.ui.swt.gtk_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.ui.widgets_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.ui.workbench_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.ui.workbench3_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.ui.workbench.addons.swt_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.ui.workbench.renderers.swt_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.e4.ui.workbench.swt_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.app_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.bidi_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.common_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.concurrent_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.console_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.ds_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.event_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.frameworkadmin_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.frameworkadmin.equinox_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.http.jetty_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.http.registry_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.http.servlet_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.jsp.jasper_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.jsp.jasper.registry_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.launcher_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.*_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.artifact.repository_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.console_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.core_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.director_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.director.app_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.directorywatcher_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.engine_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.extensionlocation_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.garbagecollector_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.jarprocessor_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.metadata_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.metadata.repository_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.operations_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.publisher_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.publisher.eclipse_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.reconciler.dropins_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.repository_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.repository.tools_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.natives_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.transport.ecf_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.ui_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.ui.sdk_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.ui.sdk.scheduler_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.updatechecker_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.p2.updatesite_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.preferences_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.registry_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.security* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.simpleconfigurator_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.equinox.util_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.help_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.help.base_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.help.ui_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.help.webapp_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.jdt.core.compiler.batch_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.jetty.* -%{_prefix}/lib/eclipse/plugins/org.eclipse.jface_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.jface.databinding_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.jface.text_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.jsch.core_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.jsch.ui_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ltk.core.refactoring_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ltk.ui.refactoring_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.platform_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.platform.doc.user_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.rcp_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.search_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.team.core_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.team.genericeditor.diff.extension_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.team.ui_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.text_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ui_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ui.browser_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ui.cheatsheets_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ui.console_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ui.editors_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ui.externaltools_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ui.forms_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ui.genericeditor_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ui.ide_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ui.ide.application_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ui.intro_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ui.intro.quicklinks_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ui.intro.universal_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ui.monitoring_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ui.navigator_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ui.navigator.resources_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ui.net_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ui.themes_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ui.views_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ui.views.properties.tabbed_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ui.workbench_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.ui.workbench.texteditor_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.update.configurator_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.urischeme_* -%{_prefix}/lib/eclipse/plugins/org.glassfish.web.javax.servlet.jsp_* -%{_prefix}/lib/eclipse/plugins/org.kxml2_* -%{_prefix}/lib/eclipse/plugins/org.sat4j.core_* -%{_prefix}/lib/eclipse/plugins/org.sat4j.pb_* -%{_prefix}/lib/eclipse/plugins/org.tukaani.xz_* -%{_prefix}/lib/eclipse/plugins/org.w3c.css.sac_* -%{_prefix}/lib/eclipse/plugins/org.w3c.dom.svg_* -%{_prefix}/lib/eclipse/plugins/org.xmlpull_* -%doc %{_prefix}/lib/eclipse/readme -%{_prefix}/lib/eclipse/artifacts.xml -%{_prefix}/lib/eclipse/p2 +%dir %{_eclipsedir}/configuration/ +%dir %{_eclipsedir}/configuration/org.eclipse.equinox.simpleconfigurator/ +%{_eclipsedir}/configuration/config.ini +%{_eclipsedir}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info +%{_eclipsedir}/features/org.eclipse.core.runtime.feature_* +%{_eclipsedir}/features/org.eclipse.e4.rcp_* +%{_eclipsedir}/features/org.eclipse.equinox.core.feature_* +%{_eclipsedir}/features/org.eclipse.equinox.p2.core.feature_* +%{_eclipsedir}/features/org.eclipse.equinox.p2.extras.feature_* +%{_eclipsedir}/features/org.eclipse.equinox.p2.rcp.feature_* +%{_eclipsedir}/features/org.eclipse.equinox.p2.user.ui_* +%{_eclipsedir}/features/org.eclipse.help_* +%{_eclipsedir}/features/org.eclipse.platform_* +%{_eclipsedir}/features/org.eclipse.rcp_* +%{_eclipsedir}/plugins/com.ibm.icu_* +%{_eclipsedir}/plugins/com.jcraft.jsch_* +%{_eclipsedir}/plugins/com.sun.el.javax.el_* +%{_eclipsedir}/plugins/javax.* +%{_eclipsedir}/plugins/org.apache.* +%{_eclipsedir}/plugins/org.eclipse.ant.core_* +%{_eclipsedir}/plugins/org.eclipse.compare_* +%{_eclipsedir}/plugins/org.eclipse.compare.core_* +%{_eclipsedir}/plugins/org.eclipse.core.commands_* +%{_eclipsedir}/plugins/org.eclipse.core.contenttype_* +%{_eclipsedir}/plugins/org.eclipse.core.databinding.beans_* +%{_eclipsedir}/plugins/org.eclipse.core.databinding.observable_* +%{_eclipsedir}/plugins/org.eclipse.core.databinding.property_* +%{_eclipsedir}/plugins/org.eclipse.core.databinding_* +%{_eclipsedir}/plugins/org.eclipse.core.expressions_* +%{_eclipsedir}/plugins/org.eclipse.core.externaltools_* +%{_eclipsedir}/plugins/org.eclipse.core.filebuffers_* +%{_eclipsedir}/plugins/org.eclipse.core.filesystem* +%{_eclipsedir}/plugins/org.eclipse.core.jobs_* +%{_eclipsedir}/plugins/org.eclipse.core.net* +%{_eclipsedir}/plugins/org.eclipse.core.resources_* +%{_eclipsedir}/plugins/org.eclipse.core.runtime_* +%{_eclipsedir}/plugins/org.eclipse.core.variables_* +%{_eclipsedir}/plugins/org.eclipse.debug.core_* +%{_eclipsedir}/plugins/org.eclipse.debug.ui_* +%{_eclipsedir}/plugins/org.eclipse.e4.core.commands_* +%{_eclipsedir}/plugins/org.eclipse.e4.core.contexts_* +%{_eclipsedir}/plugins/org.eclipse.e4.core.di_* +%{_eclipsedir}/plugins/org.eclipse.e4.core.di.annotations_* +%{_eclipsedir}/plugins/org.eclipse.e4.core.di.extensions_* +%{_eclipsedir}/plugins/org.eclipse.e4.core.di.extensions.supplier_* +%{_eclipsedir}/plugins/org.eclipse.e4.core.services_* +%{_eclipsedir}/plugins/org.eclipse.e4.emf.xpath_* +%{_eclipsedir}/plugins/org.eclipse.e4.ui.bindings_* +%{_eclipsedir}/plugins/org.eclipse.e4.ui.css.core_* +%{_eclipsedir}/plugins/org.eclipse.e4.ui.css.swt_* +%{_eclipsedir}/plugins/org.eclipse.e4.ui.css.swt.theme_* +%{_eclipsedir}/plugins/org.eclipse.e4.ui.di_* +%{_eclipsedir}/plugins/org.eclipse.e4.ui.dialogs_* +%{_eclipsedir}/plugins/org.eclipse.e4.ui.model.workbench_* +%{_eclipsedir}/plugins/org.eclipse.e4.ui.services_* +%{_eclipsedir}/plugins/org.eclipse.e4.ui.swt.gtk_* +%{_eclipsedir}/plugins/org.eclipse.e4.ui.widgets_* +%{_eclipsedir}/plugins/org.eclipse.e4.ui.workbench_* +%{_eclipsedir}/plugins/org.eclipse.e4.ui.workbench3_* +%{_eclipsedir}/plugins/org.eclipse.e4.ui.workbench.addons.swt_* +%{_eclipsedir}/plugins/org.eclipse.e4.ui.workbench.renderers.swt_* +%{_eclipsedir}/plugins/org.eclipse.e4.ui.workbench.swt_* +%{_eclipsedir}/plugins/org.eclipse.equinox.app_* +%{_eclipsedir}/plugins/org.eclipse.equinox.bidi_* +%{_eclipsedir}/plugins/org.eclipse.equinox.common_* +%{_eclipsedir}/plugins/org.eclipse.equinox.concurrent_* +%{_eclipsedir}/plugins/org.eclipse.equinox.console_* +%{_eclipsedir}/plugins/org.eclipse.equinox.ds_* +%{_eclipsedir}/plugins/org.eclipse.equinox.event_* +%{_eclipsedir}/plugins/org.eclipse.equinox.frameworkadmin_* +%{_eclipsedir}/plugins/org.eclipse.equinox.frameworkadmin.equinox_* +%{_eclipsedir}/plugins/org.eclipse.equinox.http.jetty_* +%{_eclipsedir}/plugins/org.eclipse.equinox.http.registry_* +%{_eclipsedir}/plugins/org.eclipse.equinox.http.servlet_* +%{_eclipsedir}/plugins/org.eclipse.equinox.jsp.jasper_* +%{_eclipsedir}/plugins/org.eclipse.equinox.jsp.jasper.registry_* +%{_eclipsedir}/plugins/org.eclipse.equinox.launcher_* +%{_eclipsedir}/plugins/org.eclipse.equinox.launcher.gtk.linux.*_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.artifact.repository_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.console_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.core_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.director_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.director.app_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.directorywatcher_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.engine_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.extensionlocation_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.garbagecollector_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.jarprocessor_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.metadata_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.metadata.repository_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.operations_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.publisher_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.publisher.eclipse_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.reconciler.dropins_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.repository_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.repository.tools_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.touchpoint.natives_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.transport.ecf_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.ui_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.ui.importexport_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.ui.sdk_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.ui.sdk.scheduler_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.updatechecker_* +%{_eclipsedir}/plugins/org.eclipse.equinox.p2.updatesite_* +%{_eclipsedir}/plugins/org.eclipse.equinox.preferences_* +%{_eclipsedir}/plugins/org.eclipse.equinox.registry_* +%{_eclipsedir}/plugins/org.eclipse.equinox.security* +%{_eclipsedir}/plugins/org.eclipse.equinox.simpleconfigurator_* +%{_eclipsedir}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_* +%{_eclipsedir}/plugins/org.eclipse.equinox.util_* +%{_eclipsedir}/plugins/org.eclipse.help_* +%{_eclipsedir}/plugins/org.eclipse.help.base_* +%{_eclipsedir}/plugins/org.eclipse.help.ui_* +%{_eclipsedir}/plugins/org.eclipse.help.webapp_* +%{_eclipsedir}/plugins/org.eclipse.jdt.core.compiler.batch_* +%{_eclipsedir}/plugins/org.eclipse.jetty.* +%{_eclipsedir}/plugins/org.eclipse.jface_* +%{_eclipsedir}/plugins/org.eclipse.jface.databinding_* +%{_eclipsedir}/plugins/org.eclipse.jface.text_* +%{_eclipsedir}/plugins/org.eclipse.jsch.core_* +%{_eclipsedir}/plugins/org.eclipse.jsch.ui_* +%{_eclipsedir}/plugins/org.eclipse.ltk.core.refactoring_* +%{_eclipsedir}/plugins/org.eclipse.ltk.ui.refactoring_* +%{_eclipsedir}/plugins/org.eclipse.platform_* +%{_eclipsedir}/plugins/org.eclipse.platform.doc.user_* +%{_eclipsedir}/plugins/org.eclipse.rcp_* +%{_eclipsedir}/plugins/org.eclipse.search_* +%{_eclipsedir}/plugins/org.eclipse.team.core_* +%{_eclipsedir}/plugins/org.eclipse.team.genericeditor.diff.extension_* +%{_eclipsedir}/plugins/org.eclipse.team.ui_* +%{_eclipsedir}/plugins/org.eclipse.text_* +%{_eclipsedir}/plugins/org.eclipse.ui_* +%{_eclipsedir}/plugins/org.eclipse.ui.browser_* +%{_eclipsedir}/plugins/org.eclipse.ui.cheatsheets_* +%{_eclipsedir}/plugins/org.eclipse.ui.console_* +%{_eclipsedir}/plugins/org.eclipse.ui.editors_* +%{_eclipsedir}/plugins/org.eclipse.ui.externaltools_* +%{_eclipsedir}/plugins/org.eclipse.ui.forms_* +%{_eclipsedir}/plugins/org.eclipse.ui.genericeditor_* +%{_eclipsedir}/plugins/org.eclipse.ui.ide_* +%{_eclipsedir}/plugins/org.eclipse.ui.ide.application_* +%{_eclipsedir}/plugins/org.eclipse.ui.intro_* +%{_eclipsedir}/plugins/org.eclipse.ui.intro.quicklinks_* +%{_eclipsedir}/plugins/org.eclipse.ui.intro.universal_* +%{_eclipsedir}/plugins/org.eclipse.ui.monitoring_* +%{_eclipsedir}/plugins/org.eclipse.ui.navigator_* +%{_eclipsedir}/plugins/org.eclipse.ui.navigator.resources_* +%{_eclipsedir}/plugins/org.eclipse.ui.net_* +%{_eclipsedir}/plugins/org.eclipse.ui.themes_* +%{_eclipsedir}/plugins/org.eclipse.ui.views_* +%{_eclipsedir}/plugins/org.eclipse.ui.views.log_* +%{_eclipsedir}/plugins/org.eclipse.ui.views.properties.tabbed_* +%{_eclipsedir}/plugins/org.eclipse.ui.workbench_* +%{_eclipsedir}/plugins/org.eclipse.ui.workbench.texteditor_* +%{_eclipsedir}/plugins/org.eclipse.update.configurator_* +%{_eclipsedir}/plugins/org.eclipse.urischeme_* +%{_eclipsedir}/plugins/org.glassfish.web.javax.servlet.jsp_* +%{_eclipsedir}/plugins/org.kxml2_* +%{_eclipsedir}/plugins/org.sat4j.core_* +%{_eclipsedir}/plugins/org.sat4j.pb_* +%{_eclipsedir}/plugins/org.tukaani.xz_* +%{_eclipsedir}/plugins/org.w3c.css.sac_* +%{_eclipsedir}/plugins/org.w3c.dom.svg_* +%{_eclipsedir}/plugins/org.xmlpull_* +%doc %{_eclipsedir}/readme +%{_eclipsedir}/artifacts.xml +%{_eclipsedir}/p2 %{_javadir}/%{name}/core* %{_javadir}/%{name}/equinox* - %files jdt -f .mfiles-jdt %{_datadir}/appdata/eclipse-jdt.metainfo.xml %files pde -f .mfiles-pde -f .mfiles-cvs -f .mfiles-sdk -%{_prefix}/lib/eclipse/droplets/eclipse-sdk/features/org.eclipse.equinox.executable_* %{_datadir}/appdata/eclipse-pde.metainfo.xml %files p2-discovery -f .mfiles-p2-discovery @@ -735,12 +737,14 @@ fi %{_datadir}/eclipse-testing %files equinox-osgi -f .mfiles-equinox-osgi -%{_prefix}/lib/eclipse/plugins/org.eclipse.osgi_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.osgi.compatibility.state_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.osgi.services_* -%{_prefix}/lib/eclipse/plugins/org.eclipse.osgi.util_* - +%{_eclipsedir}/plugins/org.eclipse.osgi_* +%{_eclipsedir}/plugins/org.eclipse.osgi.compatibility.state_* +%{_eclipsedir}/plugins/org.eclipse.osgi.services_* +%{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Tue Aug 18 2020 yanan li - 1:4.11-1 +- upgrade to 4.11-1 + * Fri Nov 22 2019 sunguoshuai - 1:4.9.0-3 - Package init. diff --git a/explicit-hamcrest.patch b/explicit-hamcrest.patch new file mode 100644 index 0000000000000000000000000000000000000000..0db66016cd4c8aadc4093ee8791e59dfb0495dc0 --- /dev/null +++ b/explicit-hamcrest.patch @@ -0,0 +1,19 @@ +--- 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" diff --git a/fix_ant_build.patch b/fix_ant_build.patch index 2a1e66e11f5c134edae4f390f1540f933421a822..da2811aa05bd99b5d9c2da87e087239d490f5648 100644 --- a/fix_ant_build.patch +++ b/fix_ant_build.patch @@ -1,5 +1,5 @@ ---- a/eclipse.platform/ant/org.eclipse.ant.launching/build.properties.orig 2017-01-09 10:24:16.258243377 +0000 -+++ b/eclipse.platform/ant/org.eclipse.ant.launching/build.properties 2017-01-09 10:25:08.302620557 +0000 +--- 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 @@ about.html @@ -27,8 +27,8 @@ +output.lib/remote.jar = remote_bin/ +src.includes = about.html javacWarnings..=-unavoidableGenericProblems ---- a/eclipse.platform/ant/org.eclipse.ant.ui/build.properties.orig 2017-04-03 18:40:41.033489412 +0100 -+++ b/eclipse.platform/ant/org.eclipse.ant.ui/build.properties 2017-04-03 18:43:21.614928391 +0100 +--- 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 @@ source.lib/antrunner.jar = Ant Runner Support/ output.lib/antrunner.jar = ant_runner_support_bin/ @@ -48,8 +48,8 @@ -# ,lib/remoteAnt.jar +jars.compile.order=.,lib/antrunner.jar,lib/remoteAnt.jar javacWarnings..=-unavoidableGenericProblems ---- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.xml.orig 2017-01-09 13:30:24.238066571 +0000 -+++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.xml 2017-01-09 13:31:19.228456113 +0000 +--- eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.xml.orig 2017-01-09 13:30:24.238066571 +0000 ++++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.xml 2017-01-09 13:31:19.228456113 +0000 @@ -1,106 +1,8 @@ - diff --git a/org.eclipse.linuxtools.eclipse-build-44643cbda3dfd6f00fbf1b346dae7068df2a9ef9.tar.xz b/org.eclipse.linuxtools.eclipse-build-44643cbda3dfd6f00fbf1b346dae7068df2a9ef9.tar.xz deleted file mode 100644 index 0488d57f24bc99866740ce0e19841fd5e9cad287..0000000000000000000000000000000000000000 Binary files a/org.eclipse.linuxtools.eclipse-build-44643cbda3dfd6f00fbf1b346dae7068df2a9ef9.tar.xz and /dev/null differ diff --git a/org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8.tar.xz b/org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..b8ccf48f6e85756f3d19f0f27c060bb1c59d81ef Binary files /dev/null and b/org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8.tar.xz differ diff --git a/prefer_x11_backend.patch b/prefer_x11_backend.patch index 71fe3e2aa9574508a98786249a7a087945d0511f..838ab61a3c54d47d5ac8a5c201f72ab955a1eaf6 100644 --- a/prefer_x11_backend.patch +++ b/prefer_x11_backend.patch @@ -1,6 +1,6 @@ ---- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c.orig 2018-08-22 15:19:04.602623018 +0100 -+++ b/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 @@ +--- 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 +@@ -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);