From e6112c26c7fb34b45711041e8cb8064aeebacac4 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 19 Jan 2021 00:06:31 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/eclipse.git#c21212b002b4e7a2ff68dde825f2e885df0dd979 --- .gitignore | 14 + .project | 18 + changelog.pre-oxygen | 1632 +++++++++++++++++ eclipse-debug-symbols.patch | 38 + eclipse-disable-droplets-in-dropins.patch | 47 + eclipse-disable-uses-constraints.patch | 28 + eclipse-feature-plugins-to-category-ius.patch | 721 ++++++++ eclipse-fix-dropins.patch | 88 + eclipse-fix-tests.patch | 280 +++ ...se-hide-droplets-from-install-wizard.patch | 69 + ...ignore-version-when-calculating-home.patch | 26 + eclipse-make-droplets-runnable.patch | 47 + eclipse-no-source-for-dependencies.patch | 75 + eclipse-p2-pick-up-renamed-jars.patch | 11 + eclipse-patch-out-fileupload-dep.patch | 116 ++ eclipse-pde-tp-support-droplets.patch | 133 ++ eclipse-secondary-arches.patch | 122 ++ eclipse-support-symlink-bundles.patch | 156 ++ eclipse-swt-avoid-javascript-at-build.patch | 120 ++ eclipse.spec | 1447 +++++++++++++++ explicit-hamcrest.patch | 59 + fix_ant_build.patch | 161 ++ force-clean-after-p2-operations.patch | 80 + prefer_x11_backend.patch | 14 + sources | 2 + toolchains.xml | 110 ++ 26 files changed, 5614 insertions(+) create mode 100644 .project create mode 100644 changelog.pre-oxygen create mode 100644 eclipse-debug-symbols.patch create mode 100644 eclipse-disable-droplets-in-dropins.patch create mode 100644 eclipse-disable-uses-constraints.patch create mode 100644 eclipse-feature-plugins-to-category-ius.patch create mode 100644 eclipse-fix-dropins.patch create mode 100644 eclipse-fix-tests.patch create mode 100644 eclipse-hide-droplets-from-install-wizard.patch create mode 100644 eclipse-ignore-version-when-calculating-home.patch create mode 100644 eclipse-make-droplets-runnable.patch create mode 100644 eclipse-no-source-for-dependencies.patch create mode 100644 eclipse-p2-pick-up-renamed-jars.patch create mode 100644 eclipse-patch-out-fileupload-dep.patch create mode 100644 eclipse-pde-tp-support-droplets.patch create mode 100644 eclipse-secondary-arches.patch create mode 100644 eclipse-support-symlink-bundles.patch create mode 100644 eclipse-swt-avoid-javascript-at-build.patch create mode 100644 eclipse.spec create mode 100644 explicit-hamcrest.patch create mode 100644 fix_ant_build.patch create mode 100644 force-clean-after-p2-operations.patch create mode 100644 prefer_x11_backend.patch create mode 100644 sources create mode 100644 toolchains.xml diff --git a/.gitignore b/.gitignore index e69de29..aa20de5 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,14 @@ +*.rpm +eclipse-build-*.tar.gz +eclipse-build-*.tar.xz +/R4_platform-aggregator-* +/eclipse-jdtpdeupdatesite.tar.bz2 +/x86_64 +/results_eclipse +/.m2 +/.xmvn +/.build-*.log +/org.eclipse.linuxtools.eclipse-build-*.tar.bz2 +/org.eclipse.linuxtools.eclipse-build-*.tar.xz +/org.eclipse.linuxtools.eclipse-build-*/ +/eclipse-platform-sources-*.tar.xz diff --git a/.project b/.project new file mode 100644 index 0000000..f98c3ce --- /dev/null +++ b/.project @@ -0,0 +1,18 @@ + + + eclipse + + + + + + org.eclipse.linuxtools.rpm.rpmlint.rpmlintBuilder + + + + + + org.eclipse.linuxtools.rpm.rpmlint.rpmlintNature + org.eclipse.linuxtools.rpm.core.rpmnature + + diff --git a/changelog.pre-oxygen b/changelog.pre-oxygen new file mode 100644 index 0000000..cb4154a --- /dev/null +++ b/changelog.pre-oxygen @@ -0,0 +1,1632 @@ +* Mon Apr 03 2017 Mat Booth - 1:4.6.3-3 +- Build missing remote ant support jar + +* Fri Mar 03 2017 Mat Booth - 1:4.6.3-2 +- Re-enable test-framework for platform tests +- Drop long-time broken efj script + +* Fri Feb 24 2017 Mat Booth - 1:4.6.3-1 +- Update to Neon.3 +- Upstreamed some changes from RHSCL + +* Wed Feb 08 2017 Roland Grunberg - 1:4.6.2-7 +- Hide the p2 Droplets from the Available Software Sites listing. +- Guard against null URI path in droplet check for Install Wizard Combo. +- Resolves: rhbz#1413778, rhbz#1420225 + +* Wed Jan 25 2017 Roland Grunberg - 1:4.6.2-6 +- Fix bug in p2 Droplet detection of feature groups. + +* Tue Jan 24 2017 Roland Grunberg - 1:4.6.2-5 +- Hide the p2 Droplets from cluttering Install Wizard Combo. +- Resolves: rhbz#1413778 + +* Mon Jan 16 2017 Mat Booth - 1:4.6.2-4 +- Fix last javax.annotation reference + +* Wed Jan 11 2017 Mat Booth - 1:4.6.2-3 +- Drop dep on javax.annotation APIs, these should instead be provided by the JRE + through the system bundle - rhbx#1392150 + +* Tue Jan 10 2017 Mat Booth - 1:4.6.2-2 +- Non-bootstrap build + +* Fri Jan 06 2017 Mat Booth - 1:4.6.2-1 +- Update to Neon.2 +- Bootstrap build due to ant update +- Port to new ant version +- Rebuild for ECF update +- Pull in usage plugin by default + +* Mon Dec 05 2016 Mat Booth - 1:4.6.1-7 +- Rebuild for new xz-java + +* Wed Nov 09 2016 Mat Booth - 1:4.6.1-6 +- Increase minimum memory for Eclipse/devstudio +- Enable nashorn extension for javascript tools/devstudio +- Resolves: rhbz#1380438 + +* Thu Oct 13 2016 Mat Booth - 1:4.6.1-5 +- Fix build with new Glassfish EL packages +- Patch to prefer x11 until wayland support improves + +* Thu Sep 29 2016 Alexander Kurtakov 1:4.6.1-4 +- Bump for rebuild. + +* Thu Sep 15 2016 Dennis Gilmore - 1:4.6.1-3 +- set the bootstap macro to 0 + +* Thu Sep 15 2016 Mat Booth - 1:4.6.1-2 +- Perform non-bootstrap build +- Rebuild for new eclipse-ecf + +* Wed Sep 14 2016 Mat Booth - 1:4.6.1-1 +- Update to Neon.1 release. +- Set qualifiers at source-modification-time instead of build-time, to + eliminate descrepancies between architectures, rhbz#1374938 +- Set bootstrap flag for new primary architecture. + +* Fri Sep 2 2016 Alexander Kurtakov 1:4.6.0-7 +- Rebuild for latest jsch. + +* Thu Aug 18 2016 Roland Grunberg - 1:4.6.0-6 +- Disable droplets being loaded by the reconciler. +- Fix possible NPE in droplet p2.runnable property check. + +* Fri Aug 05 2016 Roland Grunberg - 1:4.6.0-5 +- Improve 'p2.runnable' check in ExtensionLocationArtifactRepository. + +* Wed Aug 03 2016 Roland Grunberg - 1:4.6.0-4 +- Add missing droplets logic to the EngineActivator. +- Restore 'p2.runnable' property for droplets. + +* Wed Jul 13 2016 Roland Grunberg - 1:4.6.0-3 +- Update eclipse-pde-tp-support-droplets.patch to handle source bundles. +- Change PopupDialog from SWT.COLOR_INFO* to SWT.COLOR_LIST*. + +* Thu Jun 16 2016 Alexander Kurtakov 1:4.6.0-2 +- BR rhino and it's buildtime deps to unbreak build. + +* Tue Jun 14 2016 Mat Booth - 1:4.6.0-1 +- Update to Neon release + +* Tue May 10 2016 Mat Booth - 1:4.6.0-0.6.git201605092000 +- Update to latest I-build (M7) + +* Fri Apr 29 2016 Mat Booth - 1:4.6.0-0.5.git201604261105 +- Use webkit 2 by default, webkit 1 can still be used by setting SWT_WEBKIT2=0 + in the environment, rhbz#1303912 +- Ignore SWT.MOZILLA style when creating a browser widget and always use webkit + because we cannot ship xulrunner support, rhbz#1210898 +- Drop unneeded requires from tests package +- Add missing R on eclipse-filesystem to low-level sub-packages + +* Tue Apr 26 2016 Mat Booth - 1:4.6.0-0.4.git201604261105 +- Drop support for PDE building plug-ins in RPMs +- Update to latest Neon I-build +- Drop unnecessary SCL macros + +* Fri Apr 22 2016 Mat Booth - 1:4.6.0-0.3.git201604190800 +- Perform non-bootstrap build + +* Fri Apr 22 2016 Mat Booth - 1:4.6.0-0.2.git201604190800 +- PDE package cannot be noarch due to containing arch-specific source bundles + +* Tue Apr 19 2016 Mat Booth - 1:4.6.0-0.1.git201604190800 +- Update to Neon I-build (bootstrap build) +- Drop upstreamed patches +- Install all plugins with xmvn +- JDT and PDE are now able to be noarch packages + +* Sat Apr 16 2016 Mat Booth - 1:4.5.2-10 +- Rebuild for new ECF + +* Thu Apr 07 2016 Roland Grunberg - 1:4.5.2-9 +- Support reading BundleInfo from p2 Droplets enabled installations. + +* Tue Mar 29 2016 Mat Booth - 1:4.5.2-8 +- Backport patch for ebz#486069, NPE in SWT when running on Wayland +- Eliminate more test failures due to missing resources + +* Fri Mar 25 2016 Mat Booth - 1:4.5.2-7 +- Update e-b snapshot for updated ant dependency + +* Thu Mar 24 2016 Mat Booth - 1:4.5.2-6 +- Fix failure to run tests and backport patch for ebz#489953 in order to fix + some unit tests + +* Wed Mar 16 2016 Mat Booth - 1:4.5.2-5 +- Rebuild for ECF and disable the build of some bundles that are not shipped + +* Fri Mar 04 2016 Mat Booth - 1:4.5.2-4 +- Backport patch for ebz#488226 for incorrect content assist colors, + fixes rhbz#1253651 and rhbz#1196736 +- Fix broken link to mockito in tests + +* Wed Mar 02 2016 Mat Booth - 1:4.5.2-3 +- Fix mis-named Java 1.9 profile + +* Mon Feb 29 2016 Mat Booth - 1:4.5.2-2 +- Fix Lucene patch on F22 + +* Mon Feb 29 2016 Mat Booth - 1:4.5.2-1 +- Update to Mars.2 release +- Update eclipse-build snapshot + +* Mon Feb 29 2016 Michael Simacek - 1:4.5.1-17 +- Rebuild for lucene-5.5.0 + +* Mon Feb 29 2016 Mikolaj Izdebski - 1:4.5.1-16 +- Rebuild for httpcomponents-client 4.5.2 + +* Thu Feb 25 2016 Mat Booth - 1:4.5.1-15 +- Make BRs portable (thanks to Nicolas Lécureuil) + +* Wed Feb 24 2016 Roland Grunberg - 1:4.5.1-14 +- Gracefully handle broken symbolic links on initialization. + +* Wed Feb 17 2016 Mat Booth - 1:4.5.1-13 +- Preserve more test data that we cannot generate from source +- Eliminate unnecessary manual requires from swt package + +* Wed Feb 17 2016 Mat Booth - 1:4.5.1-12 +- Make test framework correctly delete symlinks so that test suites may complete + when e.g. pydev is installed rhbz#1290685 +- Backport patch to fix a webkit crash ebz#487712 + +* Mon Feb 08 2016 Mat Booth - 1:4.5.1-11 +- Fix java declaration view rhbz#1305107 + +* Wed Feb 03 2016 Mat Booth - 1:4.5.1-10 +- Fix symlinks for new lucene +- Use %%global instead of %%define and other macro improvements + +* Wed Feb 03 2016 Fedora Release Engineering - 1:4.5.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jan 21 2016 Alexander Kurtakov 1:4.5.1-8 +- Rebuild for Lucene 5.4.0. + +* Mon Jan 04 2016 Roland Grunberg - 1:4.5.1-7 +- [GTK3.16+] gtk_widget_override_background_color is deprecated. +- [GTK3] Eclipse IDE consumes CPU when idle +- [GTK] Empty repositories view links have white backgrounds +- Resolves: rhbz#1294697, rhbz#1269892 +- ebz#483096, ebz#484696, ebz#484729 + +* Sat Dec 05 2015 Mat Booth - 1:4.5.1-6 +- Fix issues with background colour in some dialogs +- ebz#478962, ebz#479998 +- Rebuild for new eclipse-ecf +- Preserve jars containing runtime stubs used in tests + +* Fri Nov 27 2015 Mat Booth - 1:4.5.1-5 +- Fix some visual glitches when on recent versions of GTK +- ebz#466314, ebz#481122, ebz#466500 + +* Tue Nov 03 2015 Roland Grunberg - 1:4.5.1-4 +- Fix "Workspace chooser won't launch" on Wayland. +- Resolves: rhbz#1277594 + +* Mon Nov 2 2015 Mikolaj Izdebski - 1:4.5.1-3 +- Rebuild for new eclipse-ecf + +* Tue Oct 13 2015 Mat Booth - 1:4.5.1-2 +- Add patch for editor scrolling problem, rhbz#1198217 + +* Wed Sep 30 2015 Mat Booth - 1:4.5.1-1 +- Update to Mars.1 +- Fix JDT javafx and annotation processor tests + +* Wed Sep 16 2015 Mikolaj Izdebski - 1:4.5.0-19 +- Rebuild for new eclipse-ecf + +* Wed Sep 9 2015 Mikolaj Izdebski - 1:4.5.0-18 +- Rebuild for new eclipse-ecf + +* Mon Sep 07 2015 Michael Simacek - 1:4.5.0-17 +- Rebuild for httpcomponents-core-4.4.2 + +* Tue Sep 01 2015 Roland Grunberg - 1:4.5.0-16 +- Modify copy-platform script to support p2 Droplets. + +* Thu Aug 27 2015 Roland Grunberg - 1:4.5.0-15 +- Add support for p2 Droplets. + +* Wed Aug 26 2015 Mat Booth - 1:4.5.0-14 +- Rebuild for new ECF + +* Thu Aug 20 2015 Mat Booth - 1:4.5.0-13 +- Add patch for rhbz#1255150 +- Always use UTC timestamps to prevent rpmdiff failures +- Move eclipse provides away from PDE rhbz#1253898 + +* Tue Aug 11 2015 Mat Booth - 1:4.5.0-12 +- Rebuild for new ECF + +* Thu Aug 6 2015 Alexander Kurtakov 1:4.5.0-11 +- Update to newer e-b snapshot fixing appdata validation. + +* Thu Jul 30 2015 Mat Booth - 1:4.5.0-10 +- Preserve JDT core test data + +* Wed Jul 22 2015 Roland Grunberg - 1:4.5.0-9 +- Fix JDT Feature path for TargetDefinitionPersistenceTests (PDE) +- SimpleConfiguratorUtils should handle base == null for tests +- Locate the compressed platform archive for p2 AbstractReconcilerTest + +* Mon Jul 20 2015 Mat Booth - 1:4.5.0-8 +- Disable tests for Eclipse 2.x style plug-in support that we don't ship + +* Fri Jul 17 2015 Alexander Kurtakov 1:4.5.0-7 +- Less PermSize settings - simply ignored in Java 8. + +* Thu Jul 16 2015 Alexander Kurtakov 1:4.5.0-6 +- Eclipse.ini has no place in swt subpackage. + +* Wed Jul 15 2015 Sopot Cela 1:4.5.0-5 +- Replaced javax.annotation provider from geronimo to glassfish + +* Tue Jul 7 2015 Mikolaj Izdebski - 1:4.5.0-4 +- Add Maven metadata for SWT + +* Thu Jul 02 2015 Sopot Cela 1:4.5.0-3 +- Patch dark theme patch to work on rawhide + +* Wed Jul 01 2015 Mat Booth - 1:4.5.0-2 +- Organise BR/Rs and drop ancient provides/obsoletes on rcp package + +* Fri Jun 26 2015 Alexander Kurtakov 1:4.5.0-1 +- Update to tagged 4.5 release. +- Switch to new e-b snapshot that properly symlinks all new deps. + +* Thu Jun 25 2015 Alexander Kurtakov 1:4.5.0-0.33.git201506012000 +- Rebuild to include all deps of Lucene. + +* Wed Jun 24 2015 Alexander Kurtakov 1:4.5.0-0.32.git201506012000 +- Non-boostrap build. + +* Tue Jun 23 2015 Alexander Kurtakov 1:4.5.0-0.31.git201506012000 +- Rebuild against Lucene 5.x in bootstrap mode. + +* Fri Jun 19 2015 Roland Grunberg - 1:4.5.0-0.30.git201506012000 +- Fix Eclipse test framework. + +* Fri Jun 19 2015 Alexander Kurtakov 1:4.5.0-0.29.git201506012000 +- Rebuild after the F23 mass rebuild to get metadata correct. + +* Mon Jun 15 2015 Mat Booth - 1:4.5.0-0.28.git201506012000 +- Non-bootstrap build + +* Thu Jun 11 2015 Mat Booth - 1:4.5.0-0.27.git201506012000 +- Include p2 directives for non-upstream arches + +* Wed Jun 10 2015 Alexander Kurtakov 1:4.5.0-0.26.git201506012000 +- Add patch for stricter feature packaging. +- Avoid incorrect servlet-api when building on F22 +- Add recommends on e4-importer +- Bootstrap build to get the ball rolling again. + +* Thu Jun 04 2015 Michael Simacek - 1:4.5.0-0.25.git201506012000 +- Rebuild after ecf rebuild + +* Tue Jun 02 2015 Mat Booth - 1:4.5.0-0.24.git201506012000 +- Fix pattern matching for x86/x86_64 arches + +* Tue Jun 02 2015 Mat Booth - 1:4.5.0-0.23.git201506012000 +- Update to latest I-build +- Don't build contributor tools with external deps during bootstrap builds +- Build only for the current architecture +- Rebuild for EMF update + +* Sun May 31 2015 Alexander Kurtakov 1:4.5.0-0.22.git201505272010 +- Rebuild after emf change. + +* Fri May 29 2015 Alexander Kurtakov 1:4.5.0-0.21.git201505272010 +- Fix building without tomcat-servlet again. + +* Fri May 29 2015 Alexander Kurtakov 1:4.5.0-0.20.git201505272010 +- BR gcc not gcc-c++ as there is no cpp sources built. + +* Thu May 28 2015 Alexander Kurtakov 1:4.5.0-0.19.git201505272010 +- Update to latest I-build +- Require latest egit for the releng tools. + +* Tue May 19 2015 Alexander Kurtakov 1:4.5.0-0.18.git201505172000 +- Update to latest I-build. +- Drop unneeded env variable export. + +* Wed May 13 2015 Mat Booth - 1:4.5.0-0.17.git201505122100 +- Rebuild for ECF 3.10.0 +- Update to latest I-build + +* Tue May 05 2015 Mat Booth - 1:4.5.0-0.16.git201505042000 +- Update to latest I-build to fix bundle dep cycle in PDE builds +- Add test framework to contributor tools subpackage +- Update eclipse-build snapshot to symlink and require xz-java + +* Wed Apr 29 2015 Mat Booth - 1:4.5.0-0.15.git201504280100 +- Contibutor-tools subpackage should be archful due to native methods + +* Wed Apr 22 2015 Mat Booth - 1:4.5.0-0.14.git201504280100 +- Rebuilt to eliminate optional dependencies of jxpath +- Update to latest I-build + +* Wed Apr 08 2015 Mat Booth - 1:4.5.0-0.13.git201504081100 +- Update to latest I-build +- Update eclipse-build snapshot +- Simplify installation of PDE build scripts +- Drop upstreamed hamcrest patch + +* Wed Apr 01 2015 Mat Booth - 1:4.5.0-0.12.git201503310800 +- Organise patches + +* Wed Apr 01 2015 Mat Booth - 1:4.5.0-0.11.git201503310800 +- Begin using mvn_install for installing dropins +- This allows us to make sub-packages noarch + +* Tue Mar 31 2015 Mat Booth - 1:4.5.0-0.10.git201503310800 +- Update for latest I-build +- New sub-package for contributor-tools +- Unbundle osgi.annotations compile time dep +- Rebuild for new eclipse-ecf/httpcomponents +- Revert "Use better AppData screenshots" this is fixed upstream +- Update eclipse-build snapshot + +* Tue Mar 31 2015 Mikolaj Izdebski - 1:4.5.0-0.9.git201503172000 +- Rebuild for eclipse-ecf update + +* Mon Mar 30 2015 Richard Hughes - 1:4.5.0-0.8.git201503172000 +- Use better AppData screenshots + +* Wed Mar 25 2015 Michael Simacek - 1:4.5.0-0.7.git201503172000 +- Rebuild for jetty update + +* Thu Mar 19 2015 Mikolaj Izdebski - 1:4.5.0-0.6.git201503172000 +- Rebuild for eclipse-ecf update + +* Tue Mar 17 2015 Mat Booth - 1:4.5.0-0.5.git201503172000 +- Update to latest I-build + +* Wed Mar 04 2015 Mat Booth - 1:4.5.0-0.4.git201503030800 +- Update to latest I-build +- JDT requires only hamcrest-core +- Rebuild for SR2 release of EMF + +* Wed Feb 25 2015 Mat Booth - 1:4.5.0-0.3.git201502240800 +- Update to latest I-build +- Require jetty 9.2.9 +- Fix arm-build + +* Wed Feb 18 2015 Mat Booth - 1:4.5.0-0.2.git201502170800 +- Update to latest I-build +- Unbundle third party libs from tests subpackage rhbz#1150185 +- Rebuild for new eclipse-ecf/httpcomponents + +* Fri Jan 30 2015 Mat Booth - 1:4.5.0-0.1.git201502100800 +- Update to latest 4.5.0 I-build +- Drop upstreamed jetty9/servlet and workspace picker patches +- Drop upstreamed patches for bug 903537 and bug 444143 +- Update eclipse-build snapshot for ant dependency +- Ship missing features used by some other projects' target platform +- Build with mvn_build macro +- Some spec file clean-up + +* Fri Jan 23 2015 Michael Simacek - 1:4.4.1-17 +- Rebuild against new jetty + +* Mon Jan 19 2015 Mat Booth - 1:4.4.1-16 +- Rebuild for new eclipse-ecf/httpcomponents +- Add patch to explicitly require hamcrest bundle from tests + +* Mon Jan 12 2015 Alexander Kurtakov 1:4.4.1-15 +- Require newer batik with fixed obsoletes. + +* Wed Dec 10 2014 Alexander Kurtakov 1:4.4.1-14 +- Rebuild for new eclipse-ecf. + +* Tue Dec 9 2014 Alexander Kurtakov 1:4.4.1-13 +- Move to slimmer batik-css BR/R. + +* Sat Nov 29 2014 Roland Grunberg - 1:4.4.1-12 +- Make changes necessary for Tycho 0.22.0. + +* Thu Nov 27 2014 Mat Booth - 1:4.4.1-11 +- Update eclipse-build snapshot +- Rebuild for ECF symlink changes + +* Wed Nov 19 2014 Mat Booth - 1:4.4.1-10 +- Update eclipse-build snapshot +- Rebuild for EMF and icu4j symlink changes +- Don't own dirs owned by eclipse-filesystem + +* Tue Nov 18 2014 Mat Booth - 1:4.4.1-9 +- Update dep on icu4j/ECF + +* Mon Nov 17 2014 Mat Booth - 1:4.4.1-8 +- Increase max heap size to 1024m + - But don't do this as a patch, it doesn't work +- Fix build ID to always be lexigraphically higher that upstream + +* Wed Nov 12 2014 Mat Booth - 1:4.4.1-7 +- Backport patch to make workspace selection dialog visible in the task manager +- Tidy up SWT symlinks + +* Wed Oct 29 2014 Roland Grunberg - 1:4.4.1-6 +- Change external plugin references to requirements. +- List external plugin references in the top-level category. + +* Fri Oct 24 2014 Alexander Kurtakov 1:4.4.1-5 +- Rebuild for latest lucene. + +* Mon Oct 20 2014 Roland Grunberg - 1:4.4.1-4 +- Support loading symlinked bundles when location changes. + +* Wed Oct 01 2014 Mat Booth - 1:4.4.1-3 +- Require latest EMF + +* Wed Oct 01 2014 Mat Booth - 1:4.4.1-2 +- Fix s390 launcher build + +* Fri Sep 26 2014 Mat Booth - 1:4.4.1-1 +- Update to Luna SR1 +- Drop upstreamed patch and fix permissions on appdata files + +* Tue Sep 16 2014 Alexander Kurtakov 1:4.4.0-19 +- Fix for autocomplete selection color. +- Rebuild for latest jetty. + +* Tue Sep 09 2014 Mat Booth - 1:4.4.0-18 +- Symlink more equinox and some core jars into javadir +- Enables tycho to unbundle it's eclipse platform jars +- Update dep on lucene + +* Sat Sep 6 2014 Alexander Kurtakov 1:4.4.0-17 +- Rebuild for lucene update. + +* Thu Aug 28 2014 Roland Grunberg - 1:4.4.0-16 +- Non-bootstrap build. + +* Wed Aug 27 2014 Roland Grunberg - 1:4.4.0-15 +- Build Eclipse bootstrapped. + +* Tue Aug 26 2014 Sami Wagiaalla - 1:4.4.0-15 +- Build agianst webkitgtk4. + +* Tue Aug 19 2014 Mat Booth - 1:4.4.0-14 +- Rebuild against new ECF + +* Mon Aug 18 2014 Mat Booth - 1:4.4.0-13 +- Drop custom buildId, to keep it lexographically greater than upstream's + +* Sat Aug 16 2014 Fedora Release Engineering - 1:4.4.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Mon Jul 28 2014 Sami Wagiaalla 1:4.4.0-11 +- Add patch for webkit2 support. + +* Mon Jul 28 2014 Roland Grunberg - 1:4.4.0-10 +- Provide org.eclipse.tycho:org.eclipse.osgi.compatibility.state. + +* Mon Jul 21 2014 Alexander Kurtakov 1:4.4.0-9 +- Rebuild for new ecf and asm. + +* Wed Jul 16 2014 Mat Booth - 1:4.4.0-8 +- Update eclipse-build snapshot +- Tighten up deps on asm + +* Tue Jul 15 2014 Mat Booth - 1:4.4.0-7 +- Add appstream addon metadata for JDT and PDE plugins +- Only use GTK3 by default on F22 or newer, rhbz1118317 + +* Tue Jul 15 2014 Mat Booth - 1:4.4.0-6 +- Backport fix for eclipse bz438992 +- Only assemble products for current running target environment +- Tidy up some unnecessary SCL bits + +* Tue Jul 08 2014 Mat Booth - 1:4.4.0-5 +- Make GTK3 the default SWT implementation in eclipse.ini + +* Wed Jul 02 2014 Mat Booth - 1:4.4.0-4 +- Package the equinox.p2.discovery feature, obsolete the separate package +- Update e-b snapshot +- BR/R: gogo-command >= 0.14 +- Symlink mockito to system jar in testing package + +* Fri Jun 27 2014 Roland Grunberg - 1:4.4.0-3 +- Fix sed delimeter when dealing with paths. + +* Thu Jun 26 2014 Roland Grunberg - 1:4.4.0-2 +- Update eclipse-build with improvements to bundle testing. + +* Wed Jun 25 2014 Mat Booth - 1:4.4.0-1 +- Update to final Luna release +- Rebuild against newer dependencies + +* Tue Jun 24 2014 Alexander Kurtakov 1:4.4.0-0.31.git201406042000 +- Non bootstrap build. + +* Tue Jun 24 2014 Alexander Kurtakov 1:4.4.0-0.30.git201406042000 +- Bootstrap build for aarch64. + +* Fri Jun 13 2014 Michael Simacek - 1:4.4.0-0.29.git201406042000 +- Rebuild against new jetty + +* Tue Jun 10 2014 Alexander Kurtakov 1:4.4.0-0.28.git201406042000 +- Drop jdt mvn depmaps. + +* Thu Jun 05 2014 Mat Booth - 1:4.4.0-0.27.git201406042000 +- Remove pre-built launcher binaries +- Remove last uses of tomcat + +* Tue Jun 03 2014 Mat Booth - 1:4.4.0-0.26.git201406022000 +- Update to latest I-build + +* Fri May 30 2014 Michael Simacek - 1:4.4.0-0.25.git201405252000 +- Rebuild against new jetty + +* Tue May 27 2014 Alexander Kurtakov 1:4.4.0-0.24.git201405252000 +- Pass eclipse.javadoc as param to mvn call to fix javadoc generation. + +* Tue May 27 2014 Alexander Kurtakov 1:4.4.0-0.23.git201405252000 +- Update to latest I-build. + +* Fri May 23 2014 Alexander Kurtakov 1:4.4.0-0.22.git201405112000 +- Rebuild for new lucene/junit metadata. + +* Wed May 21 2014 Alexander Kurtakov 1:4.4.0-0.21.git201405112000 +- Drop tomcat BR/Rs. + +* Wed May 21 2014 Alexander Kurtakov 1:4.4.0-0.20.git201405112000 +- Drop cglib dep. +- Apply jetty 9 patch unconditionally. + +* Mon May 19 2014 Mat Booth - 1:4.4.0-0.19.git201405112000 +- Drop unnecessary BRs +- Update e-b snapshot for new felix-gogo-* jar locations + +* Mon May 12 2014 Alexander Kurtakov 1:4.4.0-0.18.git201405112000 +- Update to latest I-build. +- Move pre-luna changelog to separate file. + +* Wed May 07 2014 Mat Booth - 1:4.4.0-0.17.git201405062000 +- Update to latest I-build of Luna 4.4.0 +- New e-b snapshot for updated gnome appdata +- Rebuilt for new dependency versions. + +* Thu May 01 2014 Mat Booth - 1:4.4.0-0.16.git201405010200 +- Update to latest I-build of Luna 4.4.0 + +* Mon Apr 28 2014 Mat Booth - 1:4.4.0-0.15.git201404280800 +- Don't mirror emf and ecf into the final p2 repository + +* Mon Apr 28 2014 Mat Booth - 1:4.4.0-0.14.git201404280800 +- Update to latest I-build of Luna 4.4.0 + +* Thu Apr 24 2014 Mat Booth - 1:4.4.0-0.13.git201404220800 +- Drop the use of custom jdtpde repository build from e-b +- Don't use a custom product ID +- Add BR on mockito +- Fix pixmaps directory ownership + +* Tue Apr 22 2014 Mat Booth - 1:4.4.0-0.12.git201404220800 +- Update to latest I-build of Luna 4.4.0 +- Enable Java 8 specific bundles +- Rebuild for updated lucene dependency + +* Tue Apr 15 2014 Mat Booth - 1:4.4.0-0.11.git201404150800 +- Update to latest I-build of Luna 4.4.0 +- Fix missing copy resource step on ppc64le +- Don't build bundles that are only applicable on non-linux platforms + +* Thu Apr 10 2014 Mat Booth - 1:4.4.0-0.10.git201404081645 +- Drop unnecessary BR on GConf2-devel +- Drop unneeded patch: fix-swt-build-in-rawhide + +* Thu Apr 10 2014 Mat Booth - 1:4.4.0-0.9.git201404081645 +- Make globbing work on arches that don't have platform specific fragments. + +* Tue Apr 08 2014 Mat Booth - 1:4.4.0-0.8.git201404081645 +- Update to latest I-build of Luna 4.4.0 +- Don't unnecessarily create platform specific fragments for o.e.core.net and + o.e.core.filesystem. +- Accomodate for ppc64le architecture. +- Drop upstreamed patch: objectweb-asm + +* Thu Apr 03 2014 Mat Booth - 1:4.4.0-0.7.git201404011500 +- Fix symlinking junit when it is a directory. + +* Thu Apr 03 2014 Mat Booth - 1:4.4.0-0.6.git201404011500 +- Non-bootstrap build. + +* Wed Apr 02 2014 Mat Booth - 1:4.4.0-0.5.git201404011500 +- Add patch for org.ojectweb.asm -> org.ojectweb.asm.all + +* Wed Apr 02 2014 Mat Booth - 1:4.4.0-0.4.git201404011500 +- Move secondary-arch fragment generation into e-b. + +* Wed Apr 02 2014 Mat Booth - 1:4.4.0-0.3.git201404011500 +- Update eclipse-build snapshot + +* Tue Apr 01 2014 Mat Booth - 1:4.4.0-0.2.git201404011500 +- Update to latest I-build of Luna 4.4.0 +- Require objectweb-asm >= 5.0.1 + +* Mon Mar 24 2014 Mat Booth - 1:4.4.0-0.1.M6 +- Update to M6 pre-release of Luna 4.4.0 +- Bootstrap build +- Drop upstreamed patches: do-not-run-as-root, bug-408505, + bug-404448, osgi-unpack-sources +- Add patch to use mockito-core 1.9 + +* Sat Mar 22 2014 Mat Booth - 1:4.3.2-5 +- Rebuild for new version of ICU. + +* Thu Mar 20 2014 Mat Booth - 1:4.3.2-4 +- Rebuild p2 metadata. + +* Wed Mar 19 2014 Mat Booth - 1:4.3.2-3 +- Accomodate for recent lucene package split. + +* Tue Mar 18 2014 Mat Booth - 1:4.3.2-2 +- Rebuild p2 metadata. + +* Wed Mar 12 2014 Mat Booth - 1:4.3.2-1 +- Update to 4.3.2 + +* Wed Mar 12 2014 Roland Grunberg - 1:4.3.1-25 +- Non bootstrap build. + +* Mon Mar 10 2014 Roland Grunberg - 1:4.3.1-24.2 +- Fix API issues with Lucene 4. +- Remove old Tomcat Servlet API bundle. +- Use Glassfish EL instead of Tomcat EL. + +* Thu Mar 06 2014 Roland Grunberg - 1:4.3.1-24.1 +- Update to Lucene 4. +- Update to Glassfish JSP 2.3. +- Enable bootstrap build to work around broken UA (Help) bundles. + +* Thu Mar 6 2014 Alexander Kurtakov 1:4.3.1-24 +- New e-b snapshot adapted to lucene changes. + +* Tue Mar 04 2014 Michael Simacek - 1:4.3.1-23 +- Rebuild for new jetty and httpcomponents-client + +* Mon Mar 3 2014 Alexander Kurtakov 1:4.3.1-22 +- Rebuild for new jetty. + +* Wed Feb 26 2014 Alexander Kurtakov 1:4.3.1-21 +- Non bootstrap build. + +* Tue Feb 25 2014 Alexander Kurtakov 1:4.3.1-20.1 +- Use new e-b snapshot that is adapted to ant packaging changes. +- Enable bootstrap build to work around broken runtime Eclipse. +- Make changes to deal with batik update (1.6.0 to 1.7.0). + +* Fri Feb 21 2014 Alexander Kurtakov 1:4.3.1-20 +- Require java-headless in equinox-osgi. + +* Mon Feb 17 2014 Alexander Kurtakov 1:4.3.1-19 +- Rebuild for new Jetty version. + +* Thu Jan 30 2014 Sami Wagiaalla - 1:4.3.1-18 +- Increase JVM stack size for Maven. Fixes bz 1059816. + +* Fri Jan 24 2014 Roland Grunberg - 1:4.3.1-18 +- Re-introduce and update bootstrapping capability. +- Add support for aarch64. + +* Fri Jan 17 2014 Alexander Kurtakov 1:4.3.1-17 +- Rebuild for Jetty 9.1.1. + +* Mon Jan 6 2014 Alexander Kurtakov 1:4.3.1-16 +- Rebuild for glassfish-jsp update. +- Add patch implementing servlet 3.1 methods. +- Disable o.e.ua.tests due to servlet 3.1 incompatibilities. + +* Mon Dec 16 2013 Roland Grunberg - 1:4.3.1-15 +- Minor specfile cleanup. +- Merge Jetty 9 & Jetty 9.1 patches. +- Remove BuildRequires on eclipse-{egit,jgit}. + +* Fri Dec 13 2013 Alexander Kurtakov 1:4.3.1-14 +- Reenable API generation. + +* Thu Dec 12 2013 Roland Grunberg - 1:4.3.1-13 +- Rebuild against Jetty 9.1.0. (Bug 1036888) +- Temporarily disable API Generation. + +* Wed Dec 4 2013 Alexander Kurtakov 1:4.3.1-12 +- Move pre-kepler changelog to separate file. +- Fix rpmlint warnings. +- Drop old provides/obsoletes. +- Give up on linking javadoc against local java-javadoc. +- Adapt to objectweb-asm3 rename. + +* Mon Nov 4 2013 Krzysztof Daniel 1:4.3.1-11 +- Fix the app data. + +* Mon Oct 28 2013 Krzysztof Daniel 1:4.3.1-10 +- Ignore find errors. + +* Fri Oct 25 2013 Krzysztof Daniel 1:4.3.1-9 +- Do mark *.so as executable. + +* Fri Oct 25 2013 Krzysztof Daniel 1:4.3.1-8 +- Mark *.so as executable. + +* Fri Oct 18 2013 Krzysztof Daniel 1:4.3.1-7 +- Add gnome app data. + +* Wed Oct 16 2013 Krzysztof Daniel 1:4.3.1-6 +- Fix the arm build. + +* Mon Oct 14 2013 Krzysztof Daniel 1:4.3.1-5 +- Build right launcher version. + +* Fri Oct 11 2013 Krzysztof Daniel 1:4.3.1-4 +- Rebuild to pick latest deps. + +* Thu Oct 10 2013 Roland Grunberg - 1:4.3.1-3 +- Move testbundle-to-eclipse-test into eclipse-build upstream. + +* Thu Oct 10 2013 Roland Grunberg - 1:4.3.1-2 +- Add testbundle-to-eclipse-test script. + +* Mon Sep 30 2013 Krzysztof Daniel 1:4.3.1-1 +- Update to 4.3.1. + +* Thu Aug 29 2013 Alexander Kurtakov 1:4.3.0-13 +- Let tests depend on easymock3. + +* Tue Aug 27 2013 Roland Grunberg - 1:4.3.0-12 +- Update symlinks for glassfish-jsp-api and felix-gogo-runtime jars. + +* Thu Aug 22 2013 Roland Grunberg - 1:4.3.0-11.1 +- Bump release. + +* Mon Aug 19 2013 Alexander Kurtakov 1:4.3.0-11 +- Bump release. + +* Fri Aug 2 2013 Krzysztof Daniel 1:4.3.0-10 +- Do really fix the arm build. +- Add buildid in the about dialog. + +* Thu Aug 1 2013 Krzysztof Daniel 1:4.3.0-9 +- An attempt to fix the arm build. + +* Wed Jul 31 2013 Krzysztof Daniel 1:4.3.0-8 +- Improve the build process. + +* Mon Jul 29 2013 Krzysztof Daniel 1:4.3.0-7 +- 404448 [GTK3] Images of disabled buttons are not grayed out + +* Fri Jul 26 2013 Krzysztof Daniel 1:4.3.0-6 +- Include latest changes in javapackages. + +* Tue Jul 23 2013 Krzysztof Daniel 1:4.3.0-5 +- Take ownerhsip of /usr/share/eclipse dir (RHBZ#986160). +- Include fix for Eclipse bug 408505. +- Added rpmlint builder to the fedora package. + +* Mon Jul 8 2013 Krzysztof Daniel 1:4.3.0-4 +- Rhbz 981905 - Use xz to compress tarball +- Fix the fetch script. +- Rebuild to pick latest deps. + +* Mon Jun 24 2013 Krzysztof Daniel 1:4.3.0-3 +- Consume Kepler EMF. + +* Mon Jun 17 2013 Krzysztof Daniel 1:4.3.0-1 +- Kepler release. + +* Wed Jun 12 2013 Krzysztof Daniel 1:4.3.0-0.64.git84cba7 +- Install JDT back for the arm build. + +* Tue Jun 11 2013 Krzysztof Daniel 1:4.3.0-0.63.git84cba7 +- Remove the 'remind me later' option from the migration wizard. + +* Mon Jun 10 2013 Krzysztof Daniel 1:4.3.0-0.62.git84cba7 +- Update to I20130605-2000. + +* Thu Jun 6 2013 Krzysztof Daniel 1:4.3.0-0.60.git7bf397 +- Fix the dropins reconciliation. + +* Tue Jun 4 2013 Alexander Kurtakov 1:4.3.0-0.59.git7bf397 +- Fix bogus dates and SWT description. + +* Tue Jun 4 2013 Krzysztof Daniel 1:4.3.0-0.59.git7bf397 +- Remove swt jar from plugins as it may break reconcilation. + +* Thu May 30 2013 Krzysztof Daniel 1:4.3.0-0.58.git7bf397 +- Update to daily build. + +* Wed May 29 2013 Krzysztof Daniel 1:4.3.0-0.57.gitfde729 +- Don't guess previous configuration on first install. +- Ignore version when calculating user Eclipse folder. + +* Wed May 29 2013 Krzysztof Daniel 1:4.3.0-0.56.gitfde729 +- Update to RC2. + +* Thu May 23 2013 Krzysztof Daniel 1:4.3.0-0.55.gitbeff8a2 +- Fix the testing.properties location. + +* Thu May 23 2013 Krzysztof Daniel 1:4.3.0-0.54.gitbeff8a2 +- Update to RC1. + +* Mon May 20 2013 Krzysztof Daniel 1:4.3.0-0.53.git4bccf2 +- Rebuild with latest dependencies. + +* Sun May 19 2013 Krzysztof Daniel 1:4.3.0-0.52.git4bccf2 +- Really fix the version of jdt. + +* Sat May 18 2013 Krzysztof Daniel 1:4.3.0-0.51.git4bccf2 +- Install jdt jar even for local swt local build. + +* Sat May 18 2013 Krzysztof Daniel 1:4.3.0-0.50.git4bccf2 +- Update version of jdt. + +* Fri May 17 2013 Krzysztof Daniel 1:4.3.0-0.49.git4bccf2 +- Install JDT pom manually for the purpose of secondary archs. + +* Thu May 16 2013 Krzysztof Daniel 1:4.3.0-0.48.git4bccf2 +- Incorporate patch for dropins issue (Bug 408138) +- Revert previous change. + +* Wed May 15 2013 Krzysztof Daniel 1:4.3.0-0.47.git4bccf2 +- Revert patches for startup issues as they cause more harm than good. + +* Tue May 14 2013 Krzysztof Daniel 1:4.3.0-0.46.git4bccf2 +- Rebuild to pick up icu4j 50.1.1. + +* Mon May 13 2013 Krzysztof Daniel 1:4.3.0-0.45.git4bccf2 +- Upload sources. + +* Mon May 13 2013 Krzysztof Daniel 1:4.3.0-0.44.git4bccf2 +- Fix the build on secondary platforms. +- Update to latest upstream. + +* Mon May 13 2013 Alexander Kurtakov 1:4.3.0-0.43 +- Fix the eclipse-rcp obsolete version. + +* Tue May 7 2013 Krzysztof Daniel 1:4.3.0-0.42 +- Fix tests. + +* Thu May 02 2013 Krzysztof Daniel 1:4.3.0-0.41 +- Update to latest upstream. + +* Tue Apr 23 2013 Krzysztof Daniel 1:4.3.0-0.40 +- Fix generating tests summary. +- RHBZ 955214 Failure to properly start bundle on first run. +- Eclipse Bug 406419 - Don't use -XX:-UseLoopPredicate + +* Mon Apr 22 2013 Krzysztof Daniel 1:4.3.0-0.39 +- Include a fix for a crash in libsoup/webkitgtk-2.x + +* Fri Apr 12 2013 Krzysztof Daniel 1:4.3.0-0.38 +- Generate tests summary after running tests. + +* Thu Apr 11 2013 Krzysztof Daniel 1:4.3.0-0.37 +- Rebuild to include latest deps. + +* Tue Apr 9 2013 Krzysztof Daniel 1:4.3.0-0.36 +- Remove dependencies to httpclient v3 from pom files. +- Resolved build problems caused by upstream changes. + +* Mon Apr 8 2013 Krzysztof Daniel 1:4.3.0-0.35 +- Add missing files to the commit. + +* Mon Apr 8 2013 Krzysztof Daniel 1:4.3.0-0.34 +- Fix the source build errors. + +* Mon Apr 8 2013 Krzysztof Daniel 1:4.3.0-0.33 +- Rebuild with ecf not requring commons logging 1.1.1. + +* Mon Apr 8 2013 Krzysztof Daniel 1:4.3.0-0.32 +- Drop dependency to ecf httpclient v3. +- Rebuild with new version of ecf. + +* Mon Apr 8 2013 Krzysztof Daniel 1:4.3.0-0.31 +- Drop org.eclipse.releng.* from build. +- Drop p2 discovery tests from build. +- Fix running tests. + +* Mon Apr 8 2013 Krzysztof Daniel 1:4.3.0-0.30 +- Remove unused bootstrap flag. + +* Thu Apr 4 2013 Krzysztof Daniel 1:4.3.0-0.29 +- Install icons for sclized version. +- Update to latest upstream. + +* Thu Mar 21 2013 Krzysztof Daniel 1:4.3.0-0.28.git38f1df9 +- Properly symlink ant dependencies. + +* Mon Mar 18 2013 Krzysztof Daniel 1:4.3.0-0.27.git38f1df9 +- Build against jetty 8 in sclized version. + +* Mon Mar 18 2013 Krzysztof Daniel 1:4.3.0-0.26.git38f1df9 +- RHBZ#902842 calls mvn-rpmbuild with -Dmaven.local.mode=true + +* Thu Mar 14 2013 Krzysztof Daniel 1:4.3.0-0.25.git38f1df9 +- Update to latest upstream. + +* Tue Mar 5 2013 Krzysztof Daniel 1:4.3.0-0.24.git3fd9eca +- Add depmap for org.eclipse.jetty.orbit +- Resolves: rhbz#917619 + +* Tue Mar 5 2013 Krzysztof Daniel 1:4.3.0-0.23.git3fd9eca +- Add BR/R to tomcat-el-2.2-api. + +* Fri Mar 1 2013 Krzysztof Daniel 1:4.3.0-0.22.git3fd9eca +- Use org.w3c.dom version provided by JVM in all ui bundles. + +* Thu Feb 28 2013 Krzysztof Daniel 1:4.3.0-0.21.git3fd9eca +- Enable support for jetty 9. +- Improve the swt symlink to work well when sclized. + +* Wed Feb 27 2013 Krzysztof Daniel 1:4.3.0-0.20.git3fd9eca +- Remove easymock and junit duplications from tests. + +* Wed Feb 27 2013 Krzysztof Daniel 1:4.3.0-0.19.git3fd9eca +- Fix the /usr/lib/java/swt.jar symlink. + +* Wed Feb 27 2013 Krzysztof Daniel 1:4.3.0-0.18.git3fd9eca +- Add support for jetty 9 (still disabled). + +* Fri Feb 22 2013 Krzysztof Daniel 1:4.3.0-0.17.git3fd9eca +- Add BR to xml-maven-plugin. + +* Wed Feb 20 2013 Krzysztof Daniel 1:4.3.0-0.16.git3fd9eca +- Update to latest upstream version. + +* Wed Feb 20 2013 Krzysztof Daniel 1:4.3.0-0.15.git201301281400 +- Use EMF features from eclipse-emf-core. + +* Tue Feb 19 2013 Krzysztof Daniel 1:4.3.0-0.14.git201301281400 +- Add missing patch. + +* Tue Feb 19 2013 Krzysztof Daniel 1:4.3.0-0.13.git201301281400 +- RHBZ#912664 - eclipse-swt should put swt.jar into /usr/lib/java even on 64 bit systems. +- RHBZ#903537 - [abrt] java-1.7.0-openjdk-1.7.0.9-2.3.4.fc18: gtk_widget_real_map (SIGABRT) + +* Tue Feb 12 2013 Krzysztof Daniel 1:4.3.0-0.12.git201301281400 +- Build support for GTK2 and GTK3 together. + +* Tue Feb 12 2013 Krzysztof Daniel 1:4.3.0-0.11.git201301281400 +- Ability to use sclized icu4j. + +* Mon Feb 11 2013 Krzysztof Daniel 1:4.3.0-0.10.git201301281400 +- Yet another rebuild with latest icu4j. + +* Sun Feb 10 2013 Krzysztof Daniel 1:4.3.0-0.9.git201301281400 +- Another rebuild with latest icu4j. + +* Fri Feb 8 2013 Krzysztof Daniel 1:4.3.0-0.8.git201301281400 +- Rebuild with latest icu4j. + +* Fri Feb 8 2013 Krzysztof Daniel 1:4.3.0-0.7.git201301281400 +- Do fix the scl_root macro redefinition. + +* Thu Feb 7 2013 Krzysztof Daniel 1:4.3.0-0.6.git201301281400 +- Fix the scl_root macro. + +* Thu Feb 7 2013 Krzysztof Daniel 1:4.3.0-0.5.git201301281400 +- Add BR to gtk3. + +* Thu Feb 7 2013 Krzysztof Daniel 1:4.3.0-0.4.git201301281400 +- Upload proper sources. +- Export GTK_VERSION=3.0 during build. + +* Wed Feb 6 2013 Krzysztof Daniel 1:4.3.0-0.3.git201301281400 +- SCLize the spec. +- Enable SWT GTK3 support. +- Fix SWT build with rawhide. + +* Tue Feb 5 2013 Krzysztof Daniel 1:4.3.0-0.2.git201301281400 +- Fixed the generated eclipse.ini +- Fixed the content of generated swt.jar. +- Use maven macro to track poms in %%files section. + +* Thu Jan 31 2013 Krzysztof Daniel 1:4.3.0-0.1.git20121217 +- Update to Kepler. + +* Fri Jan 25 2013 Krzysztof Daniel 1:4.2.2-0.5.git20121217 +- RHBZ#832053: Ship SWT and other native plugins as folders. + +* Thu Jan 17 2013 Krzysztof Daniel 1:4.2.2-0.4.git20121217 +- RHBZ#893774: file shipped twice in eclipse-platform and eclipse-equinox-osgi + +* Sat Jan 5 2013 Krzysztof Daniel 1:4.2.2-0.3.git20121217 +- Fix missing about files on arm and ppc. + +* Wed Jan 2 2013 Krzysztof Daniel 1:4.2.2-0.2.git20121217 +- Enable bootstrap (for the purpose of arm build). +- Fix the launcher build for arm. +- Fix the s390 build issue. + +* Fri Dec 21 2012 Krzysztof Daniel 1:4.2.2-0.1.git20121217 +- Update to pre SR2. + +* Fri Dec 14 2012 Krzysztof Daniel 1:4.2.1-22 +- Enable javadoc build. + +* Mon Nov 26 2012 Krzysztof Daniel 1:4.2.1-21 +- Remove javax.xml removal patch declaration. + +* Fri Nov 23 2012 Krzysztof Daniel 1:4.2.1-19 +- Excluded ResolverState from JIT to fix arm build. + +* Thu Nov 22 2012 Krzysztof Daniel 1:4.2.1-18 +- Get rid off javax.xml. +- Fix building launcher on arm. +- Fix RHBZ #878210 + +* Mon Nov 12 2012 Krzysztof Daniel 1:4.2.1-17 +- Don't package non-existing fragments on s390, s390x. +- Add BR to GConf-2-devel + +* Thu Nov 8 2012 Krzysztof Daniel 1:4.2.1-16 +- Added debug symbols to SWT. +- Restored the debug package. +- Removed the debug flag from the build. + +* Wed Nov 7 2012 Krzysztof Daniel 1:4.2.1-15 +- Simplify initial repo creation. + +* Tue Nov 6 2012 Krzysztof Daniel 1:4.2.1-14 +- Export missing java home. + +* Mon Nov 5 2012 Krzysztof Daniel 1:4.2.1-13 +- Reduce the memory available for Tycho build. +- Reduce the build time. +- Use the upstream help generation patch. + +* Wed Oct 31 2012 Krzysztof Daniel 1:4.2.1-12 +- Remove the reference to org.apache.jasper (replaced by glassfish) + +* Wed Oct 31 2012 Alexander Kurtakov 1:4.2.1-11 +- Small cleanups. +- Bump release to be bigger than F-18. + +* Wed Oct 24 2012 Krzysztof Daniel 1:4.2.1-9 +- Make the removal of the icon more error prone. + +* Tue Oct 23 2012 Krzysztof Daniel 1:4.2.1-8 +- Remove a hack for building executable. + +* Tue Oct 23 2012 Krzysztof Daniel 1:4.2.1-7 +- Add profiles in the equinox executable for ppc and arm. + +* Mon Oct 22 2012 Krzysztof Daniel 1:4.2.1-6 +- Moved launcher version change after secondary fragments creation. +- Created some directories when creating secondary fragments. + +* Fri Oct 19 2012 Krzysztof Daniel 1:4.2.1-5 +- Removed patch for droping user installed changes. +- Moved Provides:osgi(system.bundle) to eclipse-equinox-osgi subpackage. +- Removed platform dependency to eclipse-rcp. +- Fixed building of core.net on secondary arches. + +* Fri Oct 19 2012 Krzysztof Daniel 1:4.2.1-4 +- Use glassfish-jsp-api instead of tomcat-jsp-api. + +* Fri Oct 5 2012 Krzysztof Daniel 1:4.2.1-3 +- Bootstrap build. +- Support for secondary architectures. + +* Tue Oct 2 2012 Krzysztof Daniel 1:4.2.1-2 +- Bump emf version to 2.8.1. + +* Mon Oct 1 2012 Krzysztof Daniel 1:4.2.1-1 +- Rebuild with latest emf 2.8.1. + +* Fri Sep 28 2012 Krzysztof Daniel 1:4.2.1-0.4 +- 861037: Eclipse does not start in rawhide + +* Thu Sep 20 2012 Krzysztof Daniel 1:4.2.1-0.3 +- Remove build artifacts from P2 files. +- Fix native gnome-proxy build. + +* Wed Sep 19 2012 Krzysztof Daniel 1:4.2.1-0.2 +- Build the jdt.debug.launching internal jar. + +* Wed Sep 19 2012 Krzysztof Daniel 1:4.2.1-0.1 +- Update to SR1 RC4. + +* Mon Sep 17 2012 Krzysztof Daniel 1:4.2.0-19 +- Add BR/R tomcat-jsp-2.2-api tp platform. + +* Mon Sep 10 2012 Krzysztof Daniel 1:4.2.0-18 +- Explicit dependency to jdt in platform. + +* Fri Sep 7 2012 Krzysztof Daniel 1:4.2.0-17 +- Yet another version of the previous patch. + +* Fri Sep 7 2012 Krzysztof Daniel 1:4.2.0-16 +- Remove remaining mina-core dependency. + +* Fri Sep 7 2012 Krzysztof Daniel 1:4.2.0-15 +- Use existing software group. +- Add BR to eclipse-pde +- Removed dependency on tomcat6 +- Removed BR GConf2-devel. +- Removed BR apache-sshd. +- Removed BR/R tomcat-lib. +- jetty BR/R transformed to osgi() style. +- Excluded org.eclipse.equinox.console.jaas from builds. + +* Wed Sep 5 2012 Krzysztof Daniel 1:4.2.0-14 +- Native network support added. +- Native filesystem support added. +- Added test package. +- Generated help contents. + +* Fri Aug 24 2012 Krzysztof Daniel 1:4.2.0-12 +- Fix eclipse-pdebuild script to have proper path to pde bundle. +- Ensure there are right R dependencies between subpackages. +- Overall spec improvements. +- Bug 820248 - Start using glassfish-jsp + +* Thu Aug 23 2012 Krzysztof Daniel 1:4.2.0-11 +- Symlink junit 4. +- Move additional, non-Eclipse sources back to eclipse-build. +- Make the patch for setting BREE smaller. +- Patch for the compatibility.registry updated. +- Introduce a macro for symlinking. +- Bug 851190 - eclipse CBI build does not Requires: icu4j-eclipse + +* Wed Aug 22 2012 Krzysztof Daniel 1:4.2.0-10 +- Fix Eclipse not picking anything from dropins folder. + +* Tue Aug 21 2012 Krzysztof Daniel 1:4.2.0-9 +- Adopt upstream CBI system. + +* Tue Aug 14 2012 Krzysztof Daniel 1:4.2.0-8 +- Symlink emf bundles. + +* Tue Aug 14 2012 Krzysztof Daniel 1:4.2.0-7 +- Reduce the emf-core dependency strength. + +* Wed Aug 1 2012 Stanislav Ochotnicky - 1:4.2.0-6 +- Move maven fragments and pom files in appropriate subpackages + +* Wed Jul 18 2012 Fedora Release Engineering - 1:4.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jul 17 2012 Krzysztof Daniel 1:4.2.0-4 +- Bug 839986 - eclipse-rcp: broken symlinks + +* Fri Jul 6 2012 Krzysztof Daniel 1:4.2.0-3 +- Improved patch for discovering changes after update. + +* Thu Jul 5 2012 Alexander Kurtakov 1:4.2.0-2 +- Fix compilation against lucene 3.x. + +* Fri Jun 29 2012 Krzysztof Daniel 1:4.2.0-1 +- Included patch for Eclipse bug 251167 +- Recompiled all jsr14 bundles as 1.5 +- Update to final Juno release. +- Removed the old pdebuild script warning. +- Created OSGI subpackage. +- Removed the necessity to delete ~/.eclipse after some updates. + +* Mon Jun 18 2012 Sami Wagiaalla 1:4.2.0-0.24.I201205031800 +- Remove empty reconciler script. + +* Fri Jun 15 2012 Krzysztof Daniel 1:4.2.0-0.23.I201205031800 +- Workaround for Eclipse bug 382574 + +* Thu May 24 2012 Krzysztof Daniel 1:4.2.0-0.22.I201205031800 +- Do not pass the -preventMasterLaunch to non SDK applications. + +* Fri May 18 2012 Krzysztof Daniel 1:4.2.0-0.21.I201205031800 +- Prevent running Eclipse as root. +- Populate Update Sites. +- Pick renamed plugins on startup. +- Bundle the .option file for investigating startup problems. + +* Sat May 5 2012 Krzysztof Daniel 1:4.2.0-0.20.I201205031800 +- Update to M7. + +* Mon Apr 30 2012 Krzysztof Daniel 1:4.2.0-0.19.I201204291800 +- Update to I20120429-1800. + +* Tue Apr 24 2012 Krzysztof Daniel 1:4.2.0-0.18.I201204171000 +- Regenerating s390 and s390x launcher fragments from scratch. + +* Mon Apr 23 2012 Krzysztof Daniel 1:4.2.0-0.17.I201204171000 +- Remove duplicated junit library. +- Initial s390 and s390x support. +- Update to latest eclipse-build. + +* Fri Apr 20 2012 Krzysztof Daniel 1:4.2.0-0.16.I201204171000 +- Bug 814332 - Documentation is not pointing to locally installed javadoc. + +* Thu Apr 19 2012 Krzysztof Daniel 1:4.2.0-0.15.I201204171000 +- Amendment to previous release. + +* Thu Apr 19 2012 Krzysztof Daniel 1:4.2.0-0.14.I201204171000 +- Bug 813763 - /usr/bin/efj has missising exec permissions +- Bug 813756 - eclipse-jdt: bundled junit library +- Move hamcrest dependency to JDT. + +* Wed Apr 18 2012 Krzysztof Daniel 1:4.2.0-0.13.I201204171000 +- Move to the latest upstream I-build +- Generate full documentation. +- Formalize requirement on geronimo. + +* Wed Apr 18 2012 Sami Wagiaalla 1:4.2.0-0.12.I201204051114 +- Don't fail if icon.xpm does not exist. + +* Thu Apr 12 2012 Krzysztof Daniel 1:4.2.0-0.11.I201204051114 +- Version more requirements. +- Move java requirement to the lowest-in-stack package. +- Removed some rpmlint warnings from spec file. + +* Wed Apr 11 2012 Krzysztof Daniel 1:4.2.0-0.10.I201204051114 +- Specified version for java-javadoc requirements. + +* Tue Apr 10 2012 Krzysztof Daniel 1:4.2.0-0.9.I201204051114 +- Add proper version to conflicts eclipse-emf-core + +* Tue Apr 10 2012 Andrew Overholt 1:4.2.0-0.8.I201204051114 +- Add epoch to java and java-devel {Build,}Requires. + +* Tue Apr 10 2012 Krzysztof Daniel 1:4.2.0-0.7.I201204051114 +- Bug 810568 - require Java 7 to run. +- Bug 810970 - Cannot start 4.2.0-0.6.I201204051114.fc18.x86_64 + +* Fri Apr 6 2012 Krzysztof Daniel 1:4.2.0-0.6.I201204051114 +- Update to I20120405-1114 upstream Eclipse build. +- Update to latest e-b +- Bug 810552 - JSch Requires should be versioned + +* Wed Apr 4 2012 Roland Grunberg 1:4.2.0-0.5.fa15ab +- Define %%{_eclipse_base} to properly resolve %%{_libdir} for noarch. + +* Mon Apr 2 2012 Krzysztof Daniel 1:4.2.0-0.4.fa15ab +- pdebuild script installed into %%{_bindir} + +* Thu Mar 29 2012 Krzysztof Daniel 1:4.2.0-0.3.fa15ab +- Sort out problems with versions. + +* Thu Mar 29 2012 Krzysztof Daniel 1:4.2.0-0.2.fa15ab +- Change eclipse-emf-core package version to 2.8 + +* Thu Mar 29 2012 Krzysztof Daniel 1:4.2.0-0.1.fa15ab +- Update to 4.2 +- Added eclipse-emf-core package. + +* Mon Mar 26 2012 Krzysztof Daniel 1:3.8.0-0.21.I201203201400 +- Added Provides: osgi(system.bundle) to rcp package. + +* Thu Mar 22 2012 Krzysztof Daniel 1:3.8.0-0.20.I201203201400 +- Update to I20120320-1400. +- Ant version changed to 1.8.3. +- ECF version changed to 3.5.5. +- Experimental ARM support. + +* Fri Mar 16 2012 Krzysztof Daniel 1:3.8.0-0.19.I201203141800 +- Update to I20120314-1800. +- Eclipse-build updated to head. +- Required Jsch version updated to include correct MANIFEST.MF + +* Sun Mar 11 2012 Krzysztof Daniel 1:3.8.0-0.18.I201203060800 +- Update to I20120228-0800. +- Properly build org.eclipse.jdt.launching from source. + +* Wed Feb 29 2012 Andrew Overholt 1:3.8.0-0.17.I201202280800 +- Add macro for build ID to ease moving to new ones. + +* Wed Feb 29 2012 Krzysztof Daniel 1:3.8.0-0.16.I201202280800 +- Eclipse update to I20120228-0800 + +* Wed Feb 22 2012 Roland Grunberg 1:3.8.0-0.15.I201202140800 +- Add org.eclipse.tycho:org.eclipse.osgi to osgi depmap. +- Install org.eclipse.jdt.core in javadir/eclipse. +- Add maven pom and depmap for org.eclipse.jdt.core. + +* Wed Feb 22 2012 Krzysztof Daniel 1:3.8.0-0.14.I201202140800 +- Updated dependencies to match jetty 8.1.0-1. +- Updated commons-codec minimal requirements. +- Moved icu4j dependency from swt to rcp. + +* Fri Feb 17 2012 Krzysztof Daniel 1:3.8.0-0.13.I201202140800 +- Add the icu4j-source bundle. +- Update to Eclipse build I20120214-0800. + +* Thu Feb 16 2012 Sami Wagiaalla 1:3.8.0-0.12.I201202070800 +- Install a blank eclipse-reconciler.sh. + +* Thu Feb 16 2012 Krzysztof Daniel 1:3.8.0-0.11.I201202070800 +- Using system jar for junit 4 and different OSGI metadata for junit 3 +- Adopt noarch icu4j-eclipse + +* Mon Feb 13 2012 Sami Wagiaalla 1:3.8.0-0.10.I201202070800 +- Remove reconciler macros from macros.eclipse. +- Do not create temp eclipse directory in rpm-state. +- Do not install .so extaction paterns file. +- Stop running the reconciler. + +* Thu Feb 9 2012 Sami Wagiaalla 1:3.8.0-0.9.I201202070800 +- Remove -debug reconciler flag +- Remove macro _eclipse_reqs. +- Define %%{_eclipse_base} in macros.eclipse. +- Pass dropins dir to reconciler when updating the platform. + +* Wed Feb 8 2012 Krzysztof Daniel 1:3.8.0-0.7.I201201310842 +- Drop the indirect dependency to tomcat 5. +- Support for gnomelibproxy on x86_64. + +* Fri Feb 3 2012 Krzysztof Daniel 1:3.8.0-0.6.I201201310842 +- Change the makefile patch to be truly universal + +* Wed Feb 1 2012 Krzysztof Daniel 1:3.8.0-0.5.I201201310842 +- Update to Eclipse 3.8 I20120131-0842 + +* Tue Jan 31 2012 Sami Wagiaalla 1:3.8.0-0.4.I201201230800 +- Remove xulrunner requirement. + +* Tue Jan 31 2012 Krzysztof Daniel 1:3.8.0-0.3.I201201230800 +- Updated dependency to felix-gogo-shell to include fix for bug 786041. +- Fixed mixed-use-of-spaces-and-tabs warning in the spec file. + +* Tue Jan 31 2012 Krzysztof Daniel 1:3.8.0-0.2.I201201230800 +- Version changed to a better format. + +* Mon Jan 30 2012 Krzysztof Daniel 1:3.8.0-0.M4c +- Update to Eclipse 3.8 I20120123-0800 + +* Fri Jan 20 2012 Sami Wagiaalla 1:3.7.1-16 +- Remove ORBit-2 requirement. + +* Thu Jan 19 2012 Sami Wagiaalla 1:3.7.1-15 +- Add BuildRequires: ORBit2-devel + +* Thu Jan 19 2012 Sami Wagiaalla 1:3.7.1-15 +- Use rpm-state/eclipse for run-reconciler file instead of /var/run. +- Delete eclipse-tmpfiles.conf. + +* Thu Jan 19 2012 Sami Wagiaalla 1:3.7.1-14 +- Remove _eclipse_pkg macro. +- Use mktemp for creating a backup directory in eclipse-reconciler.sh + +* Mon Jan 16 2012 Alexander Kurtakov - 1:3.7.1-13 +- Fix o.e.osgi.services pom to remove fake parent. + +* Fri Jan 13 2012 Fedora Release Engineering - 1:3.7.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Dec 22 2011 Andrew Overholt 1:3.7.1-11 +- Install org.eclipse.osgi.services and org.eclipse.equinox.http.servlet in + javadir/eclipse. +- Add maven pom and depmap for the above. +- Fixes rhbz#769621. + +* Tue Dec 20 2011 Andrew Robinson 1:3.7.1-10 +- Specfile fix for license feature. + +* Mon Dec 19 2011 Andrew Overholt 1:3.7.1-9 +- New eclipse-build snapshot with proper p2 repo URLs. + +* Tue Nov 29 2011 Sami Wagiaalla 1:3.7.1-8 +- Stop using -clean option. +- Use -Dosgi.checkConfiguration=true when updating the platform. +- Remove cache.timestamps and .bundledata* when running the reconciler + with -Dosgi.checkConfiguration=true. +- Do not verify %%{_libdir}/%%{name}/artifacts.xml. + +* Tue Nov 29 2011 Roland Grunberg 1:3.7.1-7 +- Bump release. + +* Fri Nov 25 2011 Alexander Kurtakov 1:3.7.1-6 +- Add ExclusiveArch for RHEL. + +* Fri Nov 25 2011 Roland Grunberg 1:3.7.1-5 +- (Re-apply) Upgrade to Tomcat 7 Jasper. +- Include org.eclipse.jdt.core as part of platform to avoid cyclic + dependency between platform and jdt. + +* Mon Nov 21 2011 Roland Grunberg 1:3.7.1-4 +- Bump release to match f16 branch. + +* Wed Nov 16 2011 Roland Grunberg 1:3.7.1-2 +- Upload new source fixing RHBZ #753090. + +* Tue Nov 08 2011 Roland Grunberg 1:3.7.1-1 +- Update to 3.7.1. +- org.apache.lucene no longer used upstream. + +* Sat Oct 29 2011 Alexander Kurtakov 1:3.7.0-9 +- New e-b snapshot - fixed Program.launch for remote uris. +- Adds _javadir/icu4j.jar for secondary archs bootstrapping. + +* Wed Oct 26 2011 Sami Wagiaalla 1:3.7.0-8 +- Add Requires(post/postun) to _eclipse_pkg macro. + +* Fri Oct 21 2011 Alexander Kurtakov 1:3.7.0-7 +- Install org.eclipse.osgi in javadir/eclipse/osgi.jar +- Add maven pom and depmap. +- Fix compilation with glib 2.31. + +* Thu Oct 20 2011 Sami Wagiaalla 1:3.7.0-7 +- Change _eclipse_pkg to pipe all reconciler output to /dev/null + +* Thu Oct 20 2011 Sami Wagiaalla 1:3.7.0-6 +- Bump the release number. + +* Wed Oct 19 2011 Sami Wagiaalla 1:3.7.0-5 +- Add new line before writing to eclipse.ini. + +* Fri Oct 14 2011 Sami Wagiaalla 1:3.7.0-5 +- Change eclipse-reconciler script to run with no arguments. +- Use initscripts to create run directory. +- Run reconciler only once per install transaction. + +* Tue Oct 4 2011 Sami Wagiaalla 1:3.7.0-5 +- New eclipse-build source tar ball. + +* Mon Oct 3 2011 Sami Wagiaalla 1:3.7.0-5 +- Bump the relese number. + +* Mon Oct 3 2011 Sami Wagiaalla 1:3.7.0-5 +- Remove all metadata files created by the reconciler before + uninstallation. + +* Mon Oct 3 2011 Sami Wagiaalla 1:3.7.0-5 +- Install .so extraction file. +- Extract .so files when the reconciler is run with -clean + +* Mon Oct 3 2011 Sami Wagiaalla 1:3.7.0-5 +- Correct verification for files edited by the reconciler. +- Do not install state files. + +* Mon Oct 3 2011 Sami Wagiaalla 1:3.7.0-5 +- Add Requires post and postun platform to jdt and pde on + +* Fri Sep 23 2011 Sami Wagiaalla 1:3.7.0-4 +- Run reconciler after and before pde installation. + +* Fri Sep 23 2011 Sami Wagiaalla 1:3.7.0-4 +- Add new script eclipse-reconciler.sh +- Run eclipse-reconciler.sh in the post and postun sections of jdt + and post seciton on platform. +- Remove all old profiles in %%pre rcp. + +* Wed Sep 21 2011 Alexander Kurtakov 1:3.7.0-4 +- Remove _bindir/efj in pre - Fixes #738677. + +* Mon Sep 12 2011 Alexander Kurtakov 1:3.7.0-3 +- Use latest eclipse-build snapshot - fixes openjdk 7 build. +- Fix efj launcher script. + +* Mon Jun 27 2011 Chris Aniszczyk 1:3.7.0-1.3 +- Fix eclipse archive name + +* Fri Jun 24 2011 Andrew Overholt 1:3.7.0-1.2 +- Fix SWT symlink in %%{_libdir} (rhbz#715470) + +* Sun Jun 19 2011 Chris Aniszczyk 1:3.7.0-1.1 +- Fix upload of e-b snapshot + +* Wed Jun 15 2011 Chris Aniszczyk 1:3.7.0-1.0 +- New e-b snapshot to update build on 3.7 Final + +* Tue Jun 07 2011 Chris Aniszczyk 1:3.7.0-0.4.RC4 +- New e-b snapshot to update build on 3.7 RC4 +- Added usage of features back + +* Thu Jun 02 2011 Chris Aniszczyk 1:3.7.0-0.3.RC3 +- New e-b snapshot to update build on 3.7 RC3 +- removed efj as it's part of eclipse-build now +- removed usage of features + +* Tue May 17 2011 Chris Aniszczyk 1:3.7.0-0.2.RC1 +- New e-b snapshot, fixes org.eclipse.equinox.util issue +- updated servlet and jsp related dependencies + +* Tue May 17 2011 Chris Aniszczyk 1:3.7.0-0.1.RC1 +- New e-b snapshot - first eclipse 3.7 build based on 3.7 RC1. + +* Wed Apr 27 2011 Chris Aniszczyk 1:3.6.2-5 +- New e-b snapshot - really fixes dropins issue. +- update sat4j dependency to 2.3.0 + +* Mon Apr 25 2011 Chris Aniszczyk 1:3.6.2-4 +- Add rsync to BuildRequires. + +* Mon Apr 25 2011 Chris Aniszczyk 1:3.6.2-3 +- New e-b snapshot - fixes dropins issue. + +* Fri Apr 8 2011 Alexander Kurtakov 1:3.6.2-2 +- New e-b snapshot - fixes Program.launch problem without libswt-gnome. + +* Fri Apr 8 2011 Alexander Kurtakov 1:3.6.2-1 +- Switch to webkit by default. +- New eclipse-build snapshot. + +* Wed Apr 6 2011 Alexander Kurtakov 1:3.6.2-0.2 +- Drop bootstrap conditional. +- Drop shell start script. +- Drop jpp versioned dependencies - apache-commons-* have never had such versions. +- Removed patches moved to eclipse-build. + +* Fri Mar 11 2011 Alexander Kurtakov 1:3.6.2-0.1 +- First take on 3.6.2. + +* Tue Feb 08 2011 Fedora Release Engineering - 1:3.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jan 3 2011 Alexander Kurtakov 1:3.6.1-4 +- Fix build with ant 1.8.2. + +* Mon Dec 13 2010 Severin Gehwolf 1:3.6.1-3 +- Add fix for Eclipse help XSS vulnerability (RH Bz #661901). + +* Tue Oct 12 2010 Severin Gehwolf 1:3.6.1-2 +- Require zip for eclipse-pde. + +* Tue Oct 5 2010 Alexander Kurtakov 1:3.6.1-1 +- Update to 3.6.1. + +* Fri Oct 1 2010 Severin Gehwolf 1:3.6.0-17 +- Push release #, since there has been a 3.6.0-16 scratch build. + +* Thu Sep 30 2010 Severin Gehwolf 1:3.6.0-16 +- Fix copy-platform script generation. + +* Mon Sep 27 2010 Severin Gehwolf 1:3.6.0-15 +- Add shell script portability patch for prepare-build-dir.sh. + +* Tue Sep 21 2010 Alexander Kurtakov 1:3.6.0-14 +- Really reenable webkit. + +* Tue Sep 21 2010 Alexander Kurtakov 1:3.6.0-13 +- Reenable webkit support, build is fixed. + +* Tue Sep 21 2010 Alexander Kurtakov 1:3.6.0-12 +- Disable webkit support - it is causing build failures. + +* Tue Sep 21 2010 Alexander Kurtakov 1:3.6.0-11 +- Add jsp-api dependency and use the tomcat6 one. + +* Fri Sep 17 2010 Jeff Johnston 1:3.6.0-10 +- Add patch to fix xpcom problem. + +* Tue Sep 7 2010 Alexander Kurtakov 1:3.6.0-9 +- Add webkitgtk-devel BR and webkit R. + +* Wed Sep 1 2010 Alexander Kurtakov 1:3.6.0-8 +- Add patch to remove ant-trax from ant bundle's classpath. +- Use new package names in BR/R. + +* Wed Sep 1 2010 Alexander Kurtakov 1:3.6.0-7 +- Update to eclipse-build 0.6.1 release. +- Fix build with ant 1.8.1. + +* Tue Aug 17 2010 Andrew Overholt 1:3.6.0-6 +- Update to eclipse-build 0.6.1RC2. +- List a few files that were missing but should be installed. +- Finally remove %%{_datadir}/%%{name}/{features,plugins} as nothing is + installed in there and shouldn't be. +- Use new eclipse-build targets provision.sdk and installSDKinDropins. +- Remove filenamepatterns.txt as it's now part of eclipse-build. +- Update download URL. +- Remove unused patches. + +* Tue Aug 10 2010 Andrew Overholt 1:3.6.0-5 +- Update to eclipse-build 0.6.0 final. + +* Fri Aug 06 2010 Andrew Overholt 1:3.6.0-4 +- Move epl-v10.html and notice.html to SWT sub-package. + +* Thu Jul 15 2010 Elliott Baron 1:3.6.0-3 +- Increasing min versions for jetty, icu4j-eclipse and sat4j. + +* Fri Jul 9 2010 Alexander Kurtakov 1:3.6.0-2 +- o.e.core.net.linux is no longer x86 only. + +* Fri Jul 9 2010 Alexander Kurtakov 1:3.6.0-1 +- Update to 3.6.0. +- Based on eclipse-build 0.6.1 RC0. diff --git a/eclipse-debug-symbols.patch b/eclipse-debug-symbols.patch new file mode 100644 index 0000000..9d9d63d --- /dev/null +++ b/eclipse-debug-symbols.patch @@ -0,0 +1,38 @@ +--- 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 + +-export CFLAGS='-O -Wall -fPIC' ++export CFLAGS='-O -g -Wall -fPIC' ++export NO_STRIP=1 + + # Determine which OS we are on + if [ "${OS}" = "" ]; then +--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak.orig 2019-03-20 10:22:21.420240101 +0000 ++++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak 2019-03-20 10:53:53.375471427 +0000 +@@ -82,7 +82,7 @@ + -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" \ + -DGIO_LIB="\"libgio-2.0.so.0\"" -DGLIB_LIB="\"libglib-2.0.so.0\"" + LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic +-CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -s -Wall\ ++CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -Wall\ + -fpic \ + -DLINUX \ + -DDEFAULT_OS="\"$(DEFAULT_OS)\"" \ +--- eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux/makefile.orig 2019-03-20 09:49:40.694899138 +0000 ++++ eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux/makefile 2019-03-20 10:20:21.704664294 +0000 +@@ -25,10 +25,10 @@ + OS_TYPE = linux + JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE} + INCLUDE = `pkg-config --cflags gio-2.0` +-COMPILER_FLAGS = -O0 -fPIC -g3 -Wall -c -fmessage-length=0 ${TARGET_ENVIRONMENT} ++COMPILER_FLAGS = $(CFLAGS) -fPIC -c ${TARGET_ENVIRONMENT} + + LIBS := `pkg-config --libs gio-2.0` +-LINKER_FLAGS= ${TARGET_ENVIRONMENT} ++LINKER_FLAGS = $(LDFLAGS) ${TARGET_ENVIRONMENT} + + all: link + diff --git a/eclipse-disable-droplets-in-dropins.patch b/eclipse-disable-droplets-in-dropins.patch new file mode 100644 index 0000000..9c78052 --- /dev/null +++ b/eclipse-disable-droplets-in-dropins.patch @@ -0,0 +1,47 @@ +From edd5a395dd96699f91c463c0e0409a7488814775 Mon Sep 17 00:00:00 2001 +From: Roland Grunberg +Date: Tue, 16 Aug 2016 17:51:46 -0400 +Subject: [PATCH] Skip loading droplets in the configuration during + reconciliation. + +The reconciler attempts to load droplets as extended locations, which +seems to be an expensive operation. Avoid doing this for the sake of +efficiency. + +Change-Id: Iaf07aacb2d7eaabf3730654e757e69d22f0bc4ab +--- + .../internal/p2/reconciler/dropins/PlatformXmlListener.java | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +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 +--- 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 +@@ -172,11 +172,24 @@ public class PlatformXmlListener extends DirectoryChangeListener { + * Ensure that we have a repository for each site in the given configuration. + */ + protected void synchronizeConfiguration(Configuration config) { ++ String fragments = System.getProperty("p2.fragments"); + List sites = config.getSites(); + Set newRepos = new LinkedHashSet<>(); + Set toBeRemoved = new HashSet<>(); + for (Site site : sites) { + String siteURL = site.getUrl(); ++ if (fragments != null) { ++ String[] rootPaths = fragments.split(","); ++ boolean skip = false; ++ for (String path : rootPaths) { ++ if (siteURL.startsWith("file:" + path)) { ++ skip = true; ++ } ++ } ++ if (skip) { ++ continue; ++ } ++ } + IMetadataRepository match = getMatchingRepo(Activator.getRepositories(), siteURL); + if (match == null) { + try { +-- +2.7.4 + diff --git a/eclipse-disable-uses-constraints.patch b/eclipse-disable-uses-constraints.patch new file mode 100644 index 0000000..43278ee --- /dev/null +++ b/eclipse-disable-uses-constraints.patch @@ -0,0 +1,28 @@ +From 889543269853e12925ef00a6e76c3dd85ce5b915 Mon Sep 17 00:00:00 2001 +From: Roland Grunberg +Date: Tue, 25 Oct 2016 16:48:28 -0400 +Subject: [PATCH] Disable uses by default (osgi.resolver.usesMode=ignore). + set. + +--- + .../felix/src/org/apache/felix/resolver/ResolverImpl.java | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +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 +--- 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 +@@ -1234,7 +1234,9 @@ public class ResolverImpl implements Resolver + { + public void run() + { +- computeUses(session, allWireCandidates, allPackages, resource); ++ if (! "ignore".equals(System.getProperty("osgi.resolver.usesMode"))) { ++ computeUses(session, allWireCandidates, allPackages, resource); ++ } + } + }); + } +-- +2.7.4 + diff --git a/eclipse-feature-plugins-to-category-ius.patch b/eclipse-feature-plugins-to-category-ius.patch new file mode 100644 index 0000000..bad2a41 --- /dev/null +++ b/eclipse-feature-plugins-to-category-ius.patch @@ -0,0 +1,721 @@ +diff --git a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml b/eclipse.jdt/org.eclipse.jdt-feature/feature.xml +index d874d5a13..c15c86ffa 100644 +--- a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml ++++ b/eclipse.jdt/org.eclipse.jdt-feature/feature.xml +@@ -19,6 +19,23 @@ + %license + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + ++ ++ + + + + +- +- +- +- + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +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 84d4a38a9..070f86a63 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"/> + +- +- + + +- +- + + ++ ++ ++ ++ ++ ++ ++ ++ ++ + +@@ -427,20 +436,6 @@ + install-size="0" + version="0.0.0"/> + +- +- +- +- + + +- +- +- +- +- +- +- +- +- +- + + ++ ++ ++ ++ + + +- +- + +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 767a93df9..293525308 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 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + +- +- +- +- +- +- +- +- +- +- + + +- +- + + +- +- + + +- +- +- +- +- +- + + +- +- + + +- ++ ++ ++ + + + +- ++ ++ ++ + + diff --git a/eclipse-fix-dropins.patch b/eclipse-fix-dropins.patch new file mode 100644 index 0000000..e3efe03 --- /dev/null +++ b/eclipse-fix-dropins.patch @@ -0,0 +1,88 @@ +--- 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 { + ++ private static final String PROP_IGNORE_USER_CONFIGURATION = "eclipse.ignoreUserConfiguration"; //$NON-NLS-1$ + 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$ +@@ -274,6 +275,14 @@ + //fragments support - remeber the property + internalSetProfileStateProperty(profile, profile.getTimestamp(), SIMPLE_PROFILE_REGISTRY_INTERNAL + getExtTimeStamp(), getExtTimeStamp()); + agent.registerService(SERVICE_SHARED_INSTALL_NEW_TIMESTAMP, Long.toString(profile.getTimestamp())); ++ ++ // this looks like a hack, but: ++ // (1) SimpleConfigurationImpl keeps returning master configuration as long as the property is set ++ // (2) SimpleConfigurationImpl sets the propery after it drops user configuration ++ // therefore dropins reconciliation can't load dropins plugins installed into user configuration ++ // after the user configuration has been dropped. ++ // It is necessary to unset this property. ++ //System.setProperty(PROP_IGNORE_USER_CONFIGURATION, "processed_and_unset"); //$NON-NLS-1$ //$NON-NLS-2$ + } 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); +@@ -307,6 +316,13 @@ + if (agent.getService(SERVICE_SHARED_INSTALL_NEW_TIMESTAMP) != null) + return false; + ++ // if the property is set by OSGI, and there is no new timestamp (because of the previous condition) ++ // ignore current profile. This will happen only once, because SERVICE_SHARED_INSTALL_NEW_TIMESTAMP ++ // is set during profile reset. ++ if ("true".equals(System.getProperty(PROP_IGNORE_USER_CONFIGURATION))) { //$NON-NLS-1$ //$NON-NLS-2$ ++ System.setProperty(PROP_IGNORE_USER_CONFIGURATION, "processed_and_unset"); //$NON-NLS-1$ //$NON-NLS-2$ ++ return true; ++ } + String baseTimestamp = getBaseTimestamp(profile.getProfileId()); + String extTimestamp = getExtTimeStamp(); + if (baseTimestamp == null) { +--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java.orig 2019-09-13 14:45:20.806922186 +0100 ++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java 2019-09-13 14:46:41.124689025 +0100 +@@ -560,6 +560,7 @@ + + // get all IUs from all our repos + IQueryResult allIUs = getAllIUsFromRepos(); ++ HashSet removedFromAllIUs = new HashSet(); + for (Iterator iter = allIUs.iterator(); iter.hasNext();) { + final IInstallableUnit iu = iter.next(); + IInstallableUnit existing = profileIUs.get(iu); +@@ -573,6 +574,7 @@ + // (and more expensive) way to find this out is to do an IU profile property query. + if (two == null) { + // the IU is already installed so don't mark it as a dropin now - see bug 404619. ++ removedFromAllIUs.add(iu); + iter.remove(); + continue; + } +@@ -614,7 +616,7 @@ + } + // if the IU from the profile is in the "all available" list, then it is already added + // otherwise if it isn't in the repo then we have to remove it from the profile. +- if (!all.contains(iu)) ++ if (!all.contains(iu) && !removedFromAllIUs.contains(iu)) + toRemove.add(iu); + } + +@@ -787,7 +789,8 @@ + if (!installerPlanStatus.isOK()) + return installerPlanStatus; + +- applyConfiguration(true); ++ if (isReconciliationApplicationRunning()) ++ applyConfiguration(true); + } + return engine.perform(plan, phaseSet, monitor); + } +--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java.orig 2019-09-13 14:42:54.512346840 +0100 ++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java 2019-09-13 14:43:12.003296065 +0100 +@@ -158,8 +158,7 @@ + + @Override + public boolean performCancel() { +- String[] buttons = new String[] { IDialogConstants.YES_LABEL, ProvUIMessages.MigrationPage_LATER_BUTTON, +- IDialogConstants.NO_LABEL }; ++ String[] buttons = new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }; + MessageDialog dialog = new MessageDialog(getShell(), ProvUIMessages.MigrationPage_CONFIRMATION_TITLE, null, + ProvUIMessages.MigrationPage_CONFIRMATION_DIALOG, MessageDialog.QUESTION, buttons, 2); + diff --git a/eclipse-fix-tests.patch b/eclipse-fix-tests.patch new file mode 100644 index 0000000..a946757 --- /dev/null +++ b/eclipse-fix-tests.patch @@ -0,0 +1,280 @@ +--- 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 +@@ -80,7 +80,7 @@ + */ + protected IPath getJdtFeatureLocation() { + IPath path = new Path(TargetPlatform.getDefaultLocation()); +- path = path.append("features"); ++ path = path.append("droplets").append("eclipse-jdt").append("features"); + File dir = path.toFile(); + assertTrue("Missing features directory", dir.exists() && !dir.isFile()); + String[] files = dir.list(); +diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java +index f1f38f0..f9111e6 100644 +--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java ++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java +@@ -246,7 +246,7 @@ + if (parent != null) { + File[] children = parent.listFiles((FileFilter) pathname -> { + String name = pathname.getName(); +- return name.startsWith("eclipse-platform-"); ++ return name.startsWith("eclipse-SDK-"); + }); + if (children != null && children.length == 1) + file = children[0]; +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 +--- eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties ++++ eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties +@@ -17,6 +17,7 @@ bin.includes = .,\ + resources/,\ + lib/ + src.includes = about.html +-jars.compile.order = . ++jars.compile.order = .,\ ++ lib/annotations.jar + source.. = src/ +-output.. = bin/ ++source.lib/annotations.jar = src/ +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 +--- eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties ++++ eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties +@@ -24,4 +24,6 @@ bin.includes = plugin.xml,\ + plugin.properties + src.includes = about.html + src.excludes = src-resources/ +-jars.compile.order = aptext.jar,apt.jar,. ++jars.compile.order = aptext.jar,apt.jar,.,\ ++ resources/question.jar ++source.resources/question.jar = src-resources/ +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 +--- eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties ++++ eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties +@@ -28,3 +28,6 @@ + src.includes = about.html + compilerArg=-proc:none + jars.extra.classpath = lib/javax15api.jar ++source.lib/apttestprocessors.jar = processors/ ++jars.compile.order = lib/apttestprocessors.jar,\ ++ . +--- eclipse.platform/ant/org.eclipse.ant.tests.ui/build.properties.orig 2016-03-24 14:25:47.076289150 +0000 ++++ eclipse.platform/ant/org.eclipse.ant.tests.ui/build.properties 2016-03-24 14:26:39.528660802 +0000 +@@ -28,6 +28,8 @@ + Ant Tests/ + + source.lib/antUITestsSupport.jar = test support/ +-jars.compile.order=anttestsui.jar,lib/antUITestsSupport.jar ++source.testbuildfiles/antUITestsSupport.jar = test support/ ++jars.compile.order=anttestsui.jar,lib/antUITestsSupport.jar,testbuildfiles/antUITestsSupport.jar + output.lib/antUITestsSupport.jar = test_support_bin/ ++output.testbuildfiles/antUITestsSupport.jar = test_support_bin/ + output.anttestsui.jar = bin/ +--- eclipse.jdt.ui/org.eclipse.jdt.ui.tests/build.properties.orig 2016-03-25 15:09:40.557786910 +0000 ++++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/build.properties 2016-03-25 15:12:08.476059326 +0000 +@@ -25,3 +25,5 @@ + leaks/,\ + performance/ + javacWarnings..=-raw,-unchecked ++source.testresources/nls.jar = nls/ ++jars.compile.order = .,testresources/nls.jar +--- /dev/null 1970-01-01 01:00:00.000000000 +0100 ++++ 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. ++ * All rights reserved. This program and the accompanying materials ++ * are made available under the terms of the Common Public License v1.0 ++ * which accompanies this distribution, and is available at ++ * http://www.eclipse.org/legal/cpl-v10.html ++ * ++ * Contributors: ++ * IBM Corporation - initial API and implementation ++ *******************************************************************************/ ++package pkg; ++ ++public class Client { ++ ++ public String s; ++ ++ { ++ s= Messages.getString("test"); ++ s= Messages.getString("test_undefined"); ++ s= Messages.getString("duplicate"); ++ s= Messages.getString("test.long.key"); ++ s= Messages.getString("SearchResultView.removed_resource"); ++ } ++ ++} +--- /dev/null 1970-01-01 01:00:00.000000000 +0100 ++++ 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. ++ * All rights reserved. This program and the accompanying materials ++ * are made available under the terms of the Common Public License v1.0 ++ * which accompanies this distribution, and is available at ++ * http://www.eclipse.org/legal/cpl-v10.html ++ * ++ * Contributors: ++ * IBM Corporation - initial API and implementation ++ *******************************************************************************/ ++package pkg; ++ ++import java.text.MessageFormat; ++import java.util.MissingResourceException; ++import java.util.ResourceBundle; ++ ++public class Messages extends Object { ++ private static final String RESOURCE_BUNDLE = Messages.class.getName(); ++ private static ResourceBundle fgResourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE); ++ ++ private Messages() {} ++ ++ /** ++ * Gets a string from the resource bundle and formats it with the argument ++ * ++ * @param key the string used to get the bundle value, must not be null ++ */ ++ public static String getFormattedString(String key, Object arg) { ++ String format = null; ++ ++ try { ++ format = fgResourceBundle.getString(key); ++ } catch (MissingResourceException e) { ++ return "!" + key + "!"; //$NON-NLS-2$ //$NON-NLS-1$ ++ } ++ ++ if (arg == null) { ++ arg = ""; //$NON-NLS-1$ ++ } ++ ++ return MessageFormat.format(format, new Object[] { arg }); ++ } ++ ++ /** ++ * Gets a string from the resource bundle and formats it with arguments ++ */ ++ public static String getFormattedString(String key, String[] args) { ++ return MessageFormat.format(fgResourceBundle.getString(key), args); ++ } ++ ++ public static String getString(String key) { ++ try { ++ return fgResourceBundle.getString(key); ++ } catch (MissingResourceException e) { ++ return "!" + key + "!"; //$NON-NLS-2$ //$NON-NLS-1$ ++ } ++ } ++} +--- /dev/null 1970-01-01 01:00:00.000000000 +0100 ++++ 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. ++# All rights reserved. This program and the accompanying materials ++# are made available under the terms of the Common Public License v1.0 ++# which accompanies this distribution, and is available at ++# http://www.eclipse.org/legal/cpl-v10.html ++# ++# Contributors: ++# IBM Corporation - initial API and implementation ++############################################################################### ++test= Hello World ++duplicate= Duplicate 1 ++test.long.key= Hello World Long ++duplicate= Duplicate 2 ++SearchResultView.removed_resource= +--- eclipse.platform/ant/org.eclipse.ant.tests.core/build.properties.orig 2017-03-03 14:20:53.868573338 +0000 ++++ eclipse.platform/ant/org.eclipse.ant.tests.core/build.properties 2017-03-06 14:26:42.382365639 +0000 +@@ -26,6 +26,8 @@ + source.anttestscore.jar = test plugin/,\ + tests/ + source.lib/antTestsSupport.jar = test support/ +-jars.compile.order=anttestscore.jar,lib/antTestsSupport.jar ++source.testlib/classpathOrdering1.jar = testlib_src/classpathOrdering1/ ++source.testlib/classpathOrdering2.jar = testlib_src/classpathOrdering2/ ++jars.compile.order=anttestscore.jar,lib/antTestsSupport.jar,testlib/classpathOrdering1.jar,testlib/classpathOrdering2.jar + output.lib/antTestsSupport.jar = test_support_bin/ + output.anttestscore.jar = bin/ +--- /dev/null 2017-02-12 18:27:14.283389371 +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; ++ ++public class ClasspathOrdering ++{ ++ public static void main(String[] args) ++ { ++ System.out.println("classpathOrdering1"); ++ } ++} ++ +--- /dev/null 2017-02-12 18:27:14.283389371 +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; ++ ++public class ClasspathOrdering ++{ ++ public static void main(String[] args) ++ { ++ System.out.println("classpathOrdering2"); ++ } ++} ++ +--- 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 +@@ -159,13 +159,6 @@ + id="org.eclipse.jdt.source.feature.group" + version="" /> + +- +- +- + + ${tycho.surefire.argLine} + +- ++ ++ ++ org.eclipse.tycho ++ target-platform-configuration ++ ++ ++ ++ ++ eclipse-plugin ++ org.eclipse.jdt.annotation ++ 0.0.0 ++ ++ ++ ++ ++ + + + +--- eclipse.jdt.debug/org.eclipse.jdt.debug.ui/build.properties.orig 2019-12-19 05:19:24.194321737 +0000 ++++ eclipse.jdt.debug/org.eclipse.jdt.debug.ui/build.properties 2019-12-19 05:20:03.702264652 +0000 +@@ -21,6 +21,9 @@ + + src.includes = about.html,\ + schema/ ++source.snippetsupport.jar=Snippet Support/ + source.. = ui/ + output.. = bin/ ++output.snippetsupport.jar = snippet_bin/ + javacWarnings..=-unavoidableGenericProblems ++javacWarnings.snippersupport.jar=-unavoidableGenericProblems diff --git a/eclipse-hide-droplets-from-install-wizard.patch b/eclipse-hide-droplets-from-install-wizard.patch new file mode 100644 index 0000000..729b2ae --- /dev/null +++ b/eclipse-hide-droplets-from-install-wizard.patch @@ -0,0 +1,69 @@ +From a23545ef5b4cbb94ff048fda2839ba08c3593d50 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Thu, 3 May 2018 15:58:49 +0100 +Subject: [PATCH] Bug 534326 - Awkward p2 UI when many droplets are installed + Filter out software site locations where we know that they are p2 droplets in + places we show the list to the user. Change-Id: + I12364223850862783cb7cffd32fb7428fbf6b270 Signed-off-by: Mat Booth + + +--- + .../p2/ui/dialogs/RepositorySelectionGroup.java | 13 +++++++++++++ + .../equinox/p2/ui/RepositoryManipulationPage.java | 15 ++++++++++++++- + 2 files changed, 27 insertions(+), 1 deletion(-) + +diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java +index d07be5d43..c666f8fdc 100644 +--- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java ++++ b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java +@@ -303,6 +303,19 @@ public class RepositorySelectionGroup { + void fillRepoCombo(final String selection) { + RepositoryTracker tracker = ui.getRepositoryTracker(); + URI[] sites = tracker.getKnownRepositories(ui.getSession()); ++ // Filter out sites that are actually installed p2 droplets ++ String fragments = System.getProperty("p2.fragments"); //$NON-NLS-1$ ++ ArrayList filteredSites = new ArrayList<>(Arrays.asList(sites)); ++ if (fragments != null) { ++ for (String root : fragments.split(",")) { //$NON-NLS-1$ ++ for (URI uri : sites) { ++ if (uri.getPath() != null && uri.getPath().startsWith(root)) { ++ filteredSites.remove(uri); ++ } ++ } ++ } ++ } ++ sites = filteredSites.toArray(new URI[0]); + boolean hasLocalSites = getLocalSites().length > 0; + final String[] items; + if (hasLocalSites) { +diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java +index 78fb5398e..b8e724b66 100644 +--- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java ++++ b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java +@@ -133,9 +133,22 @@ public class RepositoryManipulationPage extends PreferencePage implements IWorkb + if (cachedElements == null) { + Object[] children = super.fetchChildren(o, monitor); + cachedElements = new Hashtable<>(children.length); ++ String fragments = System.getProperty("p2.fragments"); //$NON-NLS-1$ + for (Object element : children) { + if (element instanceof MetadataRepositoryElement) { +- put((MetadataRepositoryElement) element); ++ // Filter out locations that are actually installed p2 droplets ++ if (fragments != null) { ++ boolean isDroplet = false; ++ for (String root : fragments.split(",")) { //$NON-NLS-1$ ++ URI childLoc = ((MetadataRepositoryElement) element).getLocation(); ++ if (childLoc.getPath() != null && childLoc.getPath().startsWith(root)) { ++ isDroplet = true; ++ } ++ } ++ if (!isDroplet) { ++ put((MetadataRepositoryElement) element); ++ } ++ } + } + } + } +-- +2.21.1 + diff --git a/eclipse-ignore-version-when-calculating-home.patch b/eclipse-ignore-version-when-calculating-home.patch new file mode 100644 index 0000000..d2b50d2 --- /dev/null +++ b/eclipse-ignore-version-when-calculating-home.patch @@ -0,0 +1,26 @@ +diff --git a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java +index 144571914..7e99bc880 100644 +--- a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java ++++ b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java +@@ -1330,7 +1330,7 @@ public class Main { + String appVersion = props.getProperty(PRODUCT_SITE_VERSION); + if (appVersion == null || appVersion.trim().length() == 0) + appVersion = ""; //$NON-NLS-1$ +- appName += File.separator + appId + "_" + appVersion + "_" + installDirHash; //$NON-NLS-1$ //$NON-NLS-2$ ++ appName += File.separator + appId + "_" + installDirHash; //$NON-NLS-1$ + } catch (IOException e) { + // Do nothing if we get an exception. We will default to a standard location + // in the user's home dir. +diff --git a/rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java b/rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java +index 0c13ace6f..d92d4fc45 100755 +--- a/rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java ++++ b/rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java +@@ -308,7 +308,7 @@ public class EquinoxLocations { + String appVersion = props.getProperty(PRODUCT_SITE_VERSION); + if (appVersion == null || appVersion.trim().length() == 0) + appVersion = ""; //$NON-NLS-1$ +- appName += File.separator + appId + "_" + appVersion + "_" + installDirHash; //$NON-NLS-1$ //$NON-NLS-2$ ++ appName += File.separator + appId + "_" + installDirHash; //$NON-NLS-1$ + } catch (IOException e) { + // Do nothing if we get an exception. We will default to a standard location + // in the user's home dir. diff --git a/eclipse-make-droplets-runnable.patch b/eclipse-make-droplets-runnable.patch new file mode 100644 index 0000000..155d7b8 --- /dev/null +++ b/eclipse-make-droplets-runnable.patch @@ -0,0 +1,47 @@ +From decc6ec5f3c5ce87fa50c2cfe932d66e89496810 Mon Sep 17 00:00:00 2001 +From: Roland Grunberg +Date: Wed, 3 Aug 2016 14:57:10 -0400 +Subject: [PATCH] p2 Droplets should be recognized as runnable repositories. + +Normally, a runnable repository is identified by the 'p2.runnable' +property contained within the artifact repository (artifact.xml). +However, in Fedora we ship p2 Droplets without this file so we need a +way to let methods like getRunnableRepositories in +o.e.equinox.internal.p2.touchpoint.eclipse.Util know that p2 Droplets +are runnable repositories. + +Change-Id: I0ad0a7557f998b4d032466f89e6cc76036d1fb38 +--- + .../ExtensionLocationArtifactRepository.java | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +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 +--- 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 +@@ -284,6 +284,22 @@ public class ExtensionLocationArtifactRepository extends AbstractRepository + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +--- 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 @@ + + + +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +--- eclipse.platform.releng/features/org.eclipse.sdk/feature.xml.orig 2019-06-17 13:00:29.410091487 +0100 ++++ eclipse.platform.releng/features/org.eclipse.sdk/feature.xml 2019-06-17 13:00:36.270076080 +0100 +@@ -51,16 +51,6 @@ + id="org.eclipse.help.source" + version="0.0.0"/> + +- +- +- +- +- +- +- +- +- +- + + + +- + + + +--- rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java.orig 2019-06-20 11:48:48.317887414 +0100 ++++ rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java 2019-06-20 11:49:35.106774459 +0100 +@@ -79,10 +79,6 @@ + import javax.servlet.http.HttpSessionListener; + import javax.servlet.http.Part; + +-import org.apache.commons.fileupload.FileItem; +-import org.apache.commons.fileupload.FileUploadException; +-import org.apache.commons.fileupload.disk.DiskFileItemFactory; +-import org.apache.commons.fileupload.servlet.ServletFileUpload; + import org.eclipse.equinox.http.servlet.ExtendedHttpService; + import org.eclipse.equinox.http.servlet.RangeAwareServletContextHelper; + import org.eclipse.equinox.http.servlet.context.ContextPathCustomizer; +@@ -2657,66 +2653,6 @@ + } + + @Test +- public void test_commonsFileUpload() throws Exception { +- Servlet servlet = new HttpServlet() { +- private static final long serialVersionUID = 1L; +- +- @Override +- protected void doPost(HttpServletRequest req, HttpServletResponse resp) +- throws IOException { +- +- boolean isMultipart = ServletFileUpload.isMultipartContent(req); +- Assert.assertTrue(isMultipart); +- +- DiskFileItemFactory factory = new DiskFileItemFactory(); +- +- ServletContext servletContext = this.getServletConfig().getServletContext(); +- File repository = (File) servletContext.getAttribute("javax.servlet.context.tempdir"); +- factory.setRepository(repository); +- ServletFileUpload upload = new ServletFileUpload(factory); +- +- List items = null; +- try { +- List parseRequest = upload.parseRequest(req); +- items = parseRequest; +- } catch (FileUploadException e) { +- e.printStackTrace(); +- } +- +- Assert.assertNotNull(items); +- Assert.assertFalse(items.isEmpty()); +- +- FileItem fileItem = items.get(0); +- +- String submittedFileName = fileItem.getName(); +- String contentType = fileItem.getContentType(); +- long size = fileItem.getSize(); +- +- PrintWriter writer = resp.getWriter(); +- +- writer.write(submittedFileName); +- writer.write("|"); +- writer.write(contentType); +- writer.write("|" + size); +- } +- }; +- +- Dictionary props = new Hashtable<>(); +- props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME, "S16"); +- props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/Servlet16/*"); +- registrations.add(getBundleContext().registerService(Servlet.class, servlet, props)); +- +- Map> map = new HashMap<>(); +- +- map.put("file", Arrays.asList(getClass().getResource("blue.png"))); +- +- Map> result = requestAdvisor.upload("Servlet16/do", map); +- +- Assert.assertEquals("200", result.get("responseCode").get(0)); +- Assert.assertEquals("blue.png|image/png|292", result.get("responseBody").get(0)); +- } +- +- @Test + public void test_PathEncodings_Bug540970() throws Exception { + Servlet servlet = new HttpServlet() { + private static final long serialVersionUID = 1L; diff --git a/eclipse-pde-tp-support-droplets.patch b/eclipse-pde-tp-support-droplets.patch new file mode 100644 index 0000000..bb95674 --- /dev/null +++ b/eclipse-pde-tp-support-droplets.patch @@ -0,0 +1,133 @@ +From 85ad9719778aa0aa5b9e6655c015a352adb5540a Mon Sep 17 00:00:00 2001 +From: Roland Grunberg +Date: Thu, 7 Apr 2016 10:23:49 -0400 +Subject: [PATCH] Support reading BundleInfo from p2 Droplets enabled + installations. + +- Additionally support reading source bundles from p2 Droplets location +--- + .../org.eclipse.pde.core/META-INF/MANIFEST.MF | 1 + + .../eclipse/pde/internal/core/P2Utils.java | 50 +++++++++++++++++-- + .../org.eclipse.pde.doc.user/pdeOptions.txt | 1 + + 3 files changed, 47 insertions(+), 5 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 +index 8b65b7b6f..ff1a881a0 100644 +--- a/eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF ++++ b/eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF +@@ -102,5 +102,6 @@ Require-Bundle: + org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)" + Eclipse-LazyStart: true + Bundle-RequiredExecutionEnvironment: JavaSE-11 ++Import-Package: 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 +index bd0be54a9..d9259321e 100644 +--- a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java ++++ b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java +@@ -17,10 +17,11 @@ package org.eclipse.pde.internal.core; + import java.io.File; + import java.io.IOException; + import java.io.InputStream; +-import java.net.MalformedURLException; +-import java.net.URL; ++import java.net.*; + import java.nio.file.Files; ++import java.nio.file.Paths; + import java.nio.file.NoSuchFileException; ++import java.util.Arrays; + import java.util.ArrayList; + import java.util.Collection; + import java.util.HashMap; +@@ -34,6 +35,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; + import org.eclipse.core.runtime.Path; + import org.eclipse.core.runtime.Status; + import org.eclipse.equinox.frameworkadmin.BundleInfo; ++import org.eclipse.core.runtime.URIUtil; 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.IEngine; +@@ -62,6 +64,7 @@ import org.eclipse.pde.core.plugin.IPluginModelBase; + import org.eclipse.pde.core.plugin.TargetPlatform; + import org.eclipse.pde.internal.build.BundleHelper; + import org.eclipse.pde.internal.core.plugin.PluginBase; ++import org.eclipse.pde.internal.core.util.ManifestUtils; + import org.osgi.framework.Constants; + + /** +@@ -141,7 +144,17 @@ public class P2Utils { + try { + File bundlesTxt = new File(configurationArea, SimpleConfiguratorManipulator.BUNDLES_INFO_PATH); + File home = basePath.toFile(); +- BundleInfo[] bundles = getBundlesFromFile(bundlesTxt, home); ++ List ibundleList = SimpleConfiguratorUtils.readConfiguration(bundlesTxt.toURI().toURL(), home.toURI()); ++ List bundleList = new ArrayList<>(); ++ for (org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo b : ibundleList) { ++ URI location = b.getLocation(); ++ if (!location.isAbsolute() && b.getBaseLocation() != null) ++ location = URIUtil.makeAbsolute(location, b.getBaseLocation()); ++ BundleInfo binfo = new BundleInfo(b.getSymbolicName(), b.getVersion(), location, b.getStartLevel(), b.isMarkedAsStarted()); ++ bundleList.add(binfo); ++ } ++ BundleInfo[] bundles = bundleList.toArray(new BundleInfo[0]); ++ + if (bundles == null || bundles.length == 0) { + return null; + } +@@ -170,11 +183,38 @@ public class P2Utils { + try { + File home = basePath.toFile(); + File srcBundlesTxt = new File(configurationArea, SimpleConfiguratorManipulator.SOURCE_INFO_PATH); ++ final List allSrcBundles = new ArrayList<>(); ++ try { ++ for (File infoFile : SimpleConfiguratorUtils.getInfoFiles()) { ++ File pluginsDir = Paths.get(infoFile.getParent(), "plugins").toFile(); //$NON-NLS-1$ ++ File[] sourceJars = pluginsDir.listFiles((dir, name) -> { ++ return name.matches(".*\\.source_.*\\.jar$"); //$NON-NLS-1$ ++ }); ++ for (File sourceJar : sourceJars) { ++ Map manifest; ++ try { ++ manifest = ManifestUtils.loadManifest(sourceJar); ++ final String bsn = manifest.get(Constants.BUNDLE_SYMBOLICNAME); ++ final String version = manifest.get(Constants.BUNDLE_VERSION); ++ BundleInfo info = new BundleInfo(bsn, version, sourceJar.toURI(), -1, false); ++ allSrcBundles.add(info); ++ } catch (CoreException e) { ++ // continue ++ } ++ } ++ } ++ } catch (URISyntaxException e) { ++ // continue ++ } ++ + BundleInfo[] srcBundles = getBundlesFromFile(srcBundlesTxt, home); +- if (srcBundles == null || srcBundles.length == 0) { ++ if (srcBundles != null && srcBundles.length > 0) { ++ allSrcBundles.addAll(Arrays.asList(srcBundles)); ++ } ++ if (allSrcBundles.size() == 0) { + return null; + } +- return srcBundles; ++ return allSrcBundles.toArray(new BundleInfo[0]); + } catch (IOException e) { + PDECore.log(e); + return null; +diff --git a/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt b/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt +index 0f71564d2..874580e04 100644 +--- a/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt ++++ b/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt +@@ -76,6 +76,7 @@ + ;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.repository.tools/${dot.classes} + ;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.touchpoint.eclipse/${dot.classes} + ;${rt.equinox.p2.bundles}/org.eclipse.equinox.simpleconfigurator.manipulator/${dot.classes} ++;${rt.equinox.p2.bundles}/org.eclipse.equinox.simpleconfigurator/${dot.classes} + + -breakiterator + -use +-- +2.28.0 + diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch new file mode 100644 index 0000000..e5e2f35 --- /dev/null +++ b/eclipse-secondary-arches.patch @@ -0,0 +1,122 @@ +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 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,16 @@ + unpack="false"/> + + ++ ++ ++ ++ ++ ++ + +--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2014-11-28 15:09:42.000000000 +0000 ++++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2014-11-28 16:52:00.315007846 +0000 +@@ -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 +@@ -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.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 +@@ -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.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 +@@ -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 ++requires.7.range = [$version$,$version$] ++requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true))) +--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2017-04-19 13:31:15.000000000 +0100 ++++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2017-04-23 16:58:34.022207885 +0100 +@@ -100,7 +100,7 @@ + "s390x") + defaultOSArch="s390x" + defaultJava=DEFAULT_JAVA_EXEC +- OUTPUT_DIR="$EXEC_DIR/contributed/$defaultWS/$defaultOS/$defaultOSArch" ++ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" + ;; + "aarch64") + defaultOSArch="aarch64" +--- a/rt.equinox.framework/pom.xml 2017-04-26 22:19:15.548461372 +0100 ++++ b/rt.equinox.framework/pom.xml 2017-04-26 22:20:41.348571492 +0100 +@@ -77,6 +77,18 @@ + bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64 + + ++ ++ build-native-launchers-gtk.linux.s390x ++ ++ ++ native ++ gtk.linux.s390x ++ ++ ++ ++ bundles/org.eclipse.equinox.launcher.gtk.linux.s390x ++ ++ + + + diff --git a/eclipse-support-symlink-bundles.patch b/eclipse-support-symlink-bundles.patch new file mode 100644 index 0000000..26de5cf --- /dev/null +++ b/eclipse-support-symlink-bundles.patch @@ -0,0 +1,156 @@ +From aabcf5acff194b807c4d0bcf68425c3452c90339 Mon Sep 17 00:00:00 2001 +From: Roland Grunberg +Date: Fri, 12 Sep 2014 10:27:14 -0400 +Subject: [PATCH] Add support for regenerating bundle versions for symlinks. + +When the version field in a bundle info file corresponds to a bundle +whose location is a symbolic link, the correct version should be +regenerated every time, in case a change has occured. + +Change-Id: Ifbe8efed2218a8a1250fd1ac59f0cdd6bdd5f309 +--- + .../META-INF/MANIFEST.MF | 1 + + .../utils/SimpleConfiguratorUtils.java | 106 ++++++++++++++++++++- + 2 files changed, 106 insertions(+), 1 deletion(-) + +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 +--- 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, + org.eclipse.osgi.service.datalocation;version="1.0.0";resolution:=optional, ++ org.eclipse.osgi.util;version="1.1.0", + org.osgi.framework;version="1.3.0", + org.osgi.framework.namespace;version="1.0.0", + org.osgi.framework.startlevel;version="1.0.0", +diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java +index ab69b88..d6bf121 100644 +--- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java ++++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java +@@ -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; ++import java.util.zip.ZipFile; + import org.eclipse.equinox.internal.simpleconfigurator.Activator; +-import org.osgi.framework.Version; ++import org.eclipse.osgi.util.ManifestElement; ++import org.osgi.framework.*; + + public class SimpleConfiguratorUtils { + +@@ -282,6 +286,16 @@ + String symbolicName = tok.nextToken().trim(); + String version = tok.nextToken().trim(); + URI location = parseLocation(tok.nextToken().trim()); ++ if (base != null) { ++ URI absLoc = URIUtil.append(base, location.toString()); ++ java.nio.file.Path absPath = java.nio.file.Paths.get(absLoc); ++ // Symbolic links may change outside Eclipse so regenerate proper bundle version. ++ if (Files.isSymbolicLink(absPath) && absPath.toFile().isFile()) { ++ // We can't depend on org.eclipse.equinox.internal.frameworkadmin.utils.Utils ++ Dictionary manifest = getOSGiManifest(absLoc); ++ version = manifest.get(Constants.BUNDLE_VERSION); ++ } ++ } + int startLevel = Integer.parseInt(tok.nextToken().trim()); + boolean markedAsStarted = Boolean.parseBoolean(tok.nextToken()); + BundleInfo result = new BundleInfo(symbolicName, version, location, startLevel, markedAsStarted); +@@ -420,4 +434,93 @@ + } + return lastModified; + } ++ ++ private static Dictionary getOSGiManifest(URI location) { ++ if (location == null) ++ return null; ++ // if we have a file-based URL that doesn't end in ".jar" then... ++ if (FILE_SCHEME.equals(location.getScheme())) ++ return basicLoadManifest(URIUtil.toFile(location)); ++ ++ try { ++ URL url = new URL("jar:" + location.toString() + "!/"); //$NON-NLS-1$//$NON-NLS-2$ ++ JarURLConnection jarConnection = (JarURLConnection) url.openConnection(); ++ ZipFile jar = jarConnection.getJarFile(); ++ ++ try { ++ ZipEntry entry = jar.getEntry(JarFile.MANIFEST_NAME); ++ if (entry == null) ++ return null; ++ ++ Map manifest = ManifestElement.parseBundleManifest(jar.getInputStream(entry), null); ++ return manifestToProperties(manifest); ++ } catch (BundleException e) { ++ return null; ++ } finally { ++ jar.close(); ++ } ++ } catch (IOException e) { ++ if (System.getProperty("osgi.debug") != null) { //$NON-NLS-1$ ++ System.err.println("location=" + location); //$NON-NLS-1$ ++ e.printStackTrace(); ++ } ++ } ++ return null; ++ } ++ ++ private static Dictionary basicLoadManifest(File bundleLocation) { ++ InputStream manifestStream = null; ++ ZipFile jarFile = null; ++ try { ++ try { ++ // Handle a JAR'd bundle ++ if (bundleLocation.isFile()) { ++ jarFile = new ZipFile(bundleLocation, ZipFile.OPEN_READ); ++ ZipEntry manifestEntry = jarFile.getEntry(JarFile.MANIFEST_NAME); ++ if (manifestEntry != null) { ++ manifestStream = jarFile.getInputStream(manifestEntry); ++ } ++ } else { ++ // we have a directory-based bundle ++ File bundleManifestFile = new File(bundleLocation, JarFile.MANIFEST_NAME); ++ if (bundleManifestFile.exists()) ++ manifestStream = new BufferedInputStream(new FileInputStream(new File(bundleLocation, JarFile.MANIFEST_NAME))); ++ } ++ } catch (IOException e) { ++ //ignore ++ } ++ ++ try { ++ Map manifest = ManifestElement.parseBundleManifest(manifestStream, null); ++ return manifestToProperties(manifest); ++ } catch (IOException ioe) { ++ return null; ++ } catch (BundleException e) { ++ return null; ++ } ++ } finally { ++ try { ++ if (manifestStream != null) ++ manifestStream.close(); ++ } catch (IOException e1) { ++ //Ignore ++ } ++ try { ++ if (jarFile != null) ++ jarFile.close(); ++ } catch (IOException e2) { ++ //Ignore ++ } ++ } ++ } ++ ++ private static Dictionary manifestToProperties(Map d) { ++ Iterator iter = d.keySet().iterator(); ++ Dictionary result = new Hashtable(); ++ while (iter.hasNext()) { ++ String key = iter.next(); ++ result.put(key, d.get(key)); ++ } ++ return result; ++ } + } diff --git a/eclipse-swt-avoid-javascript-at-build.patch b/eclipse-swt-avoid-javascript-at-build.patch new file mode 100644 index 0000000..1102eba --- /dev/null +++ b/eclipse-swt-avoid-javascript-at-build.patch @@ -0,0 +1,120 @@ +From dd7d5dd0a820b3efd1a7955a7b80c881a40ddafc Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Sat, 21 Mar 2020 15:29:00 +0000 +Subject: [PATCH] Avoid the need to have javascript interpreter in the build + root + +--- + .../bundles/binaries-parent/pom.xml | 17 ------ + .../bundles/org.eclipse.swt/buildSWT.xml | 53 ++++--------------- + 2 files changed, 11 insertions(+), 59 deletions(-) + +diff --git a/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml b/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml +index 4d209cfdc..eab439ae5 100644 +--- a/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml ++++ b/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml +@@ -75,23 +75,6 @@ + + + +- +- +- org.mozilla +- rhino-runtime +- 1.7.13 +- +- +- org.apache.ant +- ant +- 1.10.9 +- +- +- org.apache.ant +- ant-apache-bsf +- 1.10.9 +- +- + + + +diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml +index 9d4bb1b6f..6c1cdf690 100644 +--- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml ++++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml +@@ -409,27 +409,8 @@ + + + +- + +- +- Version=${swt_version}; New=${new_version}; New comma_ver=${new_comma_ver} ++ Version=${swt_version} + + + +@@ -559,11 +540,7 @@ + + + +- ++ + + + +@@ -709,23 +686,15 @@ + + + +- ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +-- +2.21.1 diff --git a/eclipse.spec b/eclipse.spec new file mode 100644 index 0000000..7624ef0 --- /dev/null +++ b/eclipse.spec @@ -0,0 +1,1447 @@ +# Set to build Eclipse without circular dependency to eclipse-pde, API +# generation and docs will not be built and a second run will be required, but +# this is a way to bootstrap Eclipse on secondary archs. +%bcond_with bootstrap + +Epoch: 1 + +%global eb_commit 83d8885ff232bbe9fc992c7f5583eba6c86fdaf6 +%global eclipse_rel %{version} +%global eclipse_tag R-%{eclipse_rel}-202012021800 + +%global _jetty_version 9.4.36 +%global _lucene_version 8.6.3 +%global _batik_version 1.13 +%global _asm_version 8.0.1 + +%global _emf_version 1:2.24.0 +%global _ecf_version 3.14.19 + +%ifarch s390x x86_64 aarch64 ppc64le + %global eclipse_arch %{_arch} +%endif + +# Desktop file information +%global app_name %{?app_name_prefix}%{!?app_name_prefix:Eclipse} +%global app_exec %{?app_exec_prefix} eclipse + +# Eclipse is arch-specific, but multilib agnostic +%global _eclipsedir %{_prefix}/lib/eclipse + +%if 0%{?fedora} || 0%{?rhel} > 7 || 0%{?eln} +%global use_wayland 1 +%else +%global use_wayland 0 +%endif + +# Glassfish EE APIs that moved to jakarta namespace +%if 0%{?fedora} >= 33 || 0%{?eln} +%global _jakarta_annotations jakarta.annotation-api +%global _jakarta_servlet_api jakarta.servlet-api +%global _jakarta_jsp_api javax.servlet.jsp-api +%global _jakarta_jsp org.glassfish.web.jakarta.servlet.jsp +%global _jakarta_el_api jakarta.el-api +%global _jakarta_el org.glassfish.jakarta.el +%else +%global _jakarta_annotations javax.annotation-api +%global _jakarta_servlet_api javax.servlet-api +%global _jakarta_jsp_api javax.servlet.jsp +%global _jakarta_jsp org.glassfish.web.javax.servlet.jsp +%global _jakarta_el_api javax.el-api +%global _jakarta_el com.sun.el.javax.el +%endif + +Summary: An open, extensible IDE +Name: eclipse +Version: 4.18 +Release: 1%{?dist} +License: EPL-2.0 +URL: https://www.eclipse.org/ + +Source0: https://download.eclipse.org/eclipse/downloads/drops4/%{eclipse_tag}/eclipse-platform-sources-%{eclipse_rel}.tar.xz + +# Can generate locally with: +# git archive --format=tar --prefix=org.eclipse.linuxtools.eclipse-build-%%{eb_commit}/ \ +# %%{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 + +# 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 + +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=377515 +Patch1: eclipse-p2-pick-up-renamed-jars.patch + +# Patch for this was contributed. Unlikely to be released. +Patch2: eclipse-ignore-version-when-calculating-home.patch + +# Explicit requirement on hamcrest where it is used directly +Patch3: explicit-hamcrest.patch + +# Add support for all arches supported by Fedora +Patch4: eclipse-secondary-arches.patch + +Patch5: eclipse-debug-symbols.patch + +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=408138 +Patch12: eclipse-fix-dropins.patch + +# Feature plugin definitions lock onto version of plugin at build-time. +# If plugin is external, updating it breaks the feature. (version changes) +# Workaround : Change definition to a 'requirement' +Patch13: eclipse-feature-plugins-to-category-ius.patch + +Patch14: eclipse-support-symlink-bundles.patch + +# Fix various JDT and PDE tests +Patch15: eclipse-fix-tests.patch + +# Droplet fixes +Patch17: eclipse-pde-tp-support-droplets.patch + +# Disable uses by default +Patch18: eclipse-disable-uses-constraints.patch + +# Droplet fixes +Patch19: eclipse-make-droplets-runnable.patch +Patch20: eclipse-disable-droplets-in-dropins.patch + +# Temporary measure until wayland improves +Patch21: prefer_x11_backend.patch + +# Fix errors when building ant launcher +Patch22: fix_ant_build.patch + +# Hide the p2 Droplets from cluttering Install Wizard Combo +Patch23: eclipse-hide-droplets-from-install-wizard.patch + +# Avoid the need for a javascript interpreter at build time +Patch24: eclipse-swt-avoid-javascript-at-build.patch + +# Avoid optional dep used only for tests +Patch25: eclipse-patch-out-fileupload-dep.patch + +# Force a clean on the restart after p2 operations +Patch26: force-clean-after-p2-operations.patch + +# Upstream no longer supports non-64bit arches +ExcludeArch: s390 %{arm} %{ix86} + +BuildRequires: java-11-openjdk-devel + +BuildRequires: maven-local +BuildRequires: tycho +BuildRequires: tycho-extras +BuildRequires: cbi-plugins +BuildRequires: maven-antrun-plugin +BuildRequires: maven-assembly-plugin +BuildRequires: maven-dependency-plugin +BuildRequires: maven-enforcer-plugin +BuildRequires: maven-install-plugin +BuildRequires: maven-shade-plugin +BuildRequires: xml-maven-plugin +BuildRequires: rsync +BuildRequires: make, gcc +BuildRequires: zip, unzip +BuildRequires: desktop-file-utils +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(nspr) +BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(xt) +BuildRequires: pkgconfig(xtst) +BuildRequires: pkgconfig(libsecret-1) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(webkit2gtk-4.0) +BuildRequires: icu4j >= 1:65.1 +BuildRequires: ant >= 1.10.9 +BuildRequires: ant-antlr ant-apache-bcel 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 +BuildRequires: apache-commons-logging +BuildRequires: apache-commons-codec +BuildRequires: apache-commons-jxpath +BuildRequires: osgi(org.apache.felix.gogo.shell) >= 1.1.0 +BuildRequires: osgi(org.apache.felix.gogo.command) >= 1.0.2 +BuildRequires: osgi(org.apache.felix.gogo.runtime) >= 1.1.0 +BuildRequires: felix-scr >= 2.1.16-4 +BuildRequires: osgi(org.eclipse.jetty.util) >= %{_jetty_version} +BuildRequires: osgi(org.eclipse.jetty.util.ajax) >= %{_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} +BuildRequires: lucene-analysis >= %{_lucene_version} +BuildRequires: lucene-queryparser >= %{_lucene_version} +BuildRequires: lucene-analyzers-smartcn >= %{_lucene_version} +BuildRequires: junit >= 4.12 +BuildRequires: junit5 >= 5.4.0 +BuildRequires: apiguardian +BuildRequires: hamcrest +BuildRequires: sat4j +BuildRequires: objectweb-asm >= %{_asm_version} +BuildRequires: sac +BuildRequires: batik-css >= %{_batik_version} +BuildRequires: batik-util >= %{_batik_version} +BuildRequires: google-gson +BuildRequires: xmlgraphics-commons >= 2.3 +BuildRequires: xml-commons-apis +BuildRequires: atinject +BuildRequires: eclipse-ecf-core >= %{_ecf_version} +BuildRequires: eclipse-emf-core >= %{_emf_version} +BuildRequires: eclipse-license2 +BuildRequires: glassfish-annotation-api +BuildRequires: glassfish-el-api >= 3.0.1 +BuildRequires: glassfish-el >= 3.0.1 +BuildRequires: glassfish-jsp-api >= 2.2.1-4 +BuildRequires: glassfish-jsp >= 2.2.5 +BuildRequires: glassfish-servlet-api >= 3.1.0 +BuildRequires: httpcomponents-core +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 +BuildRequires: eclipse-pde +%endif + +%description +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: gtk3 +Requires: webkitgtk4 + +%description swt +SWT Library for GTK+. + +%package equinox-osgi +Summary: Eclipse OSGi - Equinox +Provides: osgi(system.bundle) = %{epoch}:%{version} + +%description equinox-osgi +Eclipse OSGi - Equinox + +%package platform +Summary: Eclipse platform common files +Requires: java-11-openjdk-devel +Requires: javapackages-tools +Obsoletes: eclipse-usage < 4.17.0-1 + +Requires: ant >= 1.10.9 +Requires: ant-antlr ant-apache-bcel 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: apache-commons-logging +Requires: apache-commons-codec +Requires: 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: felix-scr >= 2.1.16-4 +Requires: osgi(org.eclipse.jetty.util) >= %{_jetty_version} +Requires: osgi(org.eclipse.jetty.util.ajax) >= %{_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} +Requires: lucene-analysis >= %{_lucene_version} +Requires: lucene-queryparser >= %{_lucene_version} +Requires: lucene-analyzers-smartcn >= %{_lucene_version} +Requires: batik-css >= %{_batik_version} +Requires: batik-util >= %{_batik_version} +Requires: xmlgraphics-commons >= 2.3 +Requires: xml-commons-apis +Requires: atinject +Requires: eclipse-ecf-core >= %{_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 +Requires: glassfish-jsp-api >= 2.2.1-4 +Requires: glassfish-jsp >= 2.2.5 +Requires: glassfish-servlet-api >= 3.1.0 +Requires: icu4j >= 1:65.1 +Requires: %{name}-swt = %{epoch}:%{version}-%{release} +Requires: %{name}-equinox-osgi = %{epoch}:%{version}-%{release} +Requires: httpcomponents-core +Requires: httpcomponents-client + +# Obsoletes added in F31 +Obsoletes: eclipse-epp-logging <= 2.0.8-4 +Obsoletes: eclipse-abrt <= 0.0.3-10 + +# No longer shipping tests and contrib tools since F33 +Obsoletes: %{name}-tests < 1:4.17-4 +Obsoletes: %{name}-contributor-tools < 1:4.17-4 + +%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} +Requires: junit >= 4.12 +Requires: junit5 >= 5.4.0 +Requires: osgi(org.hamcrest.core) + +# Obsoletes added in F30 +Obsoletes: eclipse-recommenders <= 2.5.4-5 + +%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} +Requires: objectweb-asm >= %{_asm_version} + +%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. + +%prep +%setup -T -c + +# Extract main source +tar --strip-components=1 -xf %{SOURCE0} + +# Extract linuxtools/eclipse-build sources +tar --strip-components=1 -xf %{SOURCE1} + +# Delete pre-built binary artifacts except some test data that cannot be generated +find . ! -path "*/JCL/*" ! -name "rtstubs*.jar" ! -name "javax15api.jar" ! -name "j9stubs.jar" ! -name "annotations.jar" \ + -type f -name *.jar -delete +find . -type f -name *.class -delete +find . -type f -name *.so -delete +find . -type f -name *.dll -delete +find . -type f -name *.jnilib -delete + +# Remove pre-compiled native launchers +rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/ + +%patch0 +%patch1 +%patch2 -p1 +%patch3 +%patch4 -p1 +%patch5 +%patch12 +%patch13 -p1 +%patch14 +%patch15 +%patch17 -p1 +%patch18 +%patch19 +%patch20 +%if ! %{use_wayland} +# Enable wayland by default on F27+ +%patch21 +%endif +%patch22 +%patch23 -p1 +%patch24 -p1 +%patch25 +%patch26 -p1 + +# Optional (unused) multipart support (see patch 25) +rm rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/multipart/MultipartSupport{Impl,FactoryImpl,Part}.java + +# ASM still on 8 +sed -i -e 's/V16/V15/' -e 's/ASM9/ASM8/' eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/src/main/java/org/eclipse/jdt/launching/internal/weaving/ClassfileTransformer.java eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Util.java +sed -i -e '/org.objectweb.asm/s/9\.0\.0/8.0.0/' eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF + +# Remove jgit deps because building from source tarball, not a git repo +%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 + +# Resolving the target platform requires too many changes, so don't use it +%pom_xpath_remove "pom:configuration/pom:target" eclipse-platform-parent + +# Disable as many products as possible to make the build faster, we care only for the IDE +%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 + +# Disable bundles that we don't ship as part of the remaining products +%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.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 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.artifact.checksums.bouncycastle rt.equinox.p2 + +# Don't need annotations for obsolete JDKs +%pom_disable_module org.eclipse.jdt.annotation_v1 eclipse.jdt.core +%pom_xpath_remove "plugin[@version='1.1.500.qualifier']" eclipse.jdt/org.eclipse.jdt-feature/feature.xml + +# javax.annotation -> jakarta.annotation-api +# javax.servlet -> jakarta.servlet-api +# javax.el -> jakarta.el-api +# javax.servlet.jsp -> jakarta.servlet.jsp-api +sed -i -e 's/javax.annotation/%{_jakarta_annotations}/' -e 's/javax.servlet\([^.]\)/%{_jakarta_servlet_api}\1/' \ + -e 's/javax.el/%{_jakarta_el_api}/' -e 's/com.sun.el/%{_jakarta_el}/' \ + -e 's/javax.servlet.jsp/%{_jakarta_jsp_api}/' -e 's/org.apache.jasper.glassfish/%{_jakarta_jsp}/' \ + eclipse-platform-parent/pom.xml \ + eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml \ + eclipse.platform.common/bundles/org.eclipse.*/pom.xml \ + eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt \ + eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml \ + rt.equinox.bundles/features/org.eclipse.equinox.server.{jetty,simple}/feature.xml + +# Fix requirement on junit 4 +sed -i -e 's/4.13.0,5.0.0/4.12.0,5.0.0/' eclipse.jdt.ui/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java + +# Disable examples +%pom_disable_module infocenter-web eclipse.platform.ua +%pom_disable_module examples rt.equinox.p2 +%pom_disable_module examples eclipse.platform.ui +%pom_disable_module org.eclipse.debug.examples.core eclipse.platform.debug +%pom_disable_module org.eclipse.debug.examples.memory eclipse.platform.debug +%pom_disable_module org.eclipse.debug.examples.mixedmode eclipse.platform.debug +%pom_disable_module org.eclipse.debug.examples.ui eclipse.platform.debug +%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 examples/org.eclipse.compare.examples eclipse.platform.team +%pom_disable_module examples/org.eclipse.compare.examples.xml eclipse.platform.team +%pom_disable_module examples/org.eclipse.team.examples.filesystem eclipse.platform.team +%pom_disable_module org.eclipse.jface.text.examples eclipse.platform.text +%pom_disable_module org.eclipse.ui.examples.javaeditor eclipse.platform.text +%pom_disable_module org.eclipse.ui.genericeditor.examples eclipse.platform.text +%pom_disable_module org.eclipse.ui.intro.quicklinks.examples eclipse.platform.ua +%pom_disable_module org.eclipse.ui.intro.solstice.examples eclipse.platform.ua +%pom_disable_module org.eclipse.jdt.ui.examples.projects eclipse.jdt.ui +%pom_disable_module org.eclipse.jdt.ui.junit.sampleproject eclipse.jdt.ui + +# Disable tests +for pom in eclipse.jdt.core{,.binaries} eclipse.jdt.debug eclipse.jdt.ui eclipse.pde.build eclipse.pde.ui{,/apitools} \ + eclipse.platform eclipse.platform.debug eclipse.platform.releng eclipse.platform.resources eclipse.platform.runtime \ + eclipse.platform.swt eclipse.platform.team eclipse.platform.text eclipse.platform.ui eclipse.platform.ua \ + rt.equinox.bundles rt.equinox.framework rt.equinox.p2 ; do + sed -i -e '/.*tests.*<\/module>/d' $pom/pom.xml +done +%pom_disable_module bundles/org.eclipse.equinox.frameworkadmin.test rt.equinox.p2 +%pom_disable_module eclipse-junit-tests eclipse.platform.releng.tychoeclipsebuilder +%pom_disable_module ./tests/org.eclipse.e4.tools.test eclipse.platform.ui.tools + +# Disable test framework if we are not shipping tests +%pom_disable_module features/org.eclipse.test-feature eclipse.platform.releng +%pom_disable_module bundles/org.eclipse.test eclipse.platform.releng +%pom_disable_module bundles/org.eclipse.test.performance eclipse.platform.releng +%pom_disable_module bundles/org.eclipse.test.performance.win32 eclipse.platform.releng +%pom_disable_module bundles/org.eclipse.ant.optional.junit eclipse.platform.releng + +# Disable servletbridge stuff +%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 + +# Don't need enforcer on RPM builds +%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.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 s390x +done + +# Remove platform-specific stuff that we don't care about to reduce build time +# (i.e., all bundles that are not applicable to the current build platform -- +# this reduces the build time on arm by around 20 minutes per architecture that +# we are not currently building) +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 + module=$(grep ">bundles/$b<" eclipse.platform.swt.binaries/pom.xml || :) + if [ -n "$module" ] ; then + %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 b in `ls rt.equinox.framework/bundles | grep -P -e 'org.eclipse.equinox.launcher\.(?!gtk\.linux.%{eclipse_arch}$)'` ; do + module=$(grep ">bundles/$b<" rt.equinox.framework/pom.xml || :) + if [ -n "$module" ] ; then + %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 b in `(cd rt.equinox.bundles/bundles && ls -d *{macosx,win32,linux}*) | grep -P -e 'org.eclipse.equinox.security\.(?!linux\.%{eclipse_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 b in `ls eclipse.platform.team/bundles/ | grep -P -e 'org.eclipse.core.net\.(?!linux.%{eclipse_arch}$)'` ; do + %pom_disable_module bundles/$b eclipse.platform.team +done +for b in `ls eclipse.platform.resources/bundles/ | grep -P -e 'org.eclipse.core.filesystem\.(?!linux\.%{eclipse_arch}$)'` ; do + module=$(grep ">bundles/$b<" eclipse.platform.resources/pom.xml || :) + if [ -n "$module" ] ; then + %pom_disable_module bundles/$b eclipse.platform.resources + fi +done +%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 +%pom_disable_module org.eclipse.e4.ui.swt.win32 eclipse.platform.ui/bundles +%pom_disable_module bundles/org.eclipse.core.resources.win32.x86_64 eclipse.platform.resources +%pom_disable_module bundles/org.eclipse.swt.browser.chromium eclipse.platform.swt +%pom_xpath_remove -f "plugin[@id='org.eclipse.swt.browser.chromium.gtk.linux.x86_64']" eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml +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']" $f + %pom_xpath_remove -f "plugin[@os='win32']" $f + %pom_xpath_remove -f "plugin[@ws='win32']" $f + for arch in x86_64 aarch64 ppc64le s390x ; do + if [ "$arch" != "%{eclipse_arch}" ] ; then + %pom_xpath_remove -f "plugin[@arch='$arch']" $f + fi + done +done + +# Fix javadoc generation relying on Windows version of SWT +sed -i -e '/swt/s/swt.win32.win32.x86_64/swt.gtk.linux.%{eclipse_arch}/' eclipse.platform.common/bundles/org.eclipse*/*Options.txt + +# Bundles requires a Java 1.8 feature +sed -i -e 's/JavaSE-1.7/JavaSE-1.8/' rt.equinox.framework/bundles/org.eclipse.osgi.{util,services}/META-INF/MANIFEST.MF \ + rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/{build.properties,META-INF/MANIFEST.MF} + +# Disable contributor tools +%pom_disable_module eclipse.platform.ui.tools +%pom_disable_module features/org.eclipse.swt.tools.feature eclipse.platform.swt +%pom_disable_module bundles/org.eclipse.swt.tools.base eclipse.platform.swt +%pom_disable_module bundles/org.eclipse.swt.tools.spies eclipse.platform.swt +%pom_disable_module bundles/org.eclipse.swt.tools eclipse.platform.swt +%pom_disable_module features/org.eclipse.releng.tools eclipse.platform.releng +%pom_disable_module bundles/org.eclipse.releng.tools eclipse.platform.releng + +# Include some extra features with the product that some other projects may need at +# build time as part of their target platform definitions +sed -i -e '//a' \ + eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product + +# Ensure batch compiler gets installed correctly +%pom_xpath_inject 'feature' '' \ + 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 + +# Don't set perms on files for platforms that aren't linux +for f in rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties; do + grep '^root\.linux\.gtk\.%{eclipse_arch}[.=]' $f > tmp + sed -i -e '/^root\./d' $f && cat tmp >> $f +done + +# Hack - this can go away once upstream grows arm and aarch64 support +mkdir -p rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch} + +# Ensure that bundles with native artifacts are dir-shaped, so no *.so is extracted into user.home +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.linux.*/META-INF/MANIFEST.MF ; do + echo -e "Eclipse-BundleShape: dir\n\n" >> $f; +done + +# Build fake ant bundle that contains symlinks to system jars +dependencies/fake_ant_dependency.sh + +# Allow usage of javax.servlet.jsp 2.3. +sed -i '/javax\.servlet\.jsp/ s/2\.3/2\.4/' rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF + +# Fix constraint on gogo runtime +sed -i -e '/org.apache.felix.service.command/s/;status=provisional//' rt.equinox.bundles/bundles/org.eclipse.equinox.console{,.ssh}/META-INF/MANIFEST.MF + +# Pre-compiling JSPs does not currently work +%pom_remove_plugin org.eclipse.jetty:jetty-jspc-maven-plugin eclipse.platform.ua/org.eclipse.help.webapp + +# Make maven output less noisy due to lack of intenet connection +sed -i -e '/baselineMode/s/warn/disable/' eclipse-platform-parent/pom.xml + +# Use system osgi.annotation lib +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/ + +# The order of these mvn_package calls is important +%mvn_package "::pom::" __noinstall +%mvn_package "::jar:sources{,-feature}:" sdk +%mvn_package ":org.eclipse.jdt.doc.isv" sdk +%mvn_package ":org.eclipse.platform.doc.isv" sdk +%mvn_package ":org.eclipse.equinox.executable" sdk +%mvn_package "org.eclipse.jdt{,.feature}:" jdt +%mvn_package ":org.eclipse.ant.{launching,ui}" jdt +%mvn_package ":org.eclipse.equinox.p2.discovery.{feature,compatibility}" p2-discovery +%mvn_package ":org.eclipse.equinox.p2{,.ui}.discovery" p2-discovery +%mvn_package "org.eclipse.cvs{,.feature}:" cvs +%mvn_package "org.eclipse.team:org.eclipse.team.cvs*" cvs +%mvn_package "org.eclipse.pde{,.ui,.feature}:" pde +%mvn_package ":org.eclipse.pde.api.tools*" pde +%mvn_package "org.eclipse.ui:org.eclipse.ui.trace" pde +%mvn_package "org.eclipse.sdk{,.feature}:" sdk +%mvn_package ":" __noinstall + +%build +# Compiler/linker flags for native parts +export CFLAGS="%{optflags}" +export LDFLAGS="%{__global_ldflags}" +export M_CFLAGS="$CFLAGS" +export M_ARCH="$LDFLAGS" + +#This is the lowest value where the build succeeds. 512m is not enough. +export MAVEN_OPTS="-Dfile.encoding=UTF-8 -Xmx1024m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}" + +# TODO: Fix bug in the tycho installation +xmvn -o install:install-file -Dtycho.mode=maven -Dfile=%{_javadir}/tycho/tycho-lib-detector.jar -DpomFile=%{_mavenpomdir}/tycho/tycho-lib-detector.pom + +# Pre-build agent jar needed for AdvancedSourceLookupSupport +(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 generated from last modification time of source tarball +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} + -P!api-generation,!build-docs \ +%endif + -Declipse.javadoc=%{_jvmdir}/java-11/bin/javadoc -Dnative=gtk.linux.%{eclipse_arch} \ + -Dtycho.local.keepTarget -DskipRust=true -DskipJni=true \ + -Dfedora.p2.repos=$(pwd)/.m2/p2/repo-sdk/plugins -DbuildType=X + +# Location that the product is materialised +product="eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}" + +# Re-symlink ant bundle to use system jars +dependencies/fake_ant_dependency.sh $product/eclipse/plugins/org.apache.ant_* + +# Symlink necessary plugins that are provided by other packages +dependencies/replace_platform_plugins_with_symlinks.sh $product/eclipse %{_javadir} %{_jnidir} + +pushd $product/eclipse + +#clean up +rm -rf configuration/org.eclipse.core.runtime +rm -rf configuration/org.eclipse.equinox.app +rm -rf configuration/org.eclipse.update +rm -rf configuration/org.eclipse.osgi +rm -rf p2/org.eclipse.equinox.p2.core/cache/* +# no icon needed +rm -f icon.xpm + +# EMF and ECF are packaged separately +rm -rf features/org.eclipse.emf.* plugins/org.eclipse.emf.* \ + features/org.eclipse.ecf.* plugins/org.eclipse.ecf.* plugins/org.eclipse.ecf_* + +#delete all local repositories. We want to have only "original" by default. +pushd p2/org.eclipse.equinox.p2.engine/.settings + 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 + +# ini file adjustements +sed -i "s|-Xms40m|-Xms512m|g" eclipse.ini +sed -i "s|-Xmx512m|-Xmx1024m|g" eclipse.ini +sed -i '1i-protect\nroot' eclipse.ini +sed -i '/-vmargs/i-vm\n%{_jvmdir}/java-11/bin/java' eclipse.ini + +# Temporary fix until https://bugs.eclipse.org/294877 is resolved +cat >> eclipse.ini < %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} + +%files swt -f .mfiles-swt +%{_eclipsedir}/plugins/org.eclipse.swt_* +%{_eclipsedir}/plugins/org.eclipse.swt.gtk.linux.* +%{_eclipsedir}/swt.jar +%{_jnidir}/swt.jar + +%files platform +%{_bindir}/eclipse +%{_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 %{_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/javax.* +%if 0%{?fedora} >= 33 || 0%{?eln} +%{_eclipsedir}/plugins/jakarta.* +%{_eclipsedir}/plugins/org.glassfish.jakarta.el_* +%{_eclipsedir}/plugins/org.glassfish.web.jakarta.servlet.jsp_* +%else +%{_eclipsedir}/plugins/com.sun.el.javax.el_* +%{_eclipsedir}/plugins/org.glassfish.web.javax.servlet.jsp_* +%endif +%{_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.ide_* +%{_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.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.jface.notifications_* +%{_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.text.quicksearch_* +%{_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/com.sun.jna_* +%{_eclipsedir}/plugins/com.sun.jna.platform_* +%{_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_* +%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 +%{_datadir}/appdata/eclipse-pde.metainfo.xml + +%files p2-discovery -f .mfiles-p2-discovery + +%files equinox-osgi -f .mfiles-equinox-osgi +%{_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 +* Fri Jan 15 2021 Mat Booth - 1:4.18-1 +- Update to latest upstream release + +* Wed Nov 18 2020 Mat Booth - 1:4.17-4 +- Drop contributor-tools sub-package +- Remove workaround for old ASM version + +* Wed Nov 11 2020 Mat Booth - 1:4.17-3 +- Obsolete usage plugin and ensure encoding in use is UTF-8 during the build + +* Fri Nov 6 2020 Mat Booth - 1:4.17-2 +- Fix build on non-intel arches + +* 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 + +* Tue Aug 25 2020 Mat Booth - 1:4.16-13 +- Platform actually requires OpenJDK devel package for ct.sym + +* Mon Aug 24 2020 Mat Booth - 1:4.16-12 +- Rebuild against new jakarta-el,-jsp packages +- Fix javadoc generation relying on Windows version of SWT + +* Fri Aug 21 2020 Mat Booth - 1:4.16-11 +- Rebuild with a dependency on obsolete log4j package +- Run mvn_install with Java 11 + +* Wed Aug 19 2020 Mat Booth - 1:4.16-10 +- Rebuild against jakarta servlet API and updated batik +- Update eclipse-build snapshot + +* Fri Aug 14 2020 Mat Booth - 1:4.16-9 +- Restore explicit glassfish-annotation-api dep + +* Fri Aug 14 2020 Mat Booth - 1:4.16-8 +- Rebuild for new jetty version + +* Mon Jul 27 2020 Fedora Release Engineering - 1:4.16-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 21 2020 Mat Booth - 1:4.16-6 +- Require Java 11 explicitly +- Drop hotspot exclusions from the JDK 6 era + +* Fri Jul 10 2020 Jiri Vanek - 1:4.16-5 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Mon Jun 29 2020 Mat Booth - 1:4.16-4 +- Update linux-build snapshot and fix adding junit classpath containers to java + projects + +* Tue Jun 23 2020 Mat Booth - 1:4.16-3 +- Make a bit more portable and fix bootstrap mode + +* Fri Jun 19 2020 Mat Booth - 1:4.16-2 +- Non-bootstrap build + +* Thu Jun 18 2020 Mat Booth - 1:4.16-1 +- Update to latest upstream release + +* Thu Apr 02 2020 Mat Booth - 1:4.15-5 +- Make the requirement on felix-scr more strict + +* Thu Apr 02 2020 Mat Booth - 1:4.15-4 +- Allow library detector to build on Java 11 + +* Sun Mar 29 2020 Mat Booth - 1:4.15-3 +- Don't build and ship the test framework. We are not shipping any actual tests + anyway and this allows to drop the dependency on mockito and friends. + +* Mon Mar 23 2020 Mat Booth - 1:4.15-2 +- Set compiler release to Java 8 on certain bundles + +* Sat Mar 21 2020 Mat Booth - 1:4.15-1 +- Update to latest upstream release + +* Tue Jan 28 2020 Mat Booth - 1:4.14-5 +- Backport patch to fix build against GCC 10 + +* Thu Jan 23 2020 Mat Booth - 1:4.14-4 +- Remove BR on bouncycastle + +* Thu Jan 23 2020 Mat Booth - 1:4.14-3 +- Remove references to kxml/xpp3 + +* Thu Dec 19 2019 Mat Booth - 1:4.14-2 +- Full build +- Drop tests sub-package + +* Thu Dec 19 2019 Mat Booth - 1:4.14-1 +- Update to latest upstream release + +* Thu Dec 19 2019 Mat Booth - 1:4.13-7 +- Bump requirements on EMF/ECF + +* Wed Dec 18 2019 Mat Booth - 1:4.13-6 +- Remove unnecessary dep on apache-commons-el +- Enable bootstrap mode + +* Wed Nov 20 2019 Mat Booth - 1:4.13-5 +- Obsolete retired packages + +* Mon Sep 23 2019 Mat Booth - 1:4.13-4 +- Add patch for ebz#550606 + +* Mon Sep 23 2019 Mat Booth - 1:4.13-3 +- Fix explicit hamcrest reqs + +* Mon Sep 16 2019 Mat Booth - 1:4.13-2 +- Fix PDE installation + +* Mon Sep 09 2019 Mat Booth - 1:4.13-1 +- Update to latest upstream release + +* Wed Jul 24 2019 Mat Booth - 1:4.12-6 +- Reenable normal debuginfo generation for the launcher binary on Fedora + +* Thu Jun 27 2019 Mat Booth - 1:4.12-5 +- Fix NoClassDefFoundError regression in ant support + +* Thu Jun 20 2019 Mat Booth - 1:4.12-4 +- Fix deps on batik stack + +* Thu Jun 20 2019 Mat Booth - 1:4.12-3 +- Disable more examples and allow contrib-tools mode to build properly + +* Wed Jun 19 2019 Mat Booth - 1:4.12-2 +- Additional fixes for ebz548211 + +* Mon Jun 17 2019 Mat Booth - 1:4.12-1 +- Update to 2019-06 release + +* Sun Jun 16 2019 Mat Booth - 1:4.11-15 +- Rebuild against new Jetty, ECF and EMF + +* Wed Jun 12 2019 Mat Booth - 1:4.11-14 +- Full rebuild + +* Wed Jun 12 2019 Mat Booth - 1:4.11-13 +- Add patch for lucene 8 and rebootstrap + +* Thu May 30 2019 Mat Booth - 1:4.11-12 +- Avoid requirement on optional test dependency commons-fileupload + +* Fri May 24 2019 Mat Booth - 1:4.11-11 +- Clean up unused maven metadata + +* Fri May 24 2019 Mat Booth - 1:4.11-10 +- Add missing BR on google-gson + +* Thu May 23 2019 Mat Booth - 1:4.11-9 +- Bump deps on batik and xmlgraphics + +* Tue May 07 2019 Mat Booth - 1:4.11-8 +- Re-instate junit5 dep since dependent modules were fixed + +* Wed May 01 2019 Mat Booth - 1:4.11-7 +- Bump requirements on Jetty +- Avoid reliance on Javascript in SWT build + +* Tue Apr 30 2019 Mat Booth - 1:4.11-6 +- Disable hard requirement on ant-junit5 + +* Thu Apr 25 2019 Mat Booth - 1:4.11-5 +- Fix bootstrap mode to use bcond flags +- Bump requirements on Jetty, SCR and ICU4j + +* Wed Apr 10 2019 Mat Booth - 1:4.11-4 +- Obsolete recommenders package, rhbz#1698504 + +* Tue Mar 19 2019 Mat Booth - 1:4.11-3 +- Pre-strip debuginfo from the launcher binary to avoid conflicts with other RCP + applications, which will use identical launcher binaries + +* Thu Mar 14 2019 Mat Booth - 1:4.11-2 +- Full build + +* Mon Mar 11 2019 Mat Booth - 1:4.11-1 +- Update to 2019-03 release +- Drop support for 32-bit architectures + +* Thu Jan 31 2019 Fedora Release Engineering - 1:4.10.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jan 10 2019 Mat Booth - 1:4.10.0-2 +- No longer recommend Code Recommenders + +* 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 +- Update requirements on EMF and ECF + +* Tue Dec 04 2018 Mat Booth - 1:4.10.0-0.2 +- Allow building on Fedora 29 + +* Thu Nov 29 2018 Mat Booth - 1:4.10.0-0.1 +- Update to latest I-build +- Enable bootstrap mode + +* Fri Sep 28 2018 Jeff Johnston - 1:4.9.0-2 +- Add org.eclipse.equinox.executable for building RCP apps + +* Wed Sep 12 2018 Mat Booth - 1:4.9.0-1 +- Update to final bits for 4.9 +- Fix NPE due to missing agent jar + +* Thu Aug 23 2018 Mat Booth - 1:4.9.0-0.4 +- Update to latest I-build +- Full non-bootstrap build + +* Wed Aug 22 2018 Mat Booth - 1:4.9.0-0.3 +- Fix prefer x11 patch used on RHEL + +* Mon Aug 20 2018 Mat Booth - 1:4.9.0-0.2 +- Fix secondary arch build + +* Sun Aug 19 2018 Mat Booth - 1:4.9.0-0.1 +- Update to latest I-build +- Update license + +* Thu Jul 12 2018 Fedora Release Engineering - 1:4.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jun 25 2018 Mat Booth - 1:4.8.0-3 +- Add patch to use gsettings instead of gconf + +* Wed Jun 13 2018 Mat Booth - 1:4.8.0-2 +- Backport patches for ebz#533655 and ebz#535392 + +* Tue Jun 12 2018 Mat Booth - 1:4.8.0-1 +- Update to Photon release + +* Thu Jun 07 2018 Mat Booth - 1:4.8.0-0.8 +- Update to last RC of Photon + +* Mon May 21 2018 Mat Booth - 1:4.8.0-0.7 +- Updated I-build +- Switch to using upstream tarball +- Disable unused annotation bundle + +* Mon May 21 2018 Mat Booth - 1:4.8.0-0.6 +- Rebuild to correct permissions + +* Tue May 15 2018 Mat Booth - 1:4.8.0-0.5 +- Rebuild against Photon EMF and ECF versions +- Updated I-build + +* Thu May 03 2018 Mat Booth - 1:4.8.0-0.4 +- Updated I-build +- Attempt to fix arm platform launchers + +* Wed May 02 2018 Mat Booth - 1:4.8.0-0.3 +- Non-bootstrap build + +* Sat Apr 28 2018 Mat Booth - 1:4.8.0-0.2 +- Update to latest I-build and fix build on 32bit intel platform +- Tighten deps on batik to prevent runtime bundle resolution errors + +* Tue Apr 24 2018 Mat Booth - 1:4.8.0-0.1 +- Update to Photon I-build +- Remove conditional for webkit2 (always use it now) +- Bump requirement on lucene + +* Tue Apr 10 2018 Mat Booth - 1:4.7.3a-4 +- Ensure patches apply cleanly +- Use java API stubs from ecj package + +* Mon Apr 09 2018 Mat Booth - 1:4.7.3a-3 +- Package java 10 API stubs jar + +* Mon Apr 09 2018 Mat Booth - 1:4.7.3a-2 +- Backport patches to fix broken table editing + +* Mon Apr 09 2018 Mat Booth - 1:4.7.3a-1 +- Update to Oxygen.3a release for java 10 support + +* Wed Mar 21 2018 Mat Booth - 1:4.7.3-2 +- Bump jetty dependency + +* Thu Mar 15 2018 Mat Booth - 1:4.7.3-1 +- Update to Oxygen.3 release + +* Wed Feb 07 2018 Fedora Release Engineering - 1:4.7.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Jan 09 2018 Merlin Mathesius - 1:4.7.2-2 +- Cleanup spec file conditionals + +* Wed Nov 29 2017 Mat Booth - 1:4.7.2-1 +- Update to last RC/final release of Oxygen.2 +- Fix x11 crash when running on wayland + +* Fri Nov 24 2017 Mat Booth - 1:4.7.2-0.2 +- Update to latest RC of Oxygen.2 + +* Tue Nov 21 2017 Mat Booth - 1:4.7.2-0.1 +- Update to latest RC of Oxygen.2 + +* Fri Nov 17 2017 Mat Booth - 1:4.7.1-8 +- Make java 9 api stubs available for use +- Migrate away from deprecated maven depmap macros + +* Wed Oct 18 2017 Mat Booth - 1:4.7.1-7 +- Update to 4.7.1a release + +* Mon Oct 02 2017 Mat Booth - 1:4.7.1-6 +- Use the jit on 32bit arm to speed up the build + +* Mon Oct 02 2017 Mat Booth - 1:4.7.1-5 +- Drop workaround for metainfo problem +- Add patch for javascript/webkit2 bug ebz#525340 +- Add missing mocking deps for contributor-tools + +* Tue Sep 19 2017 Mat Booth - 1:4.7.1-4 +- Add workaround for appstream metainfo bug in RPM on F27 + +* Tue Sep 19 2017 Mat Booth - 1:4.7.1-3 +- Obsolete e4-importer that was moved into platform +- Add recommends on recommenders from JDT + +* Fri Sep 15 2017 Mat Booth - 1:4.7.1-2 +- Debootstrap build + +* Fri Sep 15 2017 Mat Booth - 1:4.7.1-1 +- Update to Oxygen.1 release +- Relax restriction on objectweb-asm + +* Wed Aug 02 2017 Fedora Release Engineering - 1:4.7.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1:4.7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Jul 04 2017 Mat Booth - 1:4.7.0-2 +- Use 'protect root' instead of 'protect master' + +* Fri Jun 30 2017 Mat Booth - 1:4.7.0-1 +- Update to final Oxygen release +- Bump jetty requirement + +* Thu Jun 15 2017 Mat Booth - 1:4.7.0-0.14 +- Update to latest release candidate build +- Rebuild for latest EMF and ECF +- Drop nashorn extension mechanism + +* Wed May 31 2017 Mikolaj Izdebski - 1:4.7.0-0.13 +- Add missing build-requires on Maven plugins +- Run xmvn in batch mode + +* Thu May 18 2017 Mat Booth - 1:4.7.0-0.12 +- Enable Wayland backend by default on F27+ +- Bump some dependency requirements + +* Tue May 16 2017 Mat Booth - 1:4.7.0-0.11 +- Update to latest I-build +- Rebuild for latest EMF + +* Tue May 09 2017 Mat Booth - 1:4.7.0-0.10 +- Rebuild for new ECF +- Obsolete core NLS package +- Fix cycle introduced between tests and contributor-tools + +* Sat May 06 2017 Mat Booth - 1:4.7.0-0.9 +- Fix build against new felix-gogo +- Update to latest I-build + +* Wed May 03 2017 Mat Booth - 1:4.7.0-0.8 +- Package missing PDE generic editor extension + +* Tue May 02 2017 Mat Booth - 1:4.7.0-0.7 +- Rebuild for s390x +- Don't require JDK directly + +* Fri Apr 28 2017 Mat Booth - 1:4.7.0-0.6 +- Non-bootstrap build + +* Tue Apr 25 2017 Mat Booth - 1:4.7.0-0.5 +- Update to latest I-build +- Update generated ant bundle to 1.10.1 +- Fix missing launcher bundle on s390, rhbz#1445162 +- Add missing BR on libsecret + +* Fri Apr 21 2017 Mat Booth - 1:4.7.0-0.4 +- Fix secondary arch build + +* Thu Apr 20 2017 Mat Booth - 1:4.7.0-0.3 +- Simplify test installation and move machinery out of javadir now + that java stuff is installed in its own place +- Enable bootstrap mode + +* Wed Apr 19 2017 Mat Booth - 1:4.7.0-0.2 +- Update to latest I-build + +* Tue Apr 04 2017 Mat Booth - 1:4.7.0-0.1 +- Update to Oxygen I-build +- Don't build unsupported GTK2 backend for SWT +- Move installation to a multilib agnostic location /usr/lib + diff --git a/explicit-hamcrest.patch b/explicit-hamcrest.patch new file mode 100644 index 0000000..064b594 --- /dev/null +++ b/explicit-hamcrest.patch @@ -0,0 +1,59 @@ +--- 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.1.100" + Automatic-Module-Name: org.eclipse.urischeme.tests + Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +-Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)" ++Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)", ++ org.hamcrest.core;bundle-version="1.3.0" +--- eclipse.pde.ui/ui/org.eclipse.pde.ui.templates.tests/META-INF/MANIFEST.MF.orig 2019-06-20 11:25:47.959981490 +0100 ++++ eclipse.pde.ui/ui/org.eclipse.pde.ui.templates.tests/META-INF/MANIFEST.MF 2019-06-20 11:26:06.444935061 +0100 +@@ -9,6 +9,7 @@ + Require-Bundle: org.eclipse.pde.ui;bundle-version="3.10.0", + org.eclipse.pde.ui.templates;bundle-version="3.6.0", + org.junit;bundle-version="4.13.0", ++ org.hamcrest.core;bundle-version="1.3.0", + org.eclipse.core.runtime;bundle-version="3.13.0", + org.eclipse.core.resources;bundle-version="3.12.0", + org.eclipse.ui.ide;bundle-version="3.13.0", +--- eclipse.platform.text/org.eclipse.text.tests/META-INF/MANIFEST.MF.orig 2019-09-21 16:37:52.645515694 +0100 ++++ eclipse.platform.text/org.eclipse.text.tests/META-INF/MANIFEST.MF 2019-09-21 16:38:25.034443980 +0100 +@@ -13,6 +13,7 @@ + org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", + org.eclipse.text;bundle-version="[3.6.3,4.0.0)", ++ org.hamcrest.core;bundle-version="1.3.0", + org.junit;bundle-version="4.12.0" + Bundle-RequiredExecutionEnvironment: JavaSE-1.8 + Eclipse-BundleShape: dir +--- eclipse.pde.ui/ui/org.eclipse.pde.junit.runtime.tests/META-INF/MANIFEST.MF.orig 2019-09-21 17:06:17.944749329 +0100 ++++ eclipse.pde.ui/ui/org.eclipse.pde.junit.runtime.tests/META-INF/MANIFEST.MF 2019-09-21 17:06:43.846692344 +0100 +@@ -9,6 +9,7 @@ + Bundle-ActivationPolicy: lazy + Eclipse-BundleShape: dir + Require-Bundle: org.junit, ++ org.hamcrest.core;bundle-version="1.3.0", + org.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 @@ + Bundle-Activator: org.eclipse.pde.ui.tests.PDETestsPlugin + Bundle-Vendor: Eclipse.org + Require-Bundle: org.junit, ++ org.hamcrest.core, + org.eclipse.pde.ui, + org.eclipse.ui, + org.eclipse.core.resources, diff --git a/fix_ant_build.patch b/fix_ant_build.patch new file mode 100644 index 0000000..40f51d8 --- /dev/null +++ b/fix_ant_build.patch @@ -0,0 +1,161 @@ +--- 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 +@@ -23,18 +23,14 @@ + about.html + + jars.compile.order = .,\ +- lib/loggers.jar +-# antdebug.jar and remote.jar are compiled locally using 1.6, see bug 495617: +-# lib/antdebug.jar,\ +-# lib/remote.jar ++ lib/antdebug.jar,\ ++ lib/loggers.jar,\ ++ lib/remote.jar + source.lib/loggers.jar = loggers/ + output.lib/loggers.jar = loggers_bin/ +-extra.lib/loggers.jar = lib/antdebug.jar +-#source.lib/antdebug.jar = common/ +-#output.lib/antdebug.jar = common_bin/ +-#source.lib/remote.jar = remote/ +-#output.lib/remote.jar = remote_bin/ +-src.includes = about.html,\ +- remote/,\ +- common/ ++source.lib/antdebug.jar = common/ ++output.lib/antdebug.jar = common_bin/ ++source.lib/remote.jar = remote/ ++output.lib/remote.jar = remote_bin/ ++src.includes = about.html + javacWarnings..=-unavoidableGenericProblems +--- eclipse.platform/ant/org.eclipse.ant.ui/build.properties.orig 2017-04-03 18:40:41.033489412 +0100 ++++ eclipse.platform/ant/org.eclipse.ant.ui/build.properties 2017-04-03 18:43:21.614928391 +0100 +@@ -17,8 +17,8 @@ + source.lib/antrunner.jar = Ant Runner Support/ + output.lib/antrunner.jar = ant_runner_support_bin/ + # Compiled with 1.6 locally, see bug 495617: +-#source.lib/remoteAnt.jar = Remote Ant Support/ +-#output.lib/remoteAnt.jar = remote_support_bin/ ++source.lib/remoteAnt.jar = Remote Ant Support/ ++output.lib/remoteAnt.jar = remote_support_bin/ + src.includes = about.html,\ + about_files/,\ + Remote Ant Support/ +@@ -34,6 +34,5 @@ + lib/antrunner.jar,\ + lib/remoteAnt.jar,\ + css/ +-jars.compile.order=.,lib/antrunner.jar +-# ,lib/remoteAnt.jar ++jars.compile.order=.,lib/antrunner.jar,lib/remoteAnt.jar + javacWarnings..=-unavoidableGenericProblems +--- 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/force-clean-after-p2-operations.patch b/force-clean-after-p2-operations.patch new file mode 100644 index 0000000..4b03d1f --- /dev/null +++ b/force-clean-after-p2-operations.patch @@ -0,0 +1,80 @@ +From d964680827a248e8a312c000c4c2443f96c8c459 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Fri, 27 Sep 2019 14:52:54 +0100 +Subject: [PATCH] Force a clean on the restart after p2 operations + +--- + .../META-INF/MANIFEST.MF | 2 +- + .../bundles/org.eclipse.equinox.launcher/pom.xml | 2 +- + .../src/org/eclipse/equinox/launcher/Main.java | 13 +++++++++++++ + .../internal/p2/ui/ProvisioningOperationRunner.java | 6 ++++++ + 4 files changed, 21 insertions(+), 2 deletions(-) + +diff --git a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF +index 497e5d6fa..a118a0e4c 100644 +--- a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF ++++ b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF +@@ -2,7 +2,7 @@ Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: %pluginName + Bundle-SymbolicName: org.eclipse.equinox.launcher;singleton:=true +-Bundle-Version: 1.6.0.qualifier ++Bundle-Version: 1.6.1.qualifier + Main-Class: org.eclipse.equinox.launcher.Main + Bundle-ClassPath: . + Bundle-Vendor: %providerName +diff --git a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml +index 43849b5b8..c5d2cdfea 100644 +--- a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml ++++ b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml +@@ -19,6 +19,6 @@ + + org.eclipse.equinox + org.eclipse.equinox.launcher +- 1.6.0-SNAPSHOT ++ 1.6.1-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 +index d013ff7c2..65f4cfd8a 100644 +--- a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java ++++ b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java +@@ -560,6 +560,18 @@ + setupVMProperties(); + processConfiguration(); + ++ File oca = new File(getConfigurationLocation().toURI()); ++ File ocaFile = new File(oca, "clean_on_restart"); ++ if (ocaFile.exists()) { ++ System.err.println("Clean triggered."); //$NON-NLS-1$ ++ ocaFile.delete(); ++ commands = Arrays.copyOf(args, args.length + 1); ++ commands[commands.length-1] = CLEAN; ++ passThruArgs = Arrays.copyOf(passThruArgs, passThruArgs.length + 1); ++ passThruArgs[passThruArgs.length-1] = CLEAN; ++ setupVMProperties(); ++ } ++ + if (protectBase && (System.getProperty(PROP_SHARED_CONFIG_AREA) == null)) { + System.err.println("This application is configured to run in a cascaded mode only."); //$NON-NLS-1$ + System.setProperty(PROP_EXITCODE, Integer.toString(14)); +diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvisioningOperationRunner.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvisioningOperationRunner.java +index a70b640ba..8a002ebc2 100644 +--- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvisioningOperationRunner.java ++++ b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvisioningOperationRunner.java +@@ -72,6 +72,12 @@ public class ProvisioningOperationRunner { + * @param restartPolicy + */ + void requestRestart(final int restartPolicy) { ++ String oca = System.getProperty("osgi.configuration.area"); ++ try { ++ java.io.File ocaCleanFile = new java.io.File(new java.net.URL(oca).toURI()); ++ new java.io.File(ocaCleanFile, "clean_on_restart").createNewFile(); ++ } catch (Exception e) { /* Eh, we tried... */ } ++ + // Global override of restart (used in test cases). + if (suppressRestart) + return; +-- +2.20.1 + diff --git a/prefer_x11_backend.patch b/prefer_x11_backend.patch new file mode 100644 index 0000000..838ab61 --- /dev/null +++ b/prefer_x11_backend.patch @@ -0,0 +1,14 @@ +--- 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 + ++ char *gdkBackend = getenv("GDK_BACKEND"); ++ if (gdkBackend == NULL) { ++ setenv("GDK_BACKEND", "x11", 0); ++ } ++ + void *gioLib = NULL, *glibLib = NULL, *gdkLib = NULL, *gtkLib = NULL, *objLib = NULL, *pixLib = NULL; + + gdkLib = dlopen(GDK3_LIB, DLFLAGS); diff --git a/sources b/sources new file mode 100644 index 0000000..c30dab9 --- /dev/null +++ b/sources @@ -0,0 +1,2 @@ +SHA512 (org.eclipse.linuxtools.eclipse-build-83d8885ff232bbe9fc992c7f5583eba6c86fdaf6.tar.xz) = ee1e0c9370e0c9d6bc4f3f300b7fc6a234bd4a8b251e801a2cd5844ad3ccf92b890140a01fd6323ab565e1b8354cfd9cfb80f749fb3edeeb8c2f3175097dd190 +SHA512 (eclipse-platform-sources-4.18.tar.xz) = 9ffe27a6e36e4666c0ba2a597ffce7419206f9b58cccd686b54bd5a68b6aa0e0385c941f4b7704ce06e5bdf71cd5e048ff672f6de503617e21e92873f3672ff3 diff --git a/toolchains.xml b/toolchains.xml new file mode 100644 index 0000000..a044b1a --- /dev/null +++ b/toolchains.xml @@ -0,0 +1,110 @@ + + + jdk + + CDC-1.0/Foundation-1.0 + + + /usr/lib/jvm/java-1.8.0 + + + + jdk + + CDC-1.1/Foundation-1.1 + + + /usr/lib/jvm/java-1.8.0 + + + + + + jdk + + OSGi/Minimum-1.0 + + + /usr/lib/jvm/java-1.8.0 + + + + jdk + + OSGi/Minimum-1.1 + + + /usr/lib/jvm/java-1.8.0 + + + + jdk + + OSGi/Minimum-1.2 + + + /usr/lib/jvm/java-1.8.0 + + + + + + jdk + + J2SE-1.4 + + + /usr/lib/jvm/java-1.8.0 + + + + jdk + + J2SE-1.5 + + + /usr/lib/jvm/java-1.8.0 + + + + jdk + + JavaSE-1.6 + + + /usr/lib/jvm/java-1.8.0 + + + + jdk + + JavaSE-1.7 + + + /usr/lib/jvm/java-1.8.0 + + + + jdk + + JavaSE-1.8 + + + /usr/lib/jvm/java-1.8.0 + + + + jdk + + JavaSE-11 + + + /usr/lib/jvm/java-11 + + + + + + + +