diff --git a/ebz569853-1.patch b/ebz569853-1.patch deleted file mode 100644 index 37039cf..0000000 --- a/ebz569853-1.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 2684843e3d22bb177a6c6b21c3ee75f3bb3d250e Mon Sep 17 00:00:00 2001 -From: Simeon Andreev -Date: Mon, 21 Dec 2020 12:52:01 +0100 -Subject: Bug 569853 - jstack crashes Eclipse when running on Java 11 - -1) Always call DetachCurrentThread if AttachCurrentThreadAsDaemon was -called before, see -https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/invocation.html#detaching_from_the_vm. - -2) Specify JNI 1.4 version in JNI_OnLoad, see -https://docs.oracle.com/en/java/javase/11/docs/specs/jni/invocation.html#jni_onload - -3) Added printf around attach/detach for easier debugging. - -4) Fixed build.sh to allow c99 standard for the for loop defined in -DEBUG_CALL_PRINTS and resolve compilation error below if -DEBUG_CALL_PRINTS is enabled: - -callback.c:1252:3: error: 'for' loop initial declarations are only -allowed in C99 mode - -Main change is 1), it is a workaround for jstack / JVM bug described in -https://bugzilla.redhat.com/show_bug.cgi?id=1897150 - -Change-Id: I3ba32d9bef217e5ffc76b8802e7e59de503a2161 ---- - .../Eclipse SWT/common/library/callback.c | 28 +++++++++------------- - .../Eclipse SWT/common/library/swt.c | 6 +---- - .../Eclipse SWT/common/library/swt.h | 1 - - 4 files changed, 13 insertions(+), 24 deletions(-) - -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c -index 1e37e28810..0bd7b87a77 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c -@@ -1298,24 +1298,15 @@ jlong callback(int index, ...) - } - #endif - --#ifdef JNI_VERSION_1_2 -- if (IS_JNI_1_2) { -- (*JVM)->GetEnv(JVM, (void **)&env, JNI_VERSION_1_2); -- } --#endif -- --#ifdef JNI_VERSION_1_4 -- if (env == NULL) { -- if (JNI_VERSION >= JNI_VERSION_1_4) { -- (*JVM)->AttachCurrentThreadAsDaemon(JVM, (void **)&env, NULL); -- } -- } -+(*JVM)->GetEnv(JVM, (void **)&env, JNI_VERSION_1_4); -+ -+if (env == NULL) { -+ (*JVM)->AttachCurrentThreadAsDaemon(JVM, (void **)&env, NULL); -+#ifdef DEBUG_CALL_PRINTS -+ fprintf(stderr, "SWT-JNI: AttachCurrentThreadAsDaemon\n"); - #endif -- -- if (env == NULL) { -- (*JVM)->AttachCurrentThread(JVM, (void **)&env, NULL); -- if (IS_JNI_1_2) detach = 1; -- } -+ detach = 1; -+} - - /* If the current thread is not attached to the VM, it is not possible to call into the VM */ - if (env == NULL) { -@@ -1391,6 +1382,9 @@ done: - - if (detach) { - (*JVM)->DetachCurrentThread(JVM); -+#ifdef DEBUG_CALL_PRINTS -+ fprintf(stderr, "SWT-JNI: DetachCurrentThread\n"); -+#endif - env = NULL; - } - -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.c -index e78a2e4811..483aae2d47 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.c -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.c -@@ -14,16 +14,12 @@ - - #include "swt.h" - --int IS_JNI_1_2 = 0; - JavaVM *JVM = NULL; - --#ifdef JNI_VERSION_1_2 - JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { -- IS_JNI_1_2 = 1; - JVM = vm; -- return JNI_VERSION_1_2; -+ return JNI_VERSION_1_4; - } --#endif - - void throwOutOfMemory(JNIEnv *env) { - jclass clazz = (*env)->FindClass(env, "java/lang/OutOfMemoryError"); -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.h b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.h -index fa228e9971..32f39f01bd 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.h -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.h -@@ -29,7 +29,6 @@ - extern "C" { - #endif - --extern int IS_JNI_1_2; - extern JavaVM *JVM; - - /* #define DEBUG */ --- -cgit v1.2.1 - diff --git a/ebz569853-2.patch b/ebz569853-2.patch deleted file mode 100644 index 6a8f1f0..0000000 --- a/ebz569853-2.patch +++ /dev/null @@ -1,49 +0,0 @@ -From de8045341dd4eda05a98db2157ead188ab21a899 Mon Sep 17 00:00:00 2001 -From: Andrey Loskutov -Date: Tue, 22 Dec 2020 12:40:46 +0100 -Subject: Bug 569853 - reverted build file change causing crash on native - dialog - -Change on the build script was required to compile callback.c with -#define DEBUG_CALL_PRINTS for debug output. - -Turned out, this change compiles something that GTK code can't -understand & so it crashes with SIGSEGV on opening native file dialog. - -# Problematic frame: -# C [libglib-2.0.so.0+0x39757] g_path_is_absolute+0x7 - -Java frames: (J=compiled Java code, j=interpreted, Vv=VM code) -j org.eclipse.swt.internal.gtk.GTK.gtk_file_chooser_set_current_folder(JJ)V+0 -j org.eclipse.swt.widgets.FileDialog.presetChooserDialog()V+599 -j org.eclipse.swt.widgets.FileDialog.openNativeChooserDialog()Ljava/lang/String;+104 -j org.eclipse.swt.widgets.FileDialog.open()Ljava/lang/String;+1 -j org.eclipse.ui.internal.ide.actions.OpenLocalFileAction.run()V+35 -j org.eclipse.ui.internal.ide.actions.OpenLocalFileAction.run(Lorg/eclipse/jface/action/IAction;)V+1 - -Change-Id: I225525d41c41ae90e9f8e30eb53baae18f527634 -Signed-off-by: Andrey Loskutov ---- - -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c -index 0bd7b87a77..df33e672e2 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c -@@ -1244,12 +1244,13 @@ - - #ifdef DEBUG_CALL_PRINTS - { -+ int i; - va_list vaCopy; - va_copy(vaCopy, vl); - - counter++; - fprintf(stderr, "SWT-JNI:%*scallback[%d](", counter, "", index); -- for (int i=0; i @@ -497,7 +497,6 @@ index 767a93df9..293525308 100644 + + + -+ + + + @@ -624,20 +623,6 @@ index 767a93df9..293525308 100644 - -- -- - diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch index 244c665..50712db 100644 --- a/eclipse-secondary-arches.patch +++ b/eclipse-secondary-arches.patch @@ -59,7 +59,7 @@ index 7e1f520..734dd10 100644 --- 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.cocoa.macosx.arm64 bundles/org.eclipse.swt.gtk.linux.aarch64 bundles/org.eclipse.swt.gtk.linux.ppc64le + bundles/org.eclipse.swt.gtk.linux.s390x diff --git a/eclipse.spec b/eclipse.spec index 72d0ba5..1c28131 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -9,8 +9,8 @@ Epoch: 1 %global eb_commit 83d8885ff232bbe9fc992c7f5583eba6c86fdaf6 -%global eclipse_rel %{version} -%global eclipse_tag R-%{eclipse_rel}-202012021800 +%global eclipse_rel %{version}RC2 +%global eclipse_tag S-%{eclipse_rel}-202103031800 %global _jetty_version 9.4.36 %global _lucene_version 8.6.3 @@ -18,7 +18,7 @@ Epoch: 1 %global _asm_version 8.0.1 %global _junit5_version 5.7.0 -%global _emf_version 1:2.24.0 +%global _emf_version 1:2.25.0 %global _ecf_version 3.14.19 %ifarch s390x x86_64 aarch64 ppc64le @@ -57,8 +57,8 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse -Version: 4.18 -Release: 4%{?dist} +Version: 4.19 +Release: 1%{?dist} License: EPL-2.0 URL: https://www.eclipse.org/ @@ -128,10 +128,6 @@ Patch25: eclipse-patch-out-fileupload-dep.patch # Force a clean on the restart after p2 operations Patch26: force-clean-after-p2-operations.patch -# Upstream fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=569853 -Patch27: ebz569853-1.patch -Patch28: ebz569853-2.patch - # Upstream no longer supports non-64bit arches ExcludeArch: s390 %{arm} %{ix86} @@ -388,8 +384,6 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/ %patch24 -p1 %patch25 %patch26 -p1 -%patch27 -p1 -%patch28 -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 @@ -433,7 +427,6 @@ sed -i -e 's/9\.0/8.0.1/' eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/ %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 @@ -451,7 +444,8 @@ sed -i -e 's/javax.annotation/%{_jakarta_annotations}/' -e 's/javax.servlet\([^. 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 + rt.equinox.bundles/features/org.eclipse.equinox.server.{jetty,simple}/feature.xml \ + eclipse.platform.runtime/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF # 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 @@ -536,6 +530,8 @@ done # Don't need enforcer on RPM builds %pom_remove_plugin :maven-enforcer-plugin eclipse-platform-parent +# And moditect is not present +%pom_remove_plugin :moditect-maven-plugin rt.equinox.framework/bundles/org.eclipse.osgi # This part generates secondary fragments using primary fragments %pom_xpath_inject "pom:plugin[pom:artifactId='target-platform-configuration']/pom:configuration/pom:environments" \ @@ -935,7 +931,6 @@ find $RPM_BUILD_ROOT/%{_eclipsedir} -name *.so -exec chmod a+x {} \; %{_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_* @@ -1056,6 +1051,9 @@ find $RPM_BUILD_ROOT/%{_eclipsedir} -name *.so -exec chmod a+x {} \; %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Thu Mar 11 2021 Mat Booth - 1:4.19-1 +- Update to 2021-03 release + * Tue Mar 09 2021 Mat Booth - 1:4.18-4 - Simplify platform-specific bundle disablement now that perf is less of an issue (i.e. no 32bit arm) diff --git a/force-clean-after-p2-operations.patch b/force-clean-after-p2-operations.patch index 4b03d1f..16272d4 100644 --- a/force-clean-after-p2-operations.patch +++ b/force-clean-after-p2-operations.patch @@ -18,8 +18,8 @@ index 497e5d6fa..a118a0e4c 100644 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.launcher;singleton:=true --Bundle-Version: 1.6.0.qualifier -+Bundle-Version: 1.6.1.qualifier +-Bundle-Version: 1.6.100.qualifier ++Bundle-Version: 1.6.101.qualifier Main-Class: org.eclipse.equinox.launcher.Main Bundle-ClassPath: . Bundle-Vendor: %providerName @@ -31,8 +31,8 @@ index 43849b5b8..c5d2cdfea 100644 org.eclipse.equinox org.eclipse.equinox.launcher -- 1.6.0-SNAPSHOT -+ 1.6.1-SNAPSHOT +- 1.6.100-SNAPSHOT ++ 1.6.101-SNAPSHOT eclipse-plugin diff --git a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java diff --git a/sources b/sources index c30dab9..7f558ac 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (org.eclipse.linuxtools.eclipse-build-83d8885ff232bbe9fc992c7f5583eba6c86fdaf6.tar.xz) = ee1e0c9370e0c9d6bc4f3f300b7fc6a234bd4a8b251e801a2cd5844ad3ccf92b890140a01fd6323ab565e1b8354cfd9cfb80f749fb3edeeb8c2f3175097dd190 -SHA512 (eclipse-platform-sources-4.18.tar.xz) = 9ffe27a6e36e4666c0ba2a597ffce7419206f9b58cccd686b54bd5a68b6aa0e0385c941f4b7704ce06e5bdf71cd5e048ff672f6de503617e21e92873f3672ff3 +SHA512 (eclipse-platform-sources-4.19RC2.tar.xz) = 404651907bcc946c868864da917f059f05c16e1c6249d0a89a925d3a9df2461017bdfd610dd30ce2e4db7b16a7b4afa8479db9617649025ad057305cedda0db1