From 844d686fa9617fb2329422164a85f280c0ddd7dc Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Nov 06 2020 11:39:45 +0000 Subject: Update to latest upstream release --- diff --git a/eclipse-feature-plugins-to-category-ius.patch b/eclipse-feature-plugins-to-category-ius.patch index 305eede..febf690 100644 --- a/eclipse-feature-plugins-to-category-ius.patch +++ b/eclipse-feature-plugins-to-category-ius.patch @@ -443,84 +443,6 @@ index b97274c8f..c0259a07b 100644 - -+ -+ -+ -+ -+ -+ -+ -+ - - -- -- -- -- -- -- -- -- -- -- -- -- - - -- -- - diff --git a/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml b/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml index f23dc6904..ff63f3901 100644 --- a/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch index d56bdda..fc723e7 100644 --- a/eclipse-no-source-for-dependencies.patch +++ b/eclipse-no-source-for-dependencies.patch @@ -26,16 +26,15 @@ ---- 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 @@ +--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.orig 2020-11-06 09:49:58.605988278 +0000 ++++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2020-11-06 09:51:07.927686273 +0000 +@@ -42,7 +42,24 @@ + - -+ -+ +- ++ + -+ + + + @@ -47,6 +46,9 @@ + + + ++ ++ ++ + + diff --git a/eclipse-pde-tp-support-droplets.patch b/eclipse-pde-tp-support-droplets.patch index d4003b8..38a5f27 100644 --- a/eclipse-pde-tp-support-droplets.patch +++ b/eclipse-pde-tp-support-droplets.patch @@ -18,7 +18,7 @@ index 27e51faa6..0735dc414 100644 @@ -102,5 +102,6 @@ Require-Bundle: org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)" Eclipse-LazyStart: true - Bundle-RequiredExecutionEnvironment: JavaSE-1.8 + Bundle-RequiredExecutionEnvironment: JavaSE-11 +Import-Package: org.eclipse.equinox.internal.simpleconfigurator.utils Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.pde.core diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch index 931eb5d..e5e2f35 100644 --- a/eclipse-secondary-arches.patch +++ b/eclipse-secondary-arches.patch @@ -2,20 +2,10 @@ diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclip index 7e1f520..734dd10 100644 --- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml +++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml -@@ -393,6 +393,26 @@ +@@ -393,6 +393,16 @@ unpack="false"/> -+ -+ - +@@ -125,6 +125,7 @@ -+ + + --- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:44:03.436891441 +0000 +++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:45:25.232480509 +0000 -@@ -32,3 +32,9 @@ +@@ -35,3 +35,6 @@ root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root root.linux.gtk.x86_64.permissions.755=libcairo-swt.so + -+root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root -+root.linux.gtk.aarch64.permissions.755=launcher -+ +root.linux.gtk.s390x=bin/gtk/linux/s390x,gtk_root +root.linux.gtk.s390x.permissions.755=launcher --- 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,9 @@ - - +@@ -56,6 +56,7 @@ bundles/org.eclipse.swt.cocoa.macosx.x86_64 -+ bundles/org.eclipse.swt.gtk.linux.aarch64 + bundles/org.eclipse.swt.gtk.linux.aarch64 bundles/org.eclipse.swt.gtk.linux.ppc64le + bundles/org.eclipse.swt.gtk.linux.s390x bundles/org.eclipse.swt.gtk.linux.x86_64 bundles/org.eclipse.swt.win32.win32.x86_64 - + bundles/org.eclipse.swt.browser.chromium.cocoa.macosx.x86_64 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2017-04-21 10:15:34.857977599 +0100 +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2017-04-21 10:18:22.878025820 +0100 -@@ -24,3 +24,13 @@ - requires.5.name = org.eclipse.swt.gtk.linux.ppc64le - requires.5.range = [$version$,$version$] - requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true))) -+ -+requires.6.namespace = org.eclipse.equinox.p2.iu -+requires.6.name = org.eclipse.swt.gtk.linux.aarch64 -+requires.6.range = [$version$,$version$] -+requires.6.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true))) +@@ -29,3 +29,8 @@ + requires.6.name = org.eclipse.swt.gtk.linux.aarch64 + requires.6.range = [$version$,$version$] + requires.6.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true))) + +requires.7.namespace = org.eclipse.equinox.p2.iu +requires.7.name = org.eclipse.swt.gtk.linux.s390x diff --git a/eclipse-swt-avoid-javascript-at-build.patch b/eclipse-swt-avoid-javascript-at-build.patch index 8de5935..8917437 100644 --- a/eclipse-swt-avoid-javascript-at-build.patch +++ b/eclipse-swt-avoid-javascript-at-build.patch @@ -26,12 +26,12 @@ index 4d209cfdc..eab439ae5 100644 - - org.apache.ant - ant -- 1.10.7 +- 1.10.8 - - - org.apache.ant - ant-apache-bsf -- 1.10.7 +- 1.10.8 - - @@ -41,7 +41,7 @@ diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml b/eclipse index 9d4bb1b6f..6c1cdf690 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml -@@ -374,27 +374,8 @@ +@@ -409,27 +409,8 @@ @@ -70,20 +70,20 @@ index 9d4bb1b6f..6c1cdf690 100644 -@@ -523,11 +504,7 @@ +@@ -559,11 +540,7 @@ - + -@@ -661,23 +638,15 @@ +@@ -709,23 +686,15 @@ @@ -102,7 +102,7 @@ index 9d4bb1b6f..6c1cdf690 100644 - task.addFileset(fileset); - } - task.execute(); -- ]]> +- ]]> - + + @@ -118,4 +118,3 @@ index 9d4bb1b6f..6c1cdf690 100644 -- 2.21.1 - diff --git a/eclipse.spec b/eclipse.spec index ea9be5b..e30b10e 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -8,13 +8,17 @@ Epoch: 1 -%global eb_commit d2d5e1813a3213c8c4ff3f6a5049fecd003111df +%global eb_commit e3e8e3f486014f5683f9200a981f313800b8c964 %global eclipse_rel %{version} -%global eclipse_tag R-%{eclipse_rel}-202006040540 +%global eclipse_tag R-%{eclipse_rel}-202009021800 -%global _jetty_version 9.4.31 -%global _lucene_version 8.4.1 +%global _jetty_version 9.4.33 +%global _lucene_version 8.6.3 %global _batik_version 1.13 +%global _asm_version 8.0.1 + +%global _emf_version 1:2.23.0 +%global _ecf_version 3.14.17 %ifarch s390x x86_64 aarch64 ppc64le %global eclipse_arch %{_arch} @@ -52,8 +56,8 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse -Version: 4.16 -Release: 14%{?dist} +Version: 4.17 +Release: 1%{?dist} License: EPL-2.0 URL: https://www.eclipse.org/ @@ -64,9 +68,6 @@ Source0: https://download.eclipse.org/eclipse/downloads/drops4/%{eclipse_tag}/ec # %%{eb_commit} | xz > org.eclipse.linuxtools.eclipse-build-%%{eb_commit}.tar.xz Source1: https://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/snapshot/org.eclipse.linuxtools.eclipse-build-%{eb_commit}.tar.xz -# Toolchain configurations for all EEs needed by Eclipse bundles -Source2: toolchains.xml - # Eclipse should not include source for dependencies that are not supplied by this package # and should not include source for bundles that are not relevant to our platform Patch0: eclipse-no-source-for-dependencies.patch @@ -129,9 +130,7 @@ Patch26: force-clean-after-p2-operations.patch # Upstream no longer supports non-64bit arches ExcludeArch: s390 %{arm} %{ix86} -# Require both JDKs until Eclipse can fully move onto Java 11 BuildRequires: java-11-openjdk-devel -BuildRequires: java-1.8.0-openjdk-devel BuildRequires: maven-local BuildRequires: tycho @@ -187,7 +186,7 @@ BuildRequires: junit5 >= 5.4.0 BuildRequires: apiguardian BuildRequires: hamcrest BuildRequires: sat4j -BuildRequires: objectweb-asm >= 7.0 +BuildRequires: objectweb-asm >= %{_asm_version} BuildRequires: sac BuildRequires: batik-css >= %{_batik_version} BuildRequires: batik-util >= %{_batik_version} @@ -195,8 +194,8 @@ BuildRequires: google-gson BuildRequires: xmlgraphics-commons >= 2.3 BuildRequires: xml-commons-apis BuildRequires: atinject -BuildRequires: eclipse-ecf-core >= 3.14.8 -BuildRequires: eclipse-emf-core >= 1:2.22.0 +BuildRequires: eclipse-ecf-core >= %{_ecf_version} +BuildRequires: eclipse-emf-core >= %{_emf_version} BuildRequires: eclipse-license2 BuildRequires: glassfish-annotation-api BuildRequires: glassfish-el-api >= 3.0.1 @@ -209,6 +208,8 @@ BuildRequires: httpcomponents-client BuildRequires: jsoup BuildRequires: xz-java BuildRequires: osgi(osgi.annotation) +BuildRequires: jna +BuildRequires: jna-contrib # Build deps that are excluded when bootstrapping %if %{without bootstrap} # For building docs and apitooling @@ -216,7 +217,7 @@ BuildRequires: eclipse-pde %if %{with contrib_tools} # For contributor tools BuildRequires: eclipse-egit -BuildRequires: eclipse-emf-runtime +BuildRequires: eclipse-emf-runtime >= %{_emf_version} %endif %endif @@ -272,8 +273,8 @@ Requires: batik-util >= %{_batik_version} Requires: xmlgraphics-commons >= 2.3 Requires: xml-commons-apis Requires: atinject -Requires: eclipse-ecf-core >= 3.14.8 -Requires: eclipse-emf-core >= 1:2.22.0 +Requires: eclipse-ecf-core >= %{_ecf_version} +Requires: eclipse-emf-core >= %{_emf_version} Requires: glassfish-annotation-api Requires: glassfish-el-api >= 3.0.1 Requires: glassfish-el >= 3.0.1 @@ -316,7 +317,7 @@ Summary: Eclipse Plugin Development Environment Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires: %{name}-jdt = %{epoch}:%{version}-%{release} -Requires: objectweb-asm >= 7.0 +Requires: objectweb-asm >= %{_asm_version} %description pde Eclipse Plugin Development Environment. This package is required for @@ -426,8 +427,6 @@ rm rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/e %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.artifact.optimizers rt.equinox.p2 -%pom_disable_module bundles/org.eclipse.equinox.p2.artifact.processors rt.equinox.p2 %pom_disable_module bundles/org.eclipse.equinox.p2.artifact.checksums.bouncycastle rt.equinox.p2 # Don't need annotations for obsolete JDKs @@ -498,10 +497,10 @@ done %pom_remove_plugin :maven-enforcer-plugin eclipse-platform-parent # This part generates secondary fragments using primary fragments -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} +rm -rf eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.s390x +rm -rf rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.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 + utils/ensure_arch.sh "$dir" x86_64 s390x done # Remove platform-specific stuff that we don't care about to reduce build time @@ -511,7 +510,7 @@ done TYCHO_ENV="linuxgtk%{eclipse_arch}" %pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" eclipse-platform-parent %pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk -for b in `ls eclipse.platform.swt.binaries/bundles | grep -P -e 'org.eclipse.swt\.(?!gtk\.linux.%{eclipse_arch}$)'` ; do +for b in `ls eclipse.platform.swt.binaries/bundles | grep 'org.eclipse.swt' | grep -v 'gtk\.linux\.%{eclipse_arch}'` ; do module=$(grep ">bundles/$b<" eclipse.platform.swt.binaries/pom.xml || :) if [ -n "$module" ] ; then %pom_disable_module bundles/$b eclipse.platform.swt.binaries @@ -679,12 +678,10 @@ mv eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/target/javaagent-shaded QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +v%Y%m%d-%H%M) %mvn_build -j -f -- -e -DforceContextQualifier=$QUALIFIER -DaggregatorBuild=true \ %if %{with bootstrap} - -Pbree-libs,!api-generation,!build-docs \ -%else - -Pbree-libs \ + api-generation,!build-docs \ %endif -Declipse.javadoc=%{_jvmdir}/java-11/bin/javadoc -Dnative=gtk.linux.%{eclipse_arch} \ - -Dtycho.local.keepTarget --global-toolchains %{SOURCE2} \ + -Dtycho.local.keepTarget -DskipRust=true -DskipJni=true \ -Dfedora.p2.repos=$(pwd)/.m2/p2/repo-sdk/plugins -DbuildType=X # Location that the product is materialised @@ -851,6 +848,7 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %files swt -f .mfiles-swt %{_eclipsedir}/plugins/org.eclipse.swt_* %{_eclipsedir}/plugins/org.eclipse.swt.gtk.linux.* +%{_eclipsedir}/plugins/org.eclipse.swt.browser.chromium.gtk.linux.* %{_eclipsedir}/swt.jar %{_jnidir}/swt.jar @@ -1031,6 +1029,8 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.ui.workbench.texteditor_* %{_eclipsedir}/plugins/org.eclipse.update.configurator_* %{_eclipsedir}/plugins/org.eclipse.urischeme_* +%{_eclipsedir}/plugins/com.sun.jna_* +%{_eclipsedir}/plugins/com.sun.jna.platform_* %{_eclipsedir}/plugins/org.sat4j.core_* %{_eclipsedir}/plugins/org.sat4j.pb_* %{_eclipsedir}/plugins/org.tukaani.xz_* @@ -1061,6 +1061,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Wed Oct 28 2020 Mat Booth - 1:4.17-1 +- Update to latest upstream release + * Tue Oct 27 2020 Jie Kang - 1:4.16-14 - Update fedora macros to include eln diff --git a/explicit-hamcrest.patch b/explicit-hamcrest.patch index d0574be..3419800 100644 --- a/explicit-hamcrest.patch +++ b/explicit-hamcrest.patch @@ -44,9 +44,9 @@ Eclipse-BundleShape: dir Require-Bundle: org.junit, + org.hamcrest.core;bundle-version="1.3.0", - org.hamcrest.library;bundle-version="1.3.0", org.eclipse.core.runtime;bundle-version="3.15.400", org.eclipse.pde.launching;bundle-version="3.7.700", + org.eclipse.core.resources;bundle-version="3.13.500", --- eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF.orig 2019-09-23 09:46:23.507897561 +0100 +++ eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF 2019-09-23 09:46:45.658839342 +0100 @@ -7,6 +7,7 @@ diff --git a/force-clean-after-p2-operations.patch b/force-clean-after-p2-operations.patch index c1e0d3c..2330ba8 100644 --- a/force-clean-after-p2-operations.patch +++ b/force-clean-after-p2-operations.patch @@ -18,8 +18,8 @@ index 497e5d6fa..a118a0e4c 100644 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.launcher;singleton:=true --Bundle-Version: 1.5.700.qualifier -+Bundle-Version: 1.5.701.qualifier +-Bundle-Version: 1.5.800.qualifier ++Bundle-Version: 1.5.801.qualifier Main-Class: org.eclipse.equinox.launcher.Main Bundle-ClassPath: . Bundle-Vendor: %providerName @@ -31,8 +31,8 @@ index 43849b5b8..c5d2cdfea 100644 org.eclipse.equinox org.eclipse.equinox.launcher -- 1.5.700-SNAPSHOT -+ 1.5.701-SNAPSHOT +- 1.5.800-SNAPSHOT ++ 1.5.801-SNAPSHOT eclipse-plugin diff --git a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java diff --git a/sources b/sources index 41c1b21..66d68ff 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (org.eclipse.linuxtools.eclipse-build-d2d5e1813a3213c8c4ff3f6a5049fecd003111df.tar.xz) = 0a8cb78b543b635aa0b3f69028e145eadaa71995b8a51adc8a4b737b5311090044a393283bf4ee1b40baf25c346e460d67d281e6d6151206aba4b3a808ac6e01 -SHA512 (eclipse-platform-sources-4.16.tar.xz) = e97d56f4ff7accca82993ebb8edf6cd012f20273f063c764134753dafb38972497521f2a3150c2650655c17149e135eccf781b536d50b382cd1e2fb41ec4a692 +SHA512 (org.eclipse.linuxtools.eclipse-build-e3e8e3f486014f5683f9200a981f313800b8c964.tar.xz) = a2f4601f6657bb7f5ff20df9e1227e06dcb83923934b2a4fc280996f874912172459d4c99de318c0077cf9896bc886407342b00a5b2338983e8bff47d4fd3ac3 +SHA512 (eclipse-platform-sources-4.17.tar.xz) = b2a99b7d1297ecf04ea3d657b49f4f0106876628b4ac61fb1fbe9d61b691e0fb141e76b8c175015ae7a62a8ae6dd5c76dd171e49bea2610cf8074746ef21a351