!15 fix build error caused by GCC upgrade to 10

From: @lipingEmmaSiguyi
Reviewed-by: @small_leek,@wangchong1995924
Signed-off-by: @wangchong1995924
This commit is contained in:
openeuler-ci-bot 2021-08-03 11:28:45 +00:00 committed by Gitee
commit ff810a71ad
2 changed files with 17 additions and 1 deletions

View File

@ -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<liping136@huawei.com> - 1:4.11-3
- fix by upgrade to GCC-10
* Tue Aug 25 2020 yanan li <liyanan032@huawei.com> - 1:4.11-2
- modify the bootstrap parameter to 1

11
org-eclipse-swt.patch Normal file
View File

@ -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))