diff --git a/eclipse.spec b/eclipse.spec index 90ea4d29f9a3684cb01c8a07193bf39390f973be..743a670226bd71b4518efff1a569db35612afe63 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -11,7 +11,7 @@ Name: eclipse Epoch: 1 Version: 4.11 -Release: 2 +Release: 3 Summary: An open, extensible IDE License: EPL-2.0 URL: http://www.eclipse.org/ @@ -35,6 +35,7 @@ Patch27: eclipse-disable-droplets-in-dropins.patch Patch28: prefer_x11_backend.patch Patch29: fix_ant_build.patch Patch30: eclipse-hide-droplets-from-install-wizard.patch +Patch31: org-eclipse-swt.patch ExcludeArch: s390 %{arm} %{ix86} BuildRequires: maven-local tycho tycho-extras cbi-plugins maven-antrun-plugin BuildRequires: maven-assembly-plugin maven-dependency-plugin maven-enforcer-plugin @@ -201,6 +202,7 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/ %endif %patch29 %patch30 -p1 +%patch31 rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/accessibility/Bug543949_ComponentExtentsTest.py %pom_remove_dep :tycho-buildtimestamp-jgit eclipse-platform-parent %pom_remove_dep :tycho-sourceref-jgit eclipse-platform-parent @@ -743,6 +745,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Sat Jul 31 2021 liping - 1:4.11-3 +- fix by upgrade to GCC-10 + * Tue Aug 25 2020 yanan li - 1:4.11-2 - modify the bootstrap parameter to 1 diff --git a/org-eclipse-swt.patch b/org-eclipse-swt.patch new file mode 100644 index 0000000000000000000000000000000000000000..bd1ba02afcccb7ff05c9d4b4a7dde7b16d953bcd --- /dev/null +++ b/org-eclipse-swt.patch @@ -0,0 +1,11 @@ +--- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h.org" 2021-08-02 13:18:59.832947231 +0800 ++++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h" 2021-08-02 13:19:34.425509217 +0800 +@@ -105,7 +105,7 @@ + glong g_utf8_offset_to_utf16_offset(const gchar*, glong); + + // Cached JVM pointer: see bug 521487. +-JavaVM *cached_jvm; ++extern JavaVM *cached_jvm; + + #define SWT_TYPE_FIXED (swt_fixed_get_type ()) + #define SWT_FIXED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SWT_TYPE_FIXED, SwtFixed))