Projects
home:zhangxiang:branches:Mega:23.03
eclipse
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 12
View file
_service:tar_scm:eclipse.spec
Changed
@@ -47,10 +47,7 @@ Patch36: fix-objectweb-asm-version-to-increase.patch # https://git.eclipse.org/c/platform/eclipse.platform.ua.git/commit/?id=28aac2514656c669ffa16acb996c77def3d4a8d4 Patch37: CVE-2020-27225.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 -BuildRequires: maven-install-plugin maven-shade-plugin xml-maven-plugin rhino +Patch38: Add_riscv64.patch BuildRequires: sonatype-oss-parent rsync make, gcc zip, unzip desktop-file-utils BuildRequires: pkgconfig(glib-2.0) pkgconfig(gio-2.0) pkgconfig(nspr) pkgconfig(glu) BuildRequires: pkgconfig(gl) pkgconfig(cairo) pkgconfig(xt) pkgconfig(xtst) @@ -81,10 +78,10 @@ BuildRequires: glassfish-jsp-api <= 2.3.3 glassfish-jsp <= 2.3.3 BuildRequires: glassfish-servlet-api <= 3.1.0 httpcomponents-core httpcomponents-client jsoup BuildRequires: xz-java mockito >= 2.23.9 osgi(osgi.annotation) -%if ! %{bootstrap} -BuildRequires: eclipse-pde eclipse-egit eclipse-emf-runtime eclipse-jgit -%endif -%description +BuildRequires: glassfish-annotation-api glassfish-el-api > 3.0.1 glassfish-el > 3.0.1 +BuildRequires: glassfish-jsp-api <= 2.3.3 glassfish-jsp <= 2.3.3 +BuildRequires: glassfish-servlet-api <= 3.1.0 httpcomponents-core httpcomponents-client jsoup +BuildRequires: xz-java mockito >= 2.23.9 osgi(osgi.annotation) The Eclipse platform is designed for building integrated development environments (IDEs), server-side applications, desktop applications, and everything in between. @@ -131,7 +128,7 @@ Requires: glassfish-jsp-api >= 2.2.1 glassfish-jsp >= 2.2.5 Requires: glassfish-servlet-api >= 3.1.0 icu4j >= 1:63.1 Requires: %{name}-swt = %{epoch}:%{version}-%{release} -Requires: %{name}-equinox-osgi = %{epoch}:%{version}-%{release} httpcomponents-core +Requires: glassfish-annotation-api glassfish-el-api >= 3.0.1 glassfish-el >= 3.0.1 Requires: httpcomponents-client osgi(org.tukaani.xz) Provides: eclipse-nls = %{version}-%{release} Obsoletes: eclipse-nls < %{version}-%{release} @@ -221,14 +218,12 @@ %patch36 -p1 pushd eclipse.platform.ua %patch37 -p1 +%patch38 -p1 popd rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/accessibility/Bug543949_ComponentExtentsTest.py +pushd eclipse.platform.ua %pom_remove_dep :tycho-buildtimestamp-jgit eclipse-platform-parent -%pom_remove_dep :tycho-sourceref-jgit eclipse-platform-parent -%pom_xpath_remove 'pom:configuration/pom:timestampProvider' eclipse-platform-parent -%pom_xpath_remove 'pom:configuration/pom:sourceReferences' eclipse-platform-parent -%pom_xpath_remove "pom:configuration/pom:target" eclipse-platform-parent -%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder +popd %pom_disable_module rcp eclipse.platform.releng.tychoeclipsebuilder %pom_disable_module rcp.sdk eclipse.platform.releng.tychoeclipsebuilder %pom_disable_module rcp.config eclipse.platform.releng.tychoeclipsebuilder @@ -275,7 +270,7 @@ rm -rf eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.{aarch64,s390x} rm -rf rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.{aarch64,s390x} for dir in rt.equinox.binaries rt.equinox.framework/bundles eclipse.platform.swt.binaries/bundles ; do - utils/ensure_arch.sh "$dir" x86_64 aarch64 s390x + utils/ensure_arch.sh "$dir" x86_64 aarch64 s390x riscv64 done TYCHO_ENV="<environment><os>linux</os><ws>gtk</ws><arch>%{_arch}</arch></environment>" %pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" eclipse-platform-parent @@ -326,14 +321,14 @@ %pom_xpath_remove -f "plugin@os='macosx'" $f %pom_xpath_remove -f "plugin@os='win32'" $f %pom_xpath_remove -f "plugin@ws='win32'" $f - for arch in x86 x86_64 arm aarch64 ppc64le s390x ; do + for arch in x86 x86_64 arm aarch64 ppc64le s390x riscv64; do if "$arch" != "%{_arch}" ; then %pom_xpath_remove -f "plugin@arch='$arch'" $f fi done done %pom_disable_module tests/org.eclipse.swt.tests.fragments.feature eclipse.platform.swt -%pom_xpath_remove "pom:dependency-resolution" eclipse.platform.swt/tests/org.eclipse.swt.tests{,.gtk} + for arch in x86 x86_64 arm aarch64 ppc64le s390x ; do %if %{bootstrap} %pom_disable_module eclipse.platform.ui.tools %pom_disable_module features/org.eclipse.releng.tools eclipse.platform.releng @@ -412,6 +407,7 @@ export LDFLAGS="%{__global_ldflags}" export M_CFLAGS="$CFLAGS" export M_ARCH="$LDFLAGS" +sed -i 's/-O -g -Wall -fPIC/-O -g -Wall -fPIC -pie -Wl,-z,relro -Wl,-z,now -fstack-protector-strong/g' eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library/build.sh export MAVEN_OPTS="-Xmx1024m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}" export JAVA_HOME=%{_jvmdir}/java sed -i -e '/createSourcesJar/d' eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/pom.xml @@ -771,11 +767,12 @@ * Thu Jul 14 2022 wangkai <wangkai385@h-partners.com> - 1:4.11-7 - Fix CVE-2020-27225 - -* Tue Jun 21 2022 baizhonggui <baizhonggui@h-partners.com> - 1:4.11-6 +* Tue Feb 21 2023 liyanan <liyanan32@h-partners.com> - 1:4.11-8 +- Add security compile options pie, relro and -fstack-protector-strong +- Add glassfish-jsp and glassfish-servlet-api and glassfish-el-api version limit - fixed objectweb.asm version limit - -* Tue May 24 2022 chenchen <chen_aka_jan@163.com> - 1:4.11-5 +* Thu Jul 14 2022 wangkai <wangkai385@h-partners.com> - 1:4.11-7 +- Fix CVE-2020-27225 - fixed compilation error in ImageDescriptor.createImage(boolean, Device) * Fri May 06 2022 chenchen <chen_aka_jan@163.com> - 1:4.11-4
View file
_service:tar_scm:Add_riscv64.patch
Added
@@ -0,0 +1,132 @@ +diff -ur eclipse-platform-sources-I20190307-0500/eclipse.platform.swt/bundles/org.eclipse.swt/bin/META-INF/p2.inf eclipse-platform-sources-I20190307-0500_copy/eclipse.platform.swt/bundles/org.eclipse.swt/bin/META-INF/p2.inf +--- eclipse-platform-sources-I20190307-0500/eclipse.platform.swt/bundles/org.eclipse.swt/bin/META-INF/p2.inf 2018-09-14 18:26:36.000000000 +0800 ++++ eclipse-platform-sources-I20190307-0500_copy/eclipse.platform.swt/bundles/org.eclipse.swt/bin/META-INF/p2.inf 2023-05-23 00:03:06.666350520 +0800 +@@ -24,3 +24,8 @@ + requires.5.name = org.eclipse.swt.gtk.linux.ppc64le + requires.5.range = $version$,$version$ + requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true))) ++ ++requires.6.namespace = org.eclipse.equinox.p2.iu ++requires.6.name = org.eclipse.swt.gtk.linux.riscv64 ++requires.6.range = $version$,$version$ ++requires.6.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=riscv64)(!(org.eclipse.swt.buildtime=true))) +diff -ur eclipse-platform-sources-I20190307-0500/eclipse.platform.swt.binaries/pom.xml eclipse-platform-sources-I20190307-0500_copy/eclipse.platform.swt.binaries/pom.xml +--- eclipse-platform-sources-I20190307-0500/eclipse.platform.swt.binaries/pom.xml 2019-03-07 11:00:06.000000000 +0800 ++++ eclipse-platform-sources-I20190307-0500_copy/eclipse.platform.swt.binaries/pom.xml 2023-05-23 00:03:06.666350520 +0800 +@@ -56,6 +56,7 @@ + <module>bundles/org.eclipse.swt.cocoa.macosx.x86_64</module> + <module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module> + <module>bundles/org.eclipse.swt.gtk.linux.x86_64</module> ++ <module>bundles/org.eclipse.swt.gtk.linux.riscv64</module> + <module>bundles/org.eclipse.swt.win32.win32.x86_64</module> + </modules> + +diff -ur eclipse-platform-sources-I20190307-0500/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml eclipse-platform-sources-I20190307-0500_copy/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml +--- eclipse-platform-sources-I20190307-0500/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2019-03-07 11:00:05.000000000 +0800 ++++ eclipse-platform-sources-I20190307-0500_copy/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2023-05-23 00:03:06.666350520 +0800 +@@ -423,6 +423,16 @@ + fragment="true"/> + + <plugin ++ id="org.eclipse.equinox.launcher.gtk.linux.riscv64" ++ os="linux" ++ ws="gtk" ++ arch="riscv64" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ fragment="true"/> ++ ++ <plugin + id="org.eclipse.equinox.launcher.win32.win32.x86_64" + os="win32" + ws="win32" +@@ -458,6 +468,17 @@ + download-size="0" + install-size="0" + version="0.0.0" ++ fragment="true" ++ unpack="false"/> ++ ++ <plugin ++ id="org.eclipse.swt.gtk.linux.riscv64" ++ os="linux" ++ ws="gtk" ++ arch="riscv64" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" + fragment="true" + unpack="false"/> + +diff -ur eclipse-platform-sources-I20190307-0500/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml eclipse-platform-sources-I20190307-0500_copy/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml +--- eclipse-platform-sources-I20190307-0500/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2019-03-07 11:00:05.000000000 +0800 ++++ eclipse-platform-sources-I20190307-0500_copy/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2023-05-23 00:03:06.666350520 +0800 +@@ -41,6 +41,7 @@ + <plugin id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"/> + <plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc64le"/> + <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/> ++ <plugin id="org.eclipse.equinox.launcher.gtk.linux.riscv64"/> + <plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/> + </excludes> + </configuration> +diff -ur eclipse-platform-sources-I20190307-0500/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties eclipse-platform-sources-I20190307-0500_copy/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties +--- eclipse-platform-sources-I20190307-0500/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2018-09-14 18:27:05.000000000 +0800 ++++ eclipse-platform-sources-I20190307-0500_copy/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2023-05-23 00:03:06.666350520 +0800 +@@ -32,3 +32,6 @@ + + root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root + root.linux.gtk.x86_64.permissions.755=libcairo-swt.so ++ ++root.linux.gtk.riscv64=bin/gtk/linux/riscv64,gtk_root ++root.linux.gtk.riscv64.permissions.755=libcairo-swt.so +diff -ur eclipse-platform-sources-I20190307-0500/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh eclipse-platform-sources-I20190307-0500_copy/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh +--- eclipse-platform-sources-I20190307-0500/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2018-08-23 08:04:10.000000000 +0800 ++++ eclipse-platform-sources-I20190307-0500_copy/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2023-05-23 00:03:06.666350520 +0800 +@@ -121,6 +121,11 @@ + defaultJava=DEFAULT_JAVA_EXEC + OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" + ;; ++ "riscv64") ++ defaultOSArch="riscv64" ++ defaultJava=DEFAULT_JAVA_EXEC ++ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" ++ ;; + *) + echo "*** Unknown MODEL <${MODEL}>" + ;; +diff -ur eclipse-platform-sources-I20190307-0500/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml eclipse-platform-sources-I20190307-0500_copy/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml +--- eclipse-platform-sources-I20190307-0500/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2019-03-07 11:00:06.000000000 +0800 ++++ eclipse-platform-sources-I20190307-0500_copy/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2023-05-23 00:03:03.502309376 +0800 +@@ -129,6 +129,7 @@ + <include name="cocoa/macosx/x86_64/**/*"/> + <include name="gtk/linux/ppc64le/**/*"/> + <include name="gtk/linux/x86_64/**/*"/> ++ <include name="gtk/linux/riscv64/**/*"/> + <include name="win32/win32/x86_64/**/*"/> + </fileset> + </copy> +diff -ur eclipse-platform-sources-I20190307-0500/rt.equinox.framework/pom.xml eclipse-platform-sources-I20190307-0500_copy/rt.equinox.framework/pom.xml +--- eclipse-platform-sources-I20190307-0500/rt.equinox.framework/pom.xml 2019-03-07 11:00:06.000000000 +0800 ++++ eclipse-platform-sources-I20190307-0500_copy/rt.equinox.framework/pom.xml 2023-05-23 00:03:06.666350520 +0800 +@@ -73,7 +73,19 @@ + <module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module> + </modules> + </profile> +- </profiles> ++ <profile> ++ <id>build-native-launchers-gtk.linux.riscv64</id> ++ <activation> ++ <property> ++ <name>native</name> ++ <value>gtk.linux.riscv64</value> ++ </property> ++ </activation> ++ <modules> ++ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.riscv64</module> ++ </modules> ++ </profile> ++ <profile> + + <modules> + <module>bundles/org.eclipse.osgi</module>
View file
_service
Changed
@@ -2,7 +2,7 @@ <service name="tar_scm"> <param name="url">git@gitee.com:a-xiang-and-shanhaijing/eclipse.git</param> <param name="scm">git</param> - <param name="revision">mega</param> + <param name="revision">temp</param> <param name="exclude">*</param> <param name="extract">*</param> </service>
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2