diff --git a/eclipse-feature-plugins-to-category-ius.patch b/eclipse-feature-plugins-to-category-ius.patch index 941e693..24dffb5 100644 --- a/eclipse-feature-plugins-to-category-ius.patch +++ b/eclipse-feature-plugins-to-category-ius.patch @@ -1,4 +1,4 @@ -From 92a15ec9a79258cdb22e1ebb51d4b912db38b17b Mon Sep 17 00:00:00 2001 +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 @@ -9,11 +9,12 @@ Subject: [PATCH 1/2] Change features bundling third-party modules to feature .../org.eclipse.pde-feature/feature.xml | 16 +- .../org.eclipse.platform.doc.isv/pom.xml | 11 +- .../org.eclipse.help-feature/feature.xml | 130 +++------------ - .../org.eclipse.sdk.tests/feature.xml | 59 ++----- + .../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 ++---------------- - 8 files changed, 79 insertions(+), 468 deletions(-) + 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 @@ -370,11 +371,54 @@ index 853db711d..5195b6d59 100644 + + +diff --git a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml +index f825d4539..a9b974ca5 100644 +--- 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"/> + +- +- + + +- +- + @@ -382,7 +426,6 @@ index a3a7d14a0..1b2c80556 100644 + + + -+ + + + @@ -391,7 +434,7 @@ index a3a7d14a0..1b2c80556 100644 -@@ -421,20 +431,6 @@ +@@ -421,20 +430,6 @@ install-size="0" version="0.0.0"/> @@ -412,7 +455,7 @@ index a3a7d14a0..1b2c80556 100644 diff --git a/eclipse-mockito.patch b/eclipse-mockito.patch index d20717c..3e49870 100644 --- a/eclipse-mockito.patch +++ b/eclipse-mockito.patch @@ -1,4 +1,4 @@ -From 6ce6a869fed6260658b28feca5257885d64d2172 Mon Sep 17 00:00:00 2001 +From 0efaa8f30c107beb904d37e2ad13913ae51f9e27 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 6 Dec 2018 11:43:10 +0000 Subject: [PATCH 2/2] Patch to use ASM 6 and Mockito 1 @@ -147,12 +147,12 @@ index 4ff1492e8..7dc03b6aa 100644 } diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml -index 1b2c80556..010f679d7 100644 +index f0dab84a3..ecef382ab 100644 --- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml -@@ -25,7 +25,7 @@ +@@ -24,7 +24,7 @@ + - - + diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch index 978748c..ff3e002 100644 --- a/eclipse-no-source-for-dependencies.patch +++ b/eclipse-no-source-for-dependencies.patch @@ -26,37 +26,6 @@ ---- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak 2012-07-31 07:43:57.000000000 +0200 -+++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml 2012-07-31 08:05:24.279277920 +0200 -@@ -34,6 +34,17 @@ - - source-feature - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - ---- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.orig 2014-11-28 15:27:07.874872769 +0000 -+++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2014-11-28 15:31:02.592652099 +0000 -@@ -61,6 +61,8 @@ - - - -+ -+ - - - --- 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 @@ diff --git a/eclipse.spec b/eclipse.spec index 0879f61..0457a97 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -1,12 +1,12 @@ # Set to 1 to build Eclipse without circular dependency to eclipse-pde, API # generation and docs will not be built and a second run will be required, but # this is a way to bootstrap Eclipse on secondary archs. -%global bootstrap 1 +%global bootstrap 0 Epoch: 1 -%global eb_commit 44643cbda3dfd6f00fbf1b346dae7068df2a9ef9 -%global eclipse_tag I20181205-1800 +%global eb_commit c985e357223668b4bc1fb76ea6b9e0c12829b7e8 +%global eclipse_tag I20181206-0815 %global _jetty_version 9.4.14 %global _lucene_version 7.1.0 @@ -37,7 +37,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: 4.10.0 -Release: 0.3%{?dist} +Release: 1%{?dist} License: EPL-2.0 URL: http://www.eclipse.org/ @@ -417,6 +417,7 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/ %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 @@ -455,6 +456,9 @@ sed -i -e 's/javax.annotation/javax.annotation-api/' eclipse.jdt.core/org.eclips # Missing dep on reddeer %pom_disable_module ui/org.eclipse.pde.ui.tests.smartimport eclipse.pde.ui +# Don't need enforcer on RPM builds +%pom_remove_plugin :maven-enforcer-plugin eclipse-platform-parent + # This part generates secondary fragments using primary fragments for dir in rt.equinox.binaries rt.equinox.framework/bundles eclipse.platform.swt.binaries/bundles ; do utils/ensure_arch.sh "$dir" x86 arm @@ -655,7 +659,7 @@ export JAVA_HOME=%{_jvmdir}/java # Pre-build agent jar needed for AdvancedSourceLookupSupport 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 @@ -1080,6 +1084,10 @@ fi %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Tue Dec 11 2018 Mat Booth - 1:4.10.0-1 +- Update to 2018-12 release +- Update eclipse-build snapshot + * Thu Dec 06 2018 Mat Booth - 1:4.10.0-0.3 - Update to latest I-build - Build against latest jetty, mockito packages diff --git a/prefer_x11_backend.patch b/prefer_x11_backend.patch index a69aa31..838ab61 100644 --- a/prefer_x11_backend.patch +++ b/prefer_x11_backend.patch @@ -1,6 +1,6 @@ --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c.orig 2018-08-22 15:19:04.602623018 +0100 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c 2018-08-22 15:20:03.453348722 +0100 -@@ -111,6 +111,11 @@ +@@ -114,6 +114,11 @@ #define DLFLAGS RTLD_LAZY #endif @@ -11,4 +11,4 @@ + void *gioLib = NULL, *glibLib = NULL, *gdkLib = NULL, *gtkLib = NULL, *objLib = NULL, *pixLib = NULL; - char *gtk3 = getenv("SWT_GTK3"); + gdkLib = dlopen(GDK3_LIB, DLFLAGS); diff --git a/sources b/sources index 32b6bfd..7eb06ff 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (eclipse-platform-sources-I20181205-1800.tar.xz) = 032bee233b0b0ee18155bc9144c6a8db087d7f868c89cfbfa72e79e4c2224dbe0792cef51cfb4c7bb52920717591ecaf3b84522ea7772ffb4bced773d9957749 -SHA512 (org.eclipse.linuxtools.eclipse-build-44643cbda3dfd6f00fbf1b346dae7068df2a9ef9.tar.xz) = ef02f54deefd154265122fa0191c8d69bbb135e026171de147a7fb3af83bb26523ea866d19aa7c7cc184c8e05ad55e54846a909bea69bd1bc6cd57005d055ebf +SHA512 (eclipse-platform-sources-I20181206-0815.tar.xz) = 88a091eff1cd775c85e022f15625e12ce25655be841efa194be7278d81dbb4db85fcb0fea070a4f849b196d299bdb4179c8cbfb44ab744e3e6fba544d1ffc733 +SHA512 (org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8.tar.xz) = 79780efe9eed0082ea6de6978c5b65ccf5c65a242bff24f34cd763c0ca19a695e7735442aba20f5d2fca4153f7b59c5804fdcb67fa050480dcad137d664d3ce3