diff --git a/eclipse.spec b/eclipse.spec index c15e10b..902f440 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -42,7 +42,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: 4.14 -Release: 4%{?dist} +Release: 5%{?dist} License: EPL-2.0 URL: http://www.eclipse.org/ @@ -125,6 +125,9 @@ Patch26: fix-ant-execution.patch # Force a clean on the restart after p2 operations Patch27: force-clean-after-p2-operations.patch +# Backported from: https://bugs.eclipse.org/bugs/show_bug.cgi?id=559637 +Patch28: fix-build-gcc-10.patch + # Upstream no longer supports non-64bit arches ExcludeArch: s390 %{arm} %{ix86} @@ -407,6 +410,7 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/ %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 @@ -1067,6 +1071,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* 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 diff --git a/fix-build-gcc-10.patch b/fix-build-gcc-10.patch new file mode 100644 index 0000000..4ab2bc3 --- /dev/null +++ b/fix-build-gcc-10.patch @@ -0,0 +1,25 @@ +From 39e14aa3c638f36173f2a8747f524b9273857bee Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Tue, 28 Jan 2020 15:57:33 +0000 +Subject: [PATCH] Bug 559637 - SWT fails to build with GCC 10 + +Fixes build failure caused by global variable with multiple definitions +by declaring it with "extern" in the header + +Change-Id: Id34c07cddde21baa4c00e97eb4a457855c37906c +Signed-off-by: Mat Booth +--- + +diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h +index e56bd8f..8389585 100644 +--- "a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h" ++++ "b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h" +@@ -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))