From d804206c7eb6a7f8482c52fcb01b2977b564dfdb Mon Sep 17 00:00:00 2001 From: chen-jan Date: Tue, 24 May 2022 01:31:22 +0000 Subject: [PATCH] fixed compilation error --- eclipse.spec | 8 +++++++- fixed-compilation-error.patch | 25 +++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 fixed-compilation-error.patch diff --git a/eclipse.spec b/eclipse.spec index 2f13727..86228e4 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -11,7 +11,7 @@ Name: eclipse Epoch: 1 Version: 4.11 -Release: 4 +Release: 5 Summary: An open, extensible IDE License: EPL-2.0 URL: http://www.eclipse.org/ @@ -42,6 +42,8 @@ Patch32: switch-to-the-new-httpclient45-ECF-provider.patch Patch33: Remove-ECF-httpclient-dependency-from-p2-test.patch #Patch from: https://git.eclipse.org/r/plugins/gitiles/platform/eclipse.platform.releng/+/3b93e4149e92a4d567a2c040c6953311b9fdb135 Patch34: BUILD-FAILED-with-compilation-failure-in-org-eclipse-test.patch +#Patch from: https://git.eclipse.org/c/platform/eclipse.platform.ui.git/commit/?id=3cf23b7d8b0fc4e57f18118cb6fc92a8e6de0490 +Patch35: fixed-compilation-error.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 @@ -212,6 +214,7 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/ %patch32 %patch33 %patch34 +%patch35 -p1 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 @@ -754,6 +757,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Tue May 24 2022 chenchen - 1:4.11-5 +- fixed compilation error in ImageDescriptor.createImage(boolean, Device) + * Fri May 06 2022 chenchen - 1:4.11-4 - switch to the new httpclient45 ECF provider - remove ECF httpclient dependency from p2 test diff --git a/fixed-compilation-error.patch b/fixed-compilation-error.patch new file mode 100644 index 0000000..cb9813a --- /dev/null +++ b/fixed-compilation-error.patch @@ -0,0 +1,25 @@ +From 4403040e9ca286d234c3029e19453c0cb8f7d875 Mon Sep 17 00:00:00 2001 +From: chen-jan +Date: Mon, 23 May 2022 06:50:59 +0000 +Subject: [PATCH] test.patch + +--- + .../src/org/eclipse/jface/resource/ImageDescriptor.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eclipse.platform.ui/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ImageDescriptor.java b/eclipse.platform.ui/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ImageDescriptor.java +index afc0eb49d..4622f4e53 100644 +--- a/eclipse.platform.ui/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ImageDescriptor.java ++++ b/eclipse.platform.ui/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ImageDescriptor.java +@@ -290,7 +290,7 @@ public abstract class ImageDescriptor extends DeviceResourceDescriptor { + * this fails. + */ + try { +- return new Image(device, this::getImageData); ++ return new Image(device, (ImageDataProvider) this::getImageData); + } catch (IllegalArgumentException | SWTException e) { + if (returnMissingImageOnError) { + try { +-- +2.30.0 + -- Gitee