From 8b9553ea8e773726eb1ba7d2577cb22ac33bb4b3 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Apr 08 2021 12:10:55 +0000 Subject: Cleanup spec file - No longer prefer x11 - Remove test patches as tests are no longer executed - Organize patches - Remove useless BRs --- diff --git a/eclipse-fix-tests.patch b/eclipse-fix-tests.patch deleted file mode 100644 index a946757..0000000 --- a/eclipse-fix-tests.patch +++ /dev/null @@ -1,280 +0,0 @@ ---- 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.spec b/eclipse.spec index ff0ef0c..ef431d3 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -32,12 +32,6 @@ Epoch: 1 # 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 @@ -58,7 +52,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: 4.19 -Release: 3%{?dist} +Release: 4%{?dist} License: EPL-2.0 URL: https://www.eclipse.org/ @@ -93,40 +87,34 @@ Patch6: 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 +Patch7: eclipse-feature-plugins-to-category-ius.patch -# Fix various JDT and PDE tests -Patch15: eclipse-fix-tests.patch +Patch8: eclipse-support-symlink-bundles.patch # Droplet fixes -Patch17: eclipse-pde-tp-support-droplets.patch +Patch9: eclipse-pde-tp-support-droplets.patch # Disable uses by default -Patch18: eclipse-disable-uses-constraints.patch +Patch10: 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 +Patch11: eclipse-make-droplets-runnable.patch +Patch12: eclipse-disable-droplets-in-dropins.patch # Fix errors when building ant launcher -Patch22: fix_ant_build.patch +Patch13: fix_ant_build.patch # Hide the p2 Droplets from cluttering Install Wizard Combo -Patch23: eclipse-hide-droplets-from-install-wizard.patch +Patch14: 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 +Patch15: eclipse-swt-avoid-javascript-at-build.patch # Avoid optional dep used only for tests -Patch25: eclipse-patch-out-fileupload-dep.patch +Patch16: eclipse-patch-out-fileupload-dep.patch # Force a clean on the restart after p2 operations -Patch26: force-clean-after-p2-operations.patch +Patch17: force-clean-after-p2-operations.patch # Upstream no longer supports non-64bit arches ExcludeArch: s390 %{arm} %{ix86} @@ -141,7 +129,6 @@ 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 @@ -150,13 +137,11 @@ 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 @@ -368,22 +353,17 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/ %patch4 -p1 %patch5 %patch6 -%patch13 -p1 -%patch14 -%patch15 +%patch7 -p1 +%patch8 +%patch9 -p1 +%patch10 +%patch11 +%patch12 +%patch13 +%patch14 -p1 +%patch15 -p1 +%patch16 %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 @@ -1057,6 +1037,12 @@ find $RPM_BUILD_ROOT/%{_eclipsedir} -name *.so -exec chmod a+x {} \; %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Thu Apr 8 2021 Alexander Kurtakov 1:4.19-4 +- No longer prefer x11 +- Remove test patches as tests are no longer executed +- Organize patches +- Remove useless BRs + * Thu Mar 11 2021 Mat Booth - 1:4.19-3 - Avoid shipping macos-specific JDT bundles @@ -1481,4 +1467,3 @@ find $RPM_BUILD_ROOT/%{_eclipsedir} -name *.so -exec chmod a+x {} \; - 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/prefer_x11_backend.patch b/prefer_x11_backend.patch deleted file mode 100644 index 838ab61..0000000 --- a/prefer_x11_backend.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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);