packages/eclipse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!24 Fix build error in openEuler-Mainline

Browse Source 
From: @bzg1107 
Reviewed-by: @wangchong1995924 
Signed-off-by: @wangchong1995924
This commit is contained in:
openeuler-ci-bot 2022-06-23 08:05:21 +00:00 committed by Gitee
commit 18d957eb24
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 72 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
eclipse.spec
View File

@ -11,7 +11,7 @@
Name: eclipse
Epoch: 1
Version: 4.11
Release: 5
Release: 6
Summary: An open, extensible IDE
License: EPL-2.0
URL: http://www.eclipse.org/
@ -44,6 +44,7 @@ Patch33: Remove-ECF-httpclient-dependency-from-p2-test.patch
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
Patch36: fix-objectweb-asm-version-to-increase.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
@ -215,6 +216,7 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
%patch33
%patch34
%patch35 -p1
%patch36 -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
@ -581,7 +583,7 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
%{_eclipsedir}/features/org.eclipse.rcp_*
%{_eclipsedir}/plugins/com.ibm.icu_*
%{_eclipsedir}/plugins/com.jcraft.jsch_*
%{_eclipsedir}/plugins/com.sun.el.javax.el_*
%{_eclipsedir}/plugins/jakarta.el-api_*
%{_eclipsedir}/plugins/javax.*
%{_eclipsedir}/plugins/org.apache.*
%{_eclipsedir}/plugins/org.eclipse.ant.core_*
@ -757,6 +759,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
* Tue Jun 21 2022 baizhonggui <baizhonggui@h-partners.com> - 1:4.11-6
- fixed objectweb.asm version limit
* Tue May 24 2022 chenchen <chen_aka_jan@163.com> - 1:4.11-5
- fixed compilation error in ImageDescriptor.createImage(boolean, Device)

65
fix-objectweb-asm-version-to-increase.patch Normal file
View File

@ -0,0 +1,65 @@
From 80c753b73258d29a51eead88e0aa6169e1560822 Mon Sep 17 00:00:00 2001
From: baizg1107 <preloyalwhite@163.com>
Date: Tue, 14 Jun 2022 11:47:31 +0800
Subject: [PATCH] fix objectweb-asm version to increase
---
.../org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF | 4 ++--
.../apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF | 4 ++--
.../features/org.eclipse.help-feature/feature.xml | 3 +--
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF
index d8e329ec8..8fb77a70f 100644
--- a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF
+++ b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF
@@ -22,9 +22,9 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.jdt.core.tests.builder;bundle-version="[3.8.0,4.0.0)",
org.eclipse.jdt.core.tests.compiler;bundle-version="[3.8.0,4.0.0)",
org.eclipse.ant.core,
- org.objectweb.asm;bundle-version="[6.0.0,8.0.0)",
+ org.objectweb.asm;bundle-version="[6.0.0,10.0.0)",
org.eclipse.jface;bundle-version="3.8.0",
- org.objectweb.asm.tree;bundle-version="[6.0.0,8.0.0)"
+ org.objectweb.asm.tree;bundle-version="[6.0.0,10.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.pde.api.tools.anttasks.tests,
org.eclipse.pde.api.tools.apiusescan.tests,
diff --git a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF
index b3028afde..d593b9347 100644
--- a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF
+++ b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF
@@ -14,12 +14,12 @@ Require-Bundle: org.eclipse.osgi;bundle-version="[3.4.0,4.0.0)",
org.eclipse.text;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.filebuffers;bundle-version="[3.4.0,4.0.0)",
org.eclipse.ant.core;bundle-version="[3.1.300,4.0.0)",
- org.objectweb.asm;bundle-version="[6.0.0,8.0.0)",
+ org.objectweb.asm;bundle-version="[6.0.0,10.0.0)",
org.eclipse.team.core;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)",
org.eclipse.equinox.frameworkadmin;bundle-version="[2.0.0,3.0.0)",
org.eclipse.core.variables;bundle-version="[3.2.0,4.0.0)",
- org.objectweb.asm.tree;bundle-version="[6.0.0,8.0.0)"
+ org.objectweb.asm.tree;bundle-version="[6.0.0,10.0.0)"
Export-Package: org.eclipse.pde.api.tools.internal;x-friends:="org.eclipse.pde.api.tools.tests,org.eclipse.pde.api.tools.ui,org.eclipse.pde.api.tools.generator",
org.eclipse.pde.api.tools.internal.builder;x-friends:="org.eclipse.pde.api.tools.ui,org.eclipse.pde.api.tools.tests",
org.eclipse.pde.api.tools.internal.comparator;x-friends:="org.eclipse.pde.api.tools.ui,org.eclipse.pde.api.tools.tests",
diff --git a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
index d834f93a4..3480b3ba6 100644
--- a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
+++ b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
@@ -93,10 +93,9 @@
unpack="false"/>
<requires>
- <import plugin="javax.el-api" />
+ <import plugin="jakarta.el-api" />
<import plugin="javax.servlet-api" />
<import plugin="javax.servlet.jsp" />
- <import plugin="com.sun.el.javax.el" />
<import plugin="org.apache.commons.logging" />
<import plugin="org.glassfish.web.javax.servlet.jsp" />
<import plugin="org.apache.lucene.analyzers-common" />
--
2.27.0