Projects
home:zhangxiang:branches:Mega:23.03
eclipse
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 6
View file
_service:tar_scm:eclipse.spec
Changed
@@ -1,4 +1,4 @@ -%global bootstrap 0 +%global bootstrap 1 %global eb_commit c985e357223668b4bc1fb76ea6b9e0c12829b7e8 %global eclipse_rel %{version}RC2 %global eclipse_tag S-%{eclipse_rel}-201903070500 @@ -45,12 +45,8 @@ #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 -Patch37: riscv.patch -Patch38: Remove-traces-of-32-bit-support.patch -Patch39: Remove-32-bit-code.patch -Patch40: Remove-32-bit-from-build-scripts.patch -Patch41: Remove-more-32-bit-code.patch -Patch42: switch-to-the-new-httpclient45-ECF-provider_2.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 @@ -81,10 +77,10 @@ BuildRequires: apiguardian hamcrest sat4j objectweb-asm >= 7.0 sac batik >= 1.10 BuildRequires: batik-css >= 1.10 xmlgraphics-commons >= 2.2 xml-commons-apis atinject BuildRequires: eclipse-ecf-core >= 3.14.4 eclipse-emf-core >= 1:2.16.0 eclipse-license2 -BuildRequires: glassfish-annotation-api -BuildRequires: glassfish-jsp-api >= 2.2.1 glassfish-jsp >= 2.2.5 -BuildRequires: glassfish-servlet-api >= 3.1.0 httpcomponents-core httpcomponents-client jsoup -BuildRequires: xz-java mockito >= 2.23.9 osgi(osgi.annotation) jakarta-el-api jakarta-el +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) %if ! %{bootstrap} BuildRequires: eclipse-pde eclipse-egit eclipse-emf-runtime eclipse-jgit %endif @@ -131,7 +127,7 @@ Requires: lucene-analyzers-smartcn >= %{_lucene_version} sat4j sac batik >= 1.10 Requires: batik-css >= 1.10 xmlgraphics-commons >= 2.2 xml-commons-apis atinject Requires: eclipse-ecf-core >= 3.14.4 eclipse-emf-core >= 1:2.16.0 -Requires: glassfish-annotation-api jakarta-el-api >= 3.0.1 jakarta-el >= 3.0.1 +Requires: glassfish-annotation-api glassfish-el-api >= 3.0.1 glassfish-el >= 3.0.1 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} @@ -223,12 +219,9 @@ %patch34 %patch35 -p1 %patch36 -p1 +pushd eclipse.platform.ua %patch37 -p1 -%patch38 -p1 -%patch39 -p1 -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 +popd 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 @@ -282,7 +275,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 riscv64 + utils/ensure_arch.sh "$dir" x86_64 aarch64 s390x 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 @@ -333,7 +326,7 @@ %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 riscv64; do + for arch in x86 x86_64 arm aarch64 ppc64le s390x ; do if "$arch" != "%{_arch}" ; then %pom_xpath_remove -f "plugin@arch='$arch'" $f fi @@ -412,6 +405,7 @@ %mvn_package "org.eclipse.ui:org.eclipse.ui.{views.log,trace}" pde %mvn_package "org.eclipse.sdk{,.feature}:" sdk %mvn_package ":" __noinstall +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 %build export CFLAGS="%{optflags}" @@ -771,11 +765,12 @@ %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog -* Wed Jul 27 2022 lvxiaoqian <xiaoqian@nj.iscas.ac.cn> - 1:4.11-8 -- non-bootstrap for riscv64 +* 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 -* Mon Jul 4 2022 lvxiaoqian <xiaoqian@nj.iscas.ac.cn> - 1:4.11-7 -- bootstrap for riscv64 +* 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 - fixed objectweb.asm version limit
View file
_service:tar_scm:CVE-2020-27225.patch
Added
@@ -0,0 +1,354 @@ +From 28aac2514656c669ffa16acb996c77def3d4a8d4 Mon Sep 17 00:00:00 2001 +From: Andrew Johnson +Date: Tue, 16 Feb 2021 21:40:49 +0000 +Subject: 569855: Fix for Eclipse live help. - Use tokens - Backport to + R4_11_maintenance branch + +Change-Id: I09cee753dc24d55a2704b80ae13d392d233aac0d +Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=569855 +Signed-off-by: Andrew Johnson <andrew_johnson@uk.ibm.com>(cherry picked from commit 90661664f30d4e1225e4a68b179c6ee110cd7f75) +Also-by: Niraj Modi <niraj.modi@in.ibm.com> +--- + org.eclipse.help.base/META-INF/MANIFEST.MF | 2 +- + org.eclipse.help.base/pom.xml | 2 +- + .../eclipse/help/internal/base/BaseHelpSystem.java | 29 ++++++++++++- + .../eclipse/help/internal/base/HelpDisplay.java | 10 ++++- + org.eclipse.help.webapp/META-INF/MANIFEST.MF | 2 +- + org.eclipse.help.webapp/advanced/livehelp_js.jsp | 12 +++++- + org.eclipse.help.webapp/index.jsp | 32 ++++++++++++--- + org.eclipse.help.webapp/pom.xml | 2 +- + .../help/internal/webapp/data/LayoutData.java | 7 +++- + .../internal/webapp/servlet/LiveHelpServlet.java | 48 +++++++++++++++++++++- + 10 files changed, 129 insertions(+), 17 deletions(-) + +diff --git a/org.eclipse.help.base/META-INF/MANIFEST.MF b/org.eclipse.help.base/META-INF/MANIFEST.MF +index 4ad860070..398a6829a 100644 +--- a/org.eclipse.help.base/META-INF/MANIFEST.MF ++++ b/org.eclipse.help.base/META-INF/MANIFEST.MF +@@ -2,7 +2,7 @@ Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: %help_base_plugin_name + Bundle-SymbolicName: org.eclipse.help.base; singleton:=true +-Bundle-Version: 4.2.500.qualifier ++Bundle-Version: 4.2.501.qualifier + Bundle-Activator: org.eclipse.help.internal.base.HelpBasePlugin + Bundle-Vendor: %providerName + Bundle-Localization: plugin +diff --git a/org.eclipse.help.base/pom.xml b/org.eclipse.help.base/pom.xml +index b90d899f6..36f5145e9 100644 +--- a/org.eclipse.help.base/pom.xml ++++ b/org.eclipse.help.base/pom.xml +@@ -18,7 +18,7 @@ + </parent> + <groupId>org.eclipse.help</groupId> + <artifactId>org.eclipse.help.base</artifactId> +- <version>4.2.500-SNAPSHOT</version> ++ <version>4.2.501-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + <properties> + <defaultSigning-excludeInnerJars>true</defaultSigning-excludeInnerJars> +diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java +index 2ea5bf807..f9f09ae7a 100644 +--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java ++++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java +@@ -1,5 +1,5 @@ + /******************************************************************************* +- * Copyright (c) 2000, 2018 IBM Corporation and others. ++ * Copyright (c) 2000, 2021 IBM Corporation and others. + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 +@@ -15,6 +15,7 @@ package org.eclipse.help.internal.base; + + import java.net.MalformedURLException; + import java.net.URL; ++ + import org.eclipse.core.runtime.CoreException; + import org.eclipse.core.runtime.IProduct; + import org.eclipse.core.runtime.IStatus; +@@ -59,6 +60,7 @@ public final class BaseHelpSystem { + private IBrowser browser; + private IBrowser internalBrowser; + private HelpDisplay helpDisplay = null; ++ private String liveHelpToken = null; + + private BaseHelpSystem() { + super(); +@@ -350,4 +352,29 @@ public final class BaseHelpSystem { + } + } + ++ /** ++ * Check supplied token against stored token. Clears the stored token if ++ * successful. ++ * ++ * @param helpSessionToken ++ * @return true if match successful ++ */ ++ public boolean matchOnceLiveHelpToken(String helpSessionToken) { ++ /* ++ * @FIXME - should we use a constant time comparison, and store/compare a ++ * cryptographic hash? ++ */ ++ if (liveHelpToken != null && liveHelpToken.equals(helpSessionToken)) { ++ // Enforce one-time use. ++ liveHelpToken = null; ++ return true; ++ } else { ++ return false; ++ } ++ } ++ ++ public void setLiveHelpToken(String helpSessionToken) { ++ liveHelpToken = helpSessionToken; ++ } ++ + } +diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java +index 28ebfd10d..33a0e08fd 100644 +--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java ++++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java +@@ -1,5 +1,5 @@ + /******************************************************************************* +- * Copyright (c) 2000, 2015 IBM Corporation and others. ++ * Copyright (c) 2000, 2021 IBM Corporation and others. + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 +@@ -15,6 +15,8 @@ package org.eclipse.help.internal.base; + + import java.io.UnsupportedEncodingException; + import java.net.URLEncoder; ++import java.nio.charset.StandardCharsets; ++import java.util.UUID; + + import org.eclipse.core.runtime.CoreException; + import org.eclipse.core.runtime.IConfigurationElement; +@@ -196,6 +198,12 @@ public class HelpDisplay { + String topic = helpURL.substring("topic=".length()); //$NON-NLS-1$ + helpURL = getHelpDisplay().getHelpForTopic( topic, WebappManager.getHost(), WebappManager.getPort()); + } ++ String basehelp = getBaseURL(); ++ if (BaseHelpSystem.getMode() != BaseHelpSystem.MODE_INFOCENTER && helpURL.startsWith(basehelp)) { ++ String sessid = UUID.randomUUID().toString(); ++ BaseHelpSystem.getInstance().setLiveHelpToken(sessid); ++ helpURL += (helpURL.indexOf('?') < 0 ? '?' : '&') + "token=" + sessid; //$NON-NLS-1$ ++ } + + BaseHelpSystem.getHelpBrowser(forceExternal) + .displayURL(helpURL); +diff --git a/org.eclipse.help.webapp/META-INF/MANIFEST.MF b/org.eclipse.help.webapp/META-INF/MANIFEST.MF +index 0c85d674e..c943158a6 100644 +--- a/org.eclipse.help.webapp/META-INF/MANIFEST.MF ++++ b/org.eclipse.help.webapp/META-INF/MANIFEST.MF +@@ -2,7 +2,7 @@ Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: %help_webapp_plugin_name + Bundle-SymbolicName: org.eclipse.help.webapp;singleton:=true +-Bundle-Version: 3.9.400.qualifier ++Bundle-Version: 3.9.401.qualifier + Bundle-Activator: org.eclipse.help.internal.webapp.HelpWebappPlugin + Bundle-Vendor: %providerName + Bundle-Localization: plugin +diff --git a/org.eclipse.help.webapp/advanced/livehelp_js.jsp b/org.eclipse.help.webapp/advanced/livehelp_js.jsp +index 23362f89e..6d04945d6 100644 +--- a/org.eclipse.help.webapp/advanced/livehelp_js.jsp ++++ b/org.eclipse.help.webapp/advanced/livehelp_js.jsp +@@ -1,5 +1,5 @@ + <%-- +- Copyright (c) 2000, 2018 IBM Corporation and others. ++ Copyright (c) 2000, 2021 IBM Corporation and others. + + This program and the accompanying materials + are made available under the terms of the Eclipse Public License 2.0 +@@ -47,7 +47,15 @@ function liveActionInternal(topHelpWindow, pluginId, className, argument) + url=url.substring(0, i+1); + var encodedArg=encodeURIComponent(argument); + url=url+"livehelp/?pluginID="+pluginId+"&class="+className+"&arg="+encodedArg+"&nocaching="+Math.random(); +- ++ <% ++ Object token = request.getSession().getAttribute("LSESSION"); //$NON-NLS-1$ ++ // Validate token to protect against XSS ++ if (token instanceof String && ((String)token).matches("a-z0-9-{36}")) {//$NON-NLS-1$) { ++ %> ++ url=url+"&token=<%=token%>"; ++ <% ++ } ++ %> + // we need to find the toolbar frame. + // to do: cleanup this, including the location of the hidden livehelp frame. + var toolbarFrame = topHelpWindow.HelpFrame.ContentFrame.ContentToolbarFrame; +diff --git a/org.eclipse.help.webapp/index.jsp b/org.eclipse.help.webapp/index.jsp +index 34d3e14ee..76b6564c1 100644 +--- a/org.eclipse.help.webapp/index.jsp ++++ b/org.eclipse.help.webapp/index.jsp +@@ -1,5 +1,5 @@ + <%-- +- Copyright (c) 2000, 2011 IBM Corporation and others. ++ Copyright (c) 2000, 2021 IBM Corporation and others. + + This program and the accompanying materials + are made available under the terms of the Eclipse Public License 2.0 +@@ -12,9 +12,11 @@ + IBM Corporation - initial API and implementation + --%> + <%@ page import="org.eclipse.help.internal.webapp.data.*" errorPage="/advanced/err.jsp" contentType="text/html; charset=UTF-8"%> ++<%@ page import="java.util.UUID" %> ++<%@ page import="org.eclipse.help.internal.base.BaseHelpSystem" %> + <% + request.setCharacterEncoding("UTF-8");
View file
_service:tar_scm:Remove-32-bit-code.patch
Deleted
@@ -1,68951 +0,0 @@ -From 4ce8a195ba3ace07f48c5d2da637f513a3e56db9 Mon Sep 17 00:00:00 2001 -From: Eric Williams -Date: Tue, 26 Mar 2019 10:02:00 -0400 -Subject: Bug 545793: GTK Remove 32-bit code - -Remove /*int*/ casts. - -Change-Id: I9e8da81d6435312acdd06cd1b3e471275ca842a8 -Signed-off-by: Eric Williams <ericwill@redhat.com>--- - .../gtk/org/eclipse/swt/awt/SWT_AWT.java | 12 +- - .../org/eclipse/swt/accessibility/Accessible.java | 16 +- - .../swt/accessibility/AccessibleObject.java | 436 +- - .../gtk/org/eclipse/swt/dnd/ByteArrayTransfer.java | 2 +- - .../gtk/org/eclipse/swt/dnd/Clipboard.java | 26 +- - .../gtk/org/eclipse/swt/dnd/ClipboardProxy.java | 20 +- - .../gtk/org/eclipse/swt/dnd/DragSource.java | 42 +- - .../gtk/org/eclipse/swt/dnd/DropTarget.java | 40 +- - .../gtk/org/eclipse/swt/dnd/FileTransfer.java | 18 +- - .../gtk/org/eclipse/swt/dnd/HTMLTransfer.java | 2 +- - .../gtk/org/eclipse/swt/dnd/ImageTransfer.java | 10 +- - .../gtk/org/eclipse/swt/dnd/RTFTransfer.java | 2 +- - .../org/eclipse/swt/dnd/TableDragSourceEffect.java | 22 +- - .../org/eclipse/swt/dnd/TableDropTargetEffect.java | 8 +- - .../gtk/org/eclipse/swt/dnd/TextTransfer.java | 4 +- - .../gtk/org/eclipse/swt/dnd/TransferData.java | 4 +- - .../org/eclipse/swt/dnd/TreeDragSourceEffect.java | 22 +- - .../org/eclipse/swt/dnd/TreeDropTargetEffect.java | 8 +- - .../gtk/org/eclipse/swt/dnd/URLTransfer.java | 2 +- - .../swt/internal/dnd/gtk/ListDragSourceEffect.java | 22 +- - .../Eclipse SWT OpenGL/glx/library/glx.c | 34 +- - .../Eclipse SWT OpenGL/glx/library/glx_structs.c | 8 +- - .../org/eclipse/swt/internal/opengl/glx/GLX.java | 30 +- - .../swt/internal/opengl/glx/XVisualInfo.java | 2 +- - .../gtk/org/eclipse/swt/opengl/GLCanvas.java | 36 +- - .../Eclipse SWT PI/cairo/library/cairo.c | 398 +- - .../Eclipse SWT PI/cairo/library/cairo_stats.c | 18 +- - .../Eclipse SWT PI/cairo/library/cairo_stats.h | 18 +- - .../Eclipse SWT PI/cairo/library/cairo_structs.c | 8 +- - .../org/eclipse/swt/internal/cairo/Cairo.java | 456 +- - .../eclipse/swt/internal/cairo/cairo_path_t.java | 2 +- - .../Eclipse SWT PI/common/library/c.c | 317 +- - .../Eclipse SWT PI/common/library/c_stats.c | 70 +- - .../Eclipse SWT PI/common/library/c_stats.h | 70 +- - .../common/org/eclipse/swt/internal/C.java | 44 +- - .../common/org/eclipse/swt/internal/LONG.java | 4 +- - .../Eclipse SWT PI/gtk/library/atk.c | 640 +- - .../Eclipse SWT PI/gtk/library/atk_stats.c | 114 +- - .../Eclipse SWT PI/gtk/library/atk_stats.h | 114 +- - .../Eclipse SWT PI/gtk/library/atk_structs.c | 758 +-- - .../Eclipse SWT PI/gtk/library/os.c | 6699 ++++++++------------ - .../Eclipse SWT PI/gtk/library/os_stats.c | 418 +- - .../Eclipse SWT PI/gtk/library/os_stats.h | 418 +- - .../Eclipse SWT PI/gtk/library/os_structs.c | 336 +- - .../swt/internal/accessibility/gtk/ATK.java | 140 +- - .../internal/accessibility/gtk/AtkActionIface.java | 12 +- - .../internal/accessibility/gtk/AtkAttribute.java | 4 +- - .../accessibility/gtk/AtkComponentIface.java | 26 +- - .../accessibility/gtk/AtkEditableTextIface.java | 14 +- - .../accessibility/gtk/AtkHypertextIface.java | 6 +- - .../internal/accessibility/gtk/AtkObjectClass.java | 48 +- - .../accessibility/gtk/AtkSelectionIface.java | 16 +- - .../internal/accessibility/gtk/AtkTableIface.java | 72 +- - .../internal/accessibility/gtk/AtkTextIface.java | 44 +- - .../internal/accessibility/gtk/AtkTextRange.java | 2 +- - .../internal/accessibility/gtk/AtkValueIface.java | 8 +- - .../gtk/org/eclipse/swt/internal/gtk/GDK.java | 804 +-- - .../eclipse/swt/internal/gtk/GInterfaceInfo.java | 6 +- - .../org/eclipse/swt/internal/gtk/GObjectClass.java | 14 +- - .../gtk/org/eclipse/swt/internal/gtk/GTK.java | 2990 ++++----- - .../org/eclipse/swt/internal/gtk/GTypeInfo.java | 14 +- - .../org/eclipse/swt/internal/gtk/GTypeQuery.java | 2 +- - .../org/eclipse/swt/internal/gtk/GdkEventAny.java | 2 +- - .../eclipse/swt/internal/gtk/GdkEventButton.java | 6 +- - .../eclipse/swt/internal/gtk/GdkEventCrossing.java | 4 +- - .../eclipse/swt/internal/gtk/GdkEventFocus.java | 2 +- - .../org/eclipse/swt/internal/gtk/GdkEventKey.java | 4 +- - .../eclipse/swt/internal/gtk/GdkEventMotion.java | 6 +- - .../swt/internal/gtk/GdkEventWindowState.java | 2 +- - .../eclipse/swt/internal/gtk/GdkWindowAttr.java | 10 +- - .../gtk/org/eclipse/swt/internal/gtk/Graphene.java | 12 +- - .../swt/internal/gtk/GtkCellRendererClass.java | 6 +- - .../eclipse/swt/internal/gtk/GtkTargetEntry.java | 2 +- - .../eclipse/swt/internal/gtk/GtkWidgetClass.java | 6 +- - .../gtk/org/eclipse/swt/internal/gtk/OS.java | 1304 ++-- - .../eclipse/swt/internal/gtk/PangoAttribute.java | 2 +- - .../org/eclipse/swt/internal/gtk/PangoItem.java | 10 +- - .../eclipse/swt/internal/gtk/PangoLayoutLine.java | 4 +- - .../eclipse/swt/internal/gtk/PangoLayoutRun.java | 4 +- - .../org/eclipse/swt/internal/gtk/XAnyEvent.java | 6 +- - .../gtk/org/eclipse/swt/printing/PrintDialog.java | 28 +- - .../gtk/org/eclipse/swt/printing/Printer.java | 56 +- - .../gtk/org/eclipse/swt/program/Program.java | 44 +- - .../Eclipse SWT WebKit/gtk/library/webkitgtk.c | 1112 ++-- - .../gtk/library/webkitgtk_structs.c | 92 +- - .../gtk/org/eclipse/swt/browser/WebKit.java | 388 +- - .../gtk/org/eclipse/swt/browser/WebkitGDBus.java | 78 +- - .../swt/internal/webkit/JSClassDefinition.java | 30 +- - .../org/eclipse/swt/internal/webkit/WebKitGTK.java | 634 +- - .../cairo/org/eclipse/swt/graphics/Path.java | 22 +- - .../cairo/org/eclipse/swt/graphics/Pattern.java | 4 +- - .../common/org/eclipse/swt/internal/Callback.java | 8 +- - .../common/org/eclipse/swt/widgets/Monitor.java | 2 +- - .../org/eclipse/swt/widgets/TouchSource.java | 4 +- - .../bidi/org/eclipse/swt/internal/BidiUtil.java | 6 +- - .../gtk/org/eclipse/swt/graphics/Cursor.java | 20 +- - .../gtk/org/eclipse/swt/graphics/Device.java | 62 +- - .../gtk/org/eclipse/swt/graphics/Font.java | 8 +- - .../gtk/org/eclipse/swt/graphics/GC.java | 180 +- - .../gtk/org/eclipse/swt/graphics/GCData.java | 4 +- - .../gtk/org/eclipse/swt/graphics/Image.java | 38 +- - .../gtk/org/eclipse/swt/graphics/Region.java | 24 +- - .../gtk/org/eclipse/swt/graphics/TextLayout.java | 90 +- - .../gtk/org/eclipse/swt/internal/Converter.java | 10 +- - .../gtk/org/eclipse/swt/internal/GDBus.java | 36 +- - .../gtk/org/eclipse/swt/internal/ImageList.java | 32 +- - .../gtk/org/eclipse/swt/widgets/Button.java | 52 +- - .../gtk/org/eclipse/swt/widgets/Canvas.java | 46 +- - .../gtk/org/eclipse/swt/widgets/Caret.java | 6 +- - .../gtk/org/eclipse/swt/widgets/ColorDialog.java | 6 +- - .../gtk/org/eclipse/swt/widgets/Combo.java | 202 +- - .../gtk/org/eclipse/swt/widgets/Composite.java | 140 +- - .../gtk/org/eclipse/swt/widgets/Control.java | 466 +- - .../gtk/org/eclipse/swt/widgets/DateTime.java | 52 +- - .../gtk/org/eclipse/swt/widgets/Decorations.java | 24 +- - .../org/eclipse/swt/widgets/DirectoryDialog.java | 44 +- - .../gtk/org/eclipse/swt/widgets/Display.java | 454 +- - .../gtk/org/eclipse/swt/widgets/ExpandBar.java | 22 +- - .../gtk/org/eclipse/swt/widgets/ExpandItem.java | 26 +- - .../gtk/org/eclipse/swt/widgets/FileDialog.java | 46 +- - .../gtk/org/eclipse/swt/widgets/FontDialog.java | 14 +- - .../gtk/org/eclipse/swt/widgets/Group.java | 30 +- - .../gtk/org/eclipse/swt/widgets/IME.java | 20 +- - .../gtk/org/eclipse/swt/widgets/Label.java | 28 +- - .../gtk/org/eclipse/swt/widgets/Link.java | 28 +- - .../gtk/org/eclipse/swt/widgets/List.java | 200 +- - .../gtk/org/eclipse/swt/widgets/Menu.java | 66 +- - .../gtk/org/eclipse/swt/widgets/MenuItem.java | 40 +- - .../gtk/org/eclipse/swt/widgets/MessageBox.java | 10 +- - .../gtk/org/eclipse/swt/widgets/ProgressBar.java | 12 +- - .../gtk/org/eclipse/swt/widgets/Sash.java | 40 +- - .../gtk/org/eclipse/swt/widgets/Scale.java | 16 +- - .../gtk/org/eclipse/swt/widgets/ScrollBar.java | 26 +- - .../gtk/org/eclipse/swt/widgets/Scrollable.java | 26 +- - .../gtk/org/eclipse/swt/widgets/Shell.java | 178 +- - .../gtk/org/eclipse/swt/widgets/Slider.java | 36 +- - .../gtk/org/eclipse/swt/widgets/Spinner.java | 128 +- - .../gtk/org/eclipse/swt/widgets/TabFolder.java | 46 +- - .../gtk/org/eclipse/swt/widgets/TabItem.java | 24 +- - .../gtk/org/eclipse/swt/widgets/Table.java | 410 +- - .../gtk/org/eclipse/swt/widgets/TableColumn.java | 38 +- - .../gtk/org/eclipse/swt/widgets/TableItem.java | 94 +- - .../gtk/org/eclipse/swt/widgets/Text.java | 204 +- - .../gtk/org/eclipse/swt/widgets/ToolBar.java | 40 +- - .../gtk/org/eclipse/swt/widgets/ToolItem.java | 92 +- - .../gtk/org/eclipse/swt/widgets/ToolTip.java | 46 +- - .../gtk/org/eclipse/swt/widgets/Tracker.java | 40 +- - .../gtk/org/eclipse/swt/widgets/TrayItem.java | 24 +- - .../gtk/org/eclipse/swt/widgets/Tree.java | 440 +- - .../gtk/org/eclipse/swt/widgets/TreeColumn.java | 38 +- - .../gtk/org/eclipse/swt/widgets/TreeItem.java | 112 +- - .../gtk/org/eclipse/swt/widgets/Widget.java | 330 +- - .../gtk/snippets/Bug421127_Clipping_is_wrong.java | 4 +- - 153 files changed, 10967 insertions(+), 13855 deletions(-) - -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java -index 18c0ddf914..a23412d396 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java -@@ -55,9 +55,9 @@ public class SWT_AWT { - - static boolean loaded, swingInitialized; - --static native final long /*int*/ getAWTHandle (Object canvas); -+static native final long getAWTHandle (Object canvas); - static native final void setDebug (Frame canvas, boolean debug); --static native final Object initFrame (long /*int*/ handle, String className); -+static native final Object initFrame (long handle, String className); - static native final void validateWithBounds (Frame frame, int x, int y, int w, int h); - static native final void synthesizeWindowActivation (Frame frame, boolean doActivate); - static native final void registerListeners (Frame frame); -@@ -148,7 +148,7 @@ public static Frame new_Frame (final Composite parent) { - if ((parent.getStyle () & SWT.EMBEDDED) == 0) { - SWT.error (SWT.ERROR_INVALID_ARGUMENT); - } -- long /*int*/ handle = parent.embeddedHandle; -+ long handle = parent.embeddedHandle; - /* - * Some JREs have implemented the embedded frame constructor to take an integer - * and other JREs take a long. To handle this binary incompatibility, use -@@ -186,9 +186,9 @@ public static Frame new_Frame (final Composite parent) { - parent.getDisplay().asyncExec(() -> { - if (parent.isDisposed()) return; - Shell shell = parent.getShell(); -- long /*int*/ awtHandle = getAWTHandle(window); -+ long awtHandle = getAWTHandle(window); - if (awtHandle == 0) return; -- long /*int*/ xWindow = GDK.gdk_x11_window_get_xid (GTK.gtk_widget_get_window (GTK.gtk_widget_get_toplevel (shell.handle))); -+ long xWindow = GDK.gdk_x11_window_get_xid (GTK.gtk_widget_get_window (GTK.gtk_widget_get_toplevel (shell.handle))); - OS.XSetTransientForHint(GDK.gdk_x11_display_get_xdisplay(GDK.gdk_display_get_default()), awtHandle, xWindow);
View file
_service:tar_scm:Remove-32-bit-from-build-scripts.patch
Deleted
@@ -1,189 +0,0 @@ -From cdf280bd9520d91fcd43cc3099c9764296278945 Mon Sep 17 00:00:00 2001 -From: Eric Williams -Date: Wed, 27 Mar 2019 09:45:24 -0400 -Subject: Bug 545793: GTK Remove 32-bit code - -Remove 32 bit from build scripts. - -Change-Id: Ib9c66468ae30a0a25045c95f7e606b8d404c09fd -Signed-off-by: Eric Williams <ericwill@redhat.com>--- - bundles/org.eclipse.swt/buildFragment.xml | 25 --------------- - bundles/org.eclipse.swt/buildSWT.xml | 51 ++----------------------------- - 2 files changed, 2 insertions(+), 74 deletions(-) - -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml -index b4944c59d5..180c92ca32 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml -@@ -156,7 +156,6 @@ - <fileset dir="${plugindir}/Eclipse SWT Program/common/"/> - </copy> - <antcall target="copy.translationfiles"/> -- <antcall target="replace64"/> - </target> - - <target name="copy.gtk.src"> -@@ -192,7 +191,6 @@ - <fileset dir="${plugindir}/Eclipse SWT WebKit/gtk/"/> - </copy> - <antcall target="copy.translationfiles"/> -- <antcall target="replace64"/> - </target> - - <target name="copy.win32.src"> -@@ -223,7 +221,6 @@ - <fileset dir="${plugindir}/Eclipse SWT Program/win32/"/> - </copy> - <antcall target="copy.translationfiles"/> -- <antcall target="replace64"/> - </target> - - <target name="copy.translationfiles" if="includetranslationfiles"> -@@ -233,28 +230,6 @@ - </copy> - </target> - -- <target name="is64"> -- <condition property="is64" value="true"> -- <or> -- <equals arg1="${swt.arch}" arg2="x86_64"/> -- <equals arg1="${swt.arch}" arg2="ia64"/> -- <equals arg1="${swt.arch}" arg2="ppc64le"/> -- <equals arg1="${swt.arch}" arg2="s390x"/> -- <equals arg1="${swt.arch}" arg2="sparcv9"/> -- <equals arg1="${swt.arch}" arg2="aarch64"/> -- </or> -- </condition> -- <echo>Is64=${is64}</echo> -- </target> -- -- <target name="replace64" depends="is64" unless="is64"> -- <echo>Converting java files to 32 bit</echo> -- <replace dir="${copy.src.dir}" includes="**/*.java" value="int /*long*/" token="long /*int*/"/> -- <replace dir="${copy.src.dir}" includes="**/*.java" value="int /*long*/" token="long /*int*/"/> -- <replace dir="${copy.src.dir}" includes="**/*.java" value="float /*double*/" token="double /*float*/"/> -- <replace dir="${copy.src.dir}" includes="**/*.java" value="float /*double*/" token="double /*float*/"/> -- </target> -- - <target name="build.sources" depends="init"> - <available property="src.zip" file="${build.result.folder}/src.zip" /> - <antcall target="src.zip" /> -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml -index bf4faf75b9..9d4bb1b6fe 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml -@@ -108,13 +108,6 @@ - - <target name="check_machines" depends="init_keyfile"> - <parallel> -- <sshexec host="${m_linux_x86}" -- username="swtbuild" -- keyfile="${keyfile}" -- failonerror="false" -- trust="true" -- outputproperty="m_linux_x86_output" -- command="hostname"/> - <sshexec host="${m_linux_x86_64}" - username="swtbuild" - keyfile="${keyfile}" -@@ -140,12 +133,6 @@ - </parallel> - <property name="success_msg" value="Success"/> - <property name="fail_msg" value="*** Fail ***"/> -- <condition property="m_linux_x86_test" value="${success_msg}" else="${fail_msg}"> -- <and> -- <length string="${m_linux_x86_output}" when="greater" length="0"/> -- <matches pattern="x${m_linux_x86_output}*" string="x${m_linux_x86}"/> -- </and> -- </condition> - <condition property="m_linux_x86_64_test" value="${success_msg}" else="${fail_msg}"> - <and> - <length string="${m_linux_x86_64_output}" when="greater" length="0"/> -@@ -167,13 +154,12 @@ - <echo>-------------------------</echo> - <echo>Status:</echo> - <echo></echo> -- <echo>${m_linux_x86} - ${m_linux_x86_test}</echo> - <echo>${m_linux_x86_64} - ${m_linux_x86_64_test}</echo> - <echo>${m_linux_ppc64le} - ${m_linux_ppc64le_test}</echo> - <echo>${m_mac} - ${m_mac_test}</echo> - <echo>-------------------------</echo> - <condition property="m_fail"> -- <matches pattern="Fail" string="${m_linux_x86_test} ${m_linux_x86_64_test} ${m_linux_ppc64le_test} ${m_mac_test}"/> -+ <matches pattern="Fail" string="${m_linux_x86_64_test} ${m_linux_ppc64le_test} ${m_mac_test}"/> - </condition> - <fail if="m_fail" message="Failed"/> - </target> -@@ -237,15 +223,12 @@ - <!-- 64 bit --> - <antcall target="build_classes"> - <param name="cp" value=".classpath_cocoa"/> -- <param name="is64" value="64 bit"/> - </antcall> - <antcall target="build_classes"> - <param name="cp" value=".classpath_gtk"/> -- <param name="is64" value="64 bit"/> - </antcall> - <antcall target="build_classes"> - <param name="cp" value=".classpath_win32"/> -- <param name="is64" value="64 bit"/> - </antcall> - - <antcall target="check_preprocessing"/> -@@ -263,14 +246,8 @@ - <delete dir="${tmpdir}" quiet="true"/> - </target> - -- <target name="replace64" unless="is64"> -- <antcall target="replace.64.to.32"> -- <param name="replace_dir" value="${buildDir}"/> -- </antcall> -- </target> -- - <target name="build_classes"> -- <echo>Building ${cp} ${is64}</echo> -+ <echo>Building ${cp}</echo> - <delete file="${tmpdir}/copy.xml"/> - <delete dir="${buildDir}"/> - -@@ -280,8 +257,6 @@ - </xslt> - <ant antfile="${tmpdir}/copy.xml" target="copy_files"/> - -- <antcall target="replace64"></antcall> -- - <javac includeantruntime="false" srcdir="${buildDir}"></javac> - </target> - -@@ -947,28 +922,6 @@ - </exec> - </target> - -- <!-- Convert SWT 32 bit java and C source to 64 bit --> -- <target name="replace.32.to.64" depends="init_build"> -- <property name="replace_dir" value="${repo.src}/bundles/org.eclipse.swt"/> -- <echo>Converting java files to 64 bit in ${replace_dir} project</echo> -- <replace dir="${replace_dir}" includes="**/*.java" token="int /*long*/" value="long /*int*/"/> -- <replace dir="${replace_dir}" includes="**/*.java" token="int /*long*/" value="long /*int*/"/> -- <replace dir="${replace_dir}" includes="**/*.java" token="float /*double*/" value="double /*float*/"/> -- <replace dir="${replace_dir}" includes="**/*.java" token="float /*double*/" value="double /*float*/"/> -- <antcall target="init_build"/> -- </target> -- -- <!-- Convert SWT 64 bit java and C source to 32 bit --> -- <target name="replace.64.to.32" depends="init_build"> -- <property name="replace_dir" value="${repo.src}/bundles/org.eclipse.swt"/> -- <echo>Converting java files to 32 bit in ${replace_dir} project</echo> -- <replace dir="${replace_dir}" includes="**/*.java" token="long /*int*/" value="int /*long*/"/> -- <replace dir="${replace_dir}" includes="**/*.java" token="long /*int*/" value="int /*long*/"/> -- <replace dir="${replace_dir}" includes="**/*.java" token="double /*float*/" value="float /*double*/"/> -- <replace dir="${replace_dir}" includes="**/*.java" token="double /*float*/" value="float /*double*/"/> -- <antcall target="init_build"/> -- </target> -- - <!-- ******************************************************************************** --> - <!-- targets to run the builds on the Eclipse Foundation Hudson in master-slave setup --> - <!-- ******************************************************************************** --> --- -cgit v1.2.3 -
View file
_service:tar_scm:Remove-more-32-bit-code.patch
Deleted
@@ -1,2337 +0,0 @@ -From dfb846ed4003e19fa5e9abe38aa7f36fbb4c7960 Mon Sep 17 00:00:00 2001 -From: Xi Yan -Date: Mon, 1 Apr 2019 16:43:18 -0400 -Subject: Bug 545793 - GTK Remove 32-bit code - -Remove more /*int*/ casts. - -Change-Id: I23076cf3cf9fc3fd87f59f7b36004016e41875ac -Signed-off-by: Xi Yan <xixiyan@redhat.com>--- - .../swt/accessibility/AccessibleObject.java | 8 +- - .../gtk/org/eclipse/swt/dnd/FileTransfer.java | 12 +- - .../gtk/org/eclipse/swt/dnd/TextTransfer.java | 8 +- - .../Eclipse SWT PI/gtk/library/os.c | 379 ++++++++++----------- - .../Eclipse SWT PI/gtk/library/os_stats.c | 12 - - .../Eclipse SWT PI/gtk/library/os_stats.h | 12 - - .../gtk/org/eclipse/swt/internal/gtk/GDK.java | 20 +- - .../gtk/org/eclipse/swt/internal/gtk/GTK.java | 40 +-- - .../gtk/org/eclipse/swt/internal/gtk/OS.java | 78 ++--- - .../gtk/org/eclipse/swt/printing/Printer.java | 2 +- - .../Eclipse SWT WebKit/gtk/library/webkitgtk.c | 94 ++--- - .../gtk/org/eclipse/swt/browser/WebKit.java | 16 +- - .../gtk/org/eclipse/swt/browser/WebkitGDBus.java | 8 +- - .../org/eclipse/swt/internal/webkit/WebKitGTK.java | 36 +- - .../common/org/eclipse/swt/graphics/Drawable.java | 4 +- - .../gtk/org/eclipse/swt/graphics/Device.java | 8 +- - .../gtk/org/eclipse/swt/graphics/GC.java | 2 +- - .../gtk/org/eclipse/swt/graphics/Region.java | 2 +- - .../gtk/org/eclipse/swt/graphics/TextLayout.java | 6 +- - .../gtk/org/eclipse/swt/internal/GDBus.java | 2 +- - .../gtk/org/eclipse/swt/widgets/Button.java | 2 +- - .../gtk/org/eclipse/swt/widgets/Combo.java | 4 +- - .../gtk/org/eclipse/swt/widgets/Display.java | 10 +- - .../gtk/org/eclipse/swt/widgets/Shell.java | 2 +- - .../gtk/org/eclipse/swt/widgets/Table.java | 18 +- - .../gtk/org/eclipse/swt/widgets/TableItem.java | 4 +- - .../gtk/org/eclipse/swt/widgets/Tree.java | 22 +- - .../gtk/org/eclipse/swt/widgets/TreeItem.java | 4 +- - 28 files changed, 379 insertions(+), 436 deletions(-) - -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java -index 33254052f4..c4e3a71bf7 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java -@@ -941,7 +941,7 @@ class AccessibleObject { - int length = size(listeners); - if (length > 0) { - AccessibleTextEvent event = new AccessibleTextEvent(accessible); -- event.index = (int)/*int*/link_index; -+ event.index = (int)link_index; - for (int i = 0; i < length; i++) { - AccessibleTextExtendedListener listener = listeners.get(i); - listener.getHyperlink(event); -@@ -1017,7 +1017,7 @@ class AccessibleObject { - int length = size(listeners); - if (length > 0) { - AccessibleTextEvent event = new AccessibleTextEvent(accessible); -- event.offset = (int)/*int*/char_index; -+ event.offset = (int)char_index; - event.index = -1; - for (int i = 0; i < length; i++) { - AccessibleTextExtendedListener listener = listeners.get(i); -@@ -2327,7 +2327,7 @@ class AccessibleObject { - int count = event.selected != null ? event.selected.length : 0; - long result = OS.g_malloc(count * 4); - if (event.selected != null) C.memmove(result, event.selected, count * 4); -- if (selected != 0) C.memmove(selected, new long /*int*/{result}, C.PTR_SIZEOF); -+ if (selected != 0) C.memmove(selected, new long {result}, C.PTR_SIZEOF); - return count; - } - } -@@ -2369,7 +2369,7 @@ class AccessibleObject { - int count = event.selected != null ? event.selected.length : 0; - long result = OS.g_malloc(count * 4); - if (event.selected != null) C.memmove(result, event.selected, count * 4); -- if (selected != 0) C.memmove(selected, new long /*int*/{result}, C.PTR_SIZEOF); -+ if (selected != 0) C.memmove(selected, new long {result}, C.PTR_SIZEOF); - return count; - } - } -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java -index 02e3fa0022..c95207eeef 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java -@@ -90,7 +90,7 @@ public void javaToNative(Object object, TransferData transferData) { - if (length == 0) continue; - char chars = new charlength; - string.getChars(0, length, chars, 0); -- long /*int*/ error = new long /*int*/1; -+ long error = new long 1; - long utf8Ptr = OS.g_utf16_to_utf8(chars, chars.length, null, null, error); - if (error0 != 0 || utf8Ptr == 0) continue; - long localePtr = OS.g_filename_from_utf8(utf8Ptr, -1, null, null, error); -@@ -143,7 +143,7 @@ public Object nativeToJava(TransferData transferData) { - C.memmove(temp, transferData.pValue, length); - boolean gnomeList = transferData.type == GNOME_LIST_ID; - int sepLength = gnomeList ? 1 : 2; -- long /*int*/ files = new long /*int*/0; -+ long files = new long 0; - int offset = 0; - for (int i = 0; i < temp.length - 1; i++) { - boolean terminator = gnomeList ? tempi == '\n' : tempi == '\r' && tempi+1 == '\n'; -@@ -155,7 +155,7 @@ public Object nativeToJava(TransferData transferData) { - byte fileBuffer = new bytesize + 1; - System.arraycopy(temp, offset, fileBuffer, 0, size); - C.memmove(file, fileBuffer, size + 1); -- long /*int*/ newFiles = new long /*int*/files.length + 1; -+ long newFiles = new long files.length + 1; - System.arraycopy(files, 0, newFiles, 0, files.length); - newFilesfiles.length = file; - files = newFiles; -@@ -169,14 +169,14 @@ public Object nativeToJava(TransferData transferData) { - byte fileBuffer = new bytesize + 1; - System.arraycopy(temp, offset, fileBuffer, 0, size); - C.memmove(file, fileBuffer, size + 1); -- long /*int*/ newFiles = new long /*int*/files.length + 1; -+ long newFiles = new long files.length + 1; - System.arraycopy(files, 0, newFiles, 0, files.length); - newFilesfiles.length = file; - files = newFiles; - } - String fileNames = new String0; - for (int i = 0; i < files.length; i++) { -- long /*int*/ error = new long /*int*/1; -+ long error = new long 1; - long localePtr = OS.g_filename_from_uri(filesi, null, error); - OS.g_free(filesi); - if (error0 != 0 || localePtr == 0) continue; -@@ -184,7 +184,7 @@ public Object nativeToJava(TransferData transferData) { - if (utf8Ptr == 0) utf8Ptr = OS.g_filename_display_name (localePtr); - if (localePtr != utf8Ptr) OS.g_free (localePtr); - if (utf8Ptr == 0) continue; -- long /*int*/ items_written = new long /*int*/1; -+ long items_written = new long 1; - long utf16Ptr = OS.g_utf8_to_utf16(utf8Ptr, -1, null, items_written, null); - OS.g_free(utf8Ptr); - if (utf16Ptr == 0) continue; -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java -index a78ce8bccf..1b152d4960 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java -@@ -76,9 +76,9 @@ public void javaToNative (Object object, TransferData transferData) { - String string = (String)object; - byte utf8 = Converter.wcsToMbcs (string, true); - if (OS.isX11() && transferData.type == COMPOUND_TEXT_ID) { -- long /*int*/ encoding = new long /*int*/1; -+ long encoding = new long 1; - int format = new int1; -- long /*int*/ ctext = new long /*int*/1; -+ long ctext = new long 1; - int length = new int1; - boolean result = GDK.gdk_x11_display_utf8_to_compound_text (GDK.gdk_display_get_default(), utf8, encoding, format, ctext, length); - if (!result) return; -@@ -121,10 +121,10 @@ public void javaToNative (Object object, TransferData transferData) { - @Override - public Object nativeToJava(TransferData transferData){ - if (!isSupportedType(transferData) || transferData.pValue == 0) return null; -- long /*int*/ list = new long /*int*/1; -+ long list = new long 1; - int count = GDK.gdk_text_property_to_utf8_list_for_display(GDK.gdk_display_get_default(), transferData.type, transferData.format, transferData.pValue, transferData.length, list); - if (count == 0) return null; -- long /*int*/ ptr = new long /*int*/1; -+ long ptr = new long 1; - C.memmove(ptr, list0, C.PTR_SIZEOF); - int length = C.strlen(ptr0); - byte utf8 = new bytelength; -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c -index f2ba212bac..6b5a7c2a19 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c -@@ -1861,24 +1861,24 @@ JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1pixbuf_1scale_1simple) - - #ifndef NO__1gdk_1property_1get - JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1property_1get) -- (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jintLongArray arg6, jintArray arg7, jintArray arg8, jintLongArray arg9) -+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8, jlongArray arg9) - { -- jintLong *lparg6=NULL; -+ jlong *lparg6=NULL; - jint *lparg7=NULL; - jint *lparg8=NULL; -- jintLong *lparg9=NULL; -+ jlong *lparg9=NULL; - jboolean rc = 0; - GDK_NATIVE_ENTER(env, that, _1gdk_1property_1get_FUNC); -- if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail; -+ if (arg6) if ((lparg6 = (*env)->GetLongArrayElements(env, arg6, NULL)) == NULL) goto fail; - if (arg7) if ((lparg7 = (*env)->GetIntArrayElements(env, arg7, NULL)) == NULL) goto fail; - if (arg8) if ((lparg8 = (*env)->GetIntArrayElements(env, arg8, NULL)) == NULL) goto fail; -- if (arg9) if ((lparg9 = (*env)->GetIntLongArrayElements(env, arg9, NULL)) == NULL) goto fail; -+ if (arg9) if ((lparg9 = (*env)->GetLongArrayElements(env, arg9, NULL)) == NULL) goto fail; - rc = (jboolean)gdk_property_get((GdkWindow *)arg0, (GdkAtom)arg1, (GdkAtom)arg2, arg3, arg4, arg5, (GdkAtom *)lparg6, (gint *)lparg7, (gint *)lparg8, (guchar **)lparg9); - fail: -- if (arg9 && lparg9) (*env)->ReleaseIntLongArrayElements(env, arg9, lparg9, 0); -+ if (arg9 && lparg9) (*env)->ReleaseLongArrayElements(env, arg9, lparg9, 0); - if (arg8 && lparg8) (*env)->ReleaseIntArrayElements(env, arg8, lparg8, 0); - if (arg7 && lparg7) (*env)->ReleaseIntArrayElements(env, arg7, lparg7, 0); -- if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(env, arg6, lparg6, 0); -+ if (arg6 && lparg6) (*env)->ReleaseLongArrayElements(env, arg6, lparg6, 0); - GDK_NATIVE_EXIT(env, that, _1gdk_1property_1get_FUNC);
View file
_service:tar_scm:Remove-traces-of-32-bit-support.patch
Deleted
@@ -1,2517 +0,0 @@ -From 5251f6612c0f087cbadc86a8741a9a3074dddb29 Mon Sep 17 00:00:00 2001 -From: Nikita Nemkin -Date: Fri, 10 Jan 2020 00:42:57 +0500 -Subject: Bug 559057 - JNI Remove traces of 32-bit support - -Remove uses of 32-bit compatibility definitions like jintLong. - -Change-Id: Ibdff499435f8cb3de4ea7c3adba153bb7bbbabbe -Signed-off-by: Nikita Nemkin <nikita@nemkin.ru> ---- - .../Eclipse SWT AWT/cocoa/library/swt_awt.c | 8 +- - .../Eclipse SWT AWT/gtk/library/swt_awt.c | 8 +- - .../Eclipse SWT AWT/win32/library/swt_awt.c | 8 +- - .../Eclipse SWT PI/cocoa/library/os.h | 2 +- - .../Eclipse SWT PI/cocoa/library/os_custom.c | 78 +- - .../Eclipse SWT PI/gtk/library/os_custom.c | 186 ++-- - .../Eclipse SWT PI/gtk/library/os_custom.h | 6 +- - .../Eclipse SWT PI/win32/library/os_custom.c | 6 +- - .../Eclipse SWT WebKit/gtk/library/webkitgtk.h | 2 +- - .../gtk/library/webkitgtk_custom.c | 6 +- - .../gtk/library/webkitgtk_custom.h | 2 +- - .../org/eclipse/swt/internal/webkit/WebKitGTK.java | 2 +- - .../win32/library/webkit_win32_custom.cpp | 44 +- - .../Eclipse SWT/common/library/callback.c | 967 +++++++++------------ - .../Eclipse SWT/common/library/callback.h | 27 +- - .../Eclipse SWT/common/library/swt.h | 68 +- - 16 files changed, 609 insertions(+), 811 deletions(-) - -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/library/swt_awt.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/library/swt_awt.c -index be05c66c7e..ddb2e96141 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/library/swt_awt.c -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/library/swt_awt.c -@@ -35,10 +35,10 @@ JAWT_MacOSXDrawingSurfaceInfo; - - - #ifndef NO_getAWTHandle --JNIEXPORT jintLong JNICALL SWT_AWT_NATIVE(getAWTHandle) -+JNIEXPORT jlong JNICALL SWT_AWT_NATIVE(getAWTHandle) - (JNIEnv *env, jclass that, jobject canvas) - { -- jintLong result = 0; -+ jlong result = 0; - JAWT awt; - JAWT_DrawingSurface* ds; - JAWT_DrawingSurfaceInfo* dsi; -@@ -53,7 +53,7 @@ JNIEXPORT jintLong JNICALL SWT_AWT_NATIVE(getAWTHandle) - if ((lock & JAWT_LOCK_ERROR) == 0) { - dsi = ds->GetDrawingSurfaceInfo(ds); - dsi_cocoa = (JAWT_MacOSXDrawingSurfaceInfo*)dsi->platformInfo; -- result = (jintLong)dsi_cocoa->cocoaViewRef; -+ result = (jlong)dsi_cocoa->cocoaViewRef; - ds->FreeDrawingSurfaceInfo(dsi); - ds->Unlock(ds); - } -@@ -66,7 +66,7 @@ JNIEXPORT jintLong JNICALL SWT_AWT_NATIVE(getAWTHandle) - - #ifndef NO_initFrame - JNIEXPORT jobject JNICALL Java_org_eclipse_swt_awt_SWT_1AWT_initFrame -- (JNIEnv *env, jclass that, jintLong handle, const char *className) -+ (JNIEnv *env, jclass that, jlong handle, const char *className) - { - jobject object; - jmethodID constructor; -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/library/swt_awt.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/library/swt_awt.c -index 789a04a89a..47ea741f47 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/library/swt_awt.c -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/library/swt_awt.c -@@ -18,14 +18,14 @@ - #define SWT_AWT_NATIVE(func) Java_org_eclipse_swt_awt_SWT_1AWT_##func - - #ifndef NO_getAWTHandle --JNIEXPORT jintLong JNICALL SWT_AWT_NATIVE(getAWTHandle) -+JNIEXPORT jlong JNICALL SWT_AWT_NATIVE(getAWTHandle) - (JNIEnv *env, jclass that, jobject canvas) - { - JAWT awt; - JAWT_DrawingSurface* ds; - JAWT_DrawingSurfaceInfo* dsi; - JAWT_X11DrawingSurfaceInfo* dsi_x11; -- jintLong result = 0; -+ jlong result = 0; - jint lock; - - awt.version = JAWT_VERSION_1_3; -@@ -36,7 +36,7 @@ JNIEXPORT jintLong JNICALL SWT_AWT_NATIVE(getAWTHandle) - if ((lock & JAWT_LOCK_ERROR) == 0) { - dsi = ds->GetDrawingSurfaceInfo(ds); - dsi_x11 = (JAWT_X11DrawingSurfaceInfo*)dsi->platformInfo; -- result = (jintLong)dsi_x11->drawable; -+ result = (jlong)dsi_x11->drawable; - ds->FreeDrawingSurfaceInfo(dsi); - ds->Unlock(ds); - } -@@ -77,7 +77,7 @@ JNIEXPORT void JNICALL SWT_AWT_NATIVE(setDebug) - - #ifndef NO_initFrame - JNIEXPORT jobject JNICALL Java_org_eclipse_swt_awt_SWT_1AWT_initFrame -- (JNIEnv *env, jclass that, jintLong handle) -+ (JNIEnv *env, jclass that, jlong handle) - { - jobject object; - jmethodID constructor; -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/library/swt_awt.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/library/swt_awt.c -index 98aff60d36..736a131bac 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/library/swt_awt.c -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/library/swt_awt.c -@@ -18,14 +18,14 @@ - #define SWT_AWT_NATIVE(func) Java_org_eclipse_swt_awt_SWT_1AWT_##func - - #ifndef NO_getAWTHandle --JNIEXPORT jintLong JNICALL SWT_AWT_NATIVE(getAWTHandle) -+JNIEXPORT jlong JNICALL SWT_AWT_NATIVE(getAWTHandle) - (JNIEnv *env, jclass that, jobject canvas) - { - JAWT awt; - JAWT_DrawingSurface* ds; - JAWT_DrawingSurfaceInfo* dsi; - JAWT_Win32DrawingSurfaceInfo* dsi_win; -- jintLong result = 0; -+ jlong result = 0; - jint lock; - - awt.version = JAWT_VERSION_1_3; -@@ -36,7 +36,7 @@ JNIEXPORT jintLong JNICALL SWT_AWT_NATIVE(getAWTHandle) - if ((lock & JAWT_LOCK_ERROR) == 0) { - dsi = ds->GetDrawingSurfaceInfo(ds); - dsi_win = (JAWT_Win32DrawingSurfaceInfo*)dsi->platformInfo; -- result = (jintLong)dsi_win->hwnd; -+ result = (jlong)dsi_win->hwnd; - ds->FreeDrawingSurfaceInfo(dsi); - ds->Unlock(ds); - } -@@ -49,7 +49,7 @@ JNIEXPORT jintLong JNICALL SWT_AWT_NATIVE(getAWTHandle) - - #ifndef NO_initFrame - JNIEXPORT jobject JNICALL SWT_AWT_NATIVE(initFrame) -- (JNIEnv *env, jclass that, jintLong handle, jstring className) -+ (JNIEnv *env, jclass that, jlong handle, jstring className) - { - jobject object; - jmethodID constructor; -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h -index 8166f08ccb..69dd08fc61 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h -@@ -27,7 +27,7 @@ - - #include "os_custom.h" - --extern jint CPSSetProcessName(void *, jintLong); -+extern jint CPSSetProcessName(void *, jlong); - - #define OS_LOAD_FUNCTION LOAD_FUNCTION - -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.c -index c38dfd8e84..f23e43daa6 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.c -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.c -@@ -29,7 +29,7 @@ - - #ifndef NO_JNIGetObject - JNIEXPORT jobject JNICALL OS_NATIVE(JNIGetObject) -- (JNIEnv *env, jclass that, jintLong arg0) -+ (JNIEnv *env, jclass that, jlong arg0) - { - jobject rc = 0; - OS_NATIVE_ENTER(env, that, JNIGetObject_FUNC); -@@ -40,27 +40,27 @@ JNIEXPORT jobject JNICALL OS_NATIVE(JNIGetObject) - #endif - - #ifndef NO_FindWindow --JNIEXPORT jintLong JNICALL OS_NATIVE(FindWindow) --(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2) -+JNIEXPORT jlong JNICALL OS_NATIVE(FindWindow) -+(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2) - { -- jintLong *lparg2=NULL; -- jintLong rc = 0; -+ jlong *lparg2=NULL; -+ jlong rc = 0; - Point p; - p.h = (short)arg0; - p.v = (short)arg1; - OS_NATIVE_ENTER(env, that, FindWindow_FUNC); -- if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; -+ if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail; - /* -- rc = (jintLong)FindWindow(arg0, arg1, (WindowRef *)lparg2); -+ rc = (jlong)FindWindow(arg0, arg1, (WindowRef *)lparg2); - */ - { - OS_LOAD_FUNCTION(fp, FindWindow) - if (fp) { -- rc = (jintLong)((jintLong (CALLING_CONVENTION*)(Point, WindowRef *))fp)(p, (WindowRef *)lparg2); -+ rc = (jlong)((jlong (CALLING_CONVENTION*)(Point, WindowRef *))fp)(p, (WindowRef *)lparg2); - } - } - fail: -- if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
View file
_service:tar_scm:eclipse-feature-plugins-to-category-ius.patch
Changed
@@ -196,7 +196,7 @@ - <requirement> - <type>eclipse-plugin</type> - <id>javax.el</id> -+ <id>jakarta.el-api</id> ++ <id>javax.el-api</id> <versionRange>0.0.0</versionRange> </requirement> <requirement>
View file
_service:tar_scm:riscv.patch
Deleted
@@ -1,127 +0,0 @@ ---- eclipse-platform-sources-I20190307-0500/eclipse.platform.swt.binaries/pom.xml 2022-06-13 09:02:04.367331800 +0800 -+++ eclipse-platform-sources-I20190307-0500/eclipse.platform.swt.binaries/pom.xml 2022-06-13 09:03:20.532068500 +0800 -@@ -56,6 +56,7 @@ - <module>bundles/org.eclipse.swt.cocoa.macosx.x86_64</module> - <module>bundles/org.eclipse.swt.gtk.linux.arm</module> - <module>bundles/org.eclipse.swt.gtk.linux.aarch64</module> -+ <module>bundles/org.eclipse.swt.gtk.linux.riscv64</module> - <module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module> - <module>bundles/org.eclipse.swt.gtk.linux.s390x</module> - <module>bundles/org.eclipse.swt.gtk.linux.x86</module> ---- eclipse-platform-sources-I20190307-0500/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2022-06-13 09:10:02.313013100 +0800 -+++ eclipse-platform-sources-I20190307-0500/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2022-06-13 09:10:58.177096200 +0800 -@@ -43,4 +43,9 @@ - requires.9.namespace = org.eclipse.equinox.p2.iu - requires.9.name = org.eclipse.swt.gtk.linux.x86 - requires.9.range = $version$,$version$ --requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86)(!(org.eclipse.swt.buildtime=true))) -+requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86)(!(org.eclipse.swt.buildtime=true))) -+ -+requires.10.namespace = org.eclipse.equinox.p2.iu -+requires.10.name = org.eclipse.swt.gtk.linux.riscv64 -+requires.10.range = $version$,$version$ -+requires.10.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=riscv64)(!(org.eclipse.swt.buildtime=true))) ---- 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/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2022-06-10 14:56:59.849231400 +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" -@@ -469,6 +479,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"/> - ---- 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/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2022-06-10 14:59:51.086049000 +0800 -@@ -44,6 +44,7 @@ - <plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/> - <plugin id="org.eclipse.equinox.launcher.gtk.linux.arm" /> - <plugin id="org.eclipse.equinox.launcher.gtk.linux.aarch64" /> -+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.riscv64" /> - <plugin id="org.eclipse.equinox.launcher.gtk.linux.s390x" /> - <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86" /> - <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" /> ---- 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/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2022-06-10 15:02:06.582577100 +0800 -@@ -39,6 +39,9 @@ - root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root - root.linux.gtk.aarch64.permissions.755=launcher - -+root.linux.gtk.riscv64=bin/gtk/linux/riscv64,gtk_root -+root.linux.gtk.riscv64.permissions.755=launcher -+ - root.linux.gtk.s390x=bin/gtk/linux/s390x,gtk_root - root.linux.gtk.s390x.permissions.755=launcher - ---- 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/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2022-06-10 15:04:52.156916700 +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}>" - ;; ---- eclipse-platform-sources-I20190307-0500/rt.equinox.framework/pom.xml 2022-06-10 17:08:02.791754200 +0800 -+++ eclipse-platform-sources-I20190307-0500/rt.equinox.framework/pom.xml 2022-06-10 17:09:14.079668300 +0800 -@@ -74,6 +74,18 @@ - </modules> - </profile> - <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> - <id>build-native-launchers-gtk.linux.s390x</id> - <activation> - <property> ---- eclipse-platform-sources-I20190307-0500/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2022-06-10 17:54:33.365416200 +0800 -+++ eclipse-platform-sources-I20190307-0500/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2022-06-10 17:55:46.766618600 +0800 -@@ -134,6 +134,7 @@ - <include name="gtk/linux/x86/**/*"/> - <include name="gtk/linux/x86_64/**/*"/> - <include name="win32/win32/x86_64/**/*"/> -+ <include name="gtk/linux/riscv64/**/*"/> - </fileset> - </copy> - <!-- rename eclipse launchers to "launcher" -->
View file
_service:tar_scm:switch-to-the-new-httpclient45-ECF-provider_2.patch
Deleted
@@ -1,36 +0,0 @@ -From 412a5c1bbdae63f03212f9ad25ac71e54e222f4f Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Thu, 16 May 2019 16:49:38 +0100 -Subject: Bug 545718 - Update prereqs for 4.12 release: ECF - -Switch to the new httpclient45 ECF provider. - -Change-Id: I8b3b79d33fce0a7f4b688718c10d5e76b9169396 -Signed-off-by: Mat Booth <mat.booth@redhat.com> ---- - bundles/org.eclipse.platform.doc.isv/pom.xml | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -(limited to 'bundles/org.eclipse.platform.doc.isv/pom.xml') - -diff --git a/bundles/org.eclipse.platform.doc.isv/pom.xml b/bundles/org.eclipse.platform.doc.isv/pom.xml -index 63638a05d..3d7d4761e 100644 ---- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml -+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml -@@ -163,12 +163,7 @@ - </requirement> - <requirement> - <type>eclipse-plugin</type> -- <id>org.eclipse.ecf.provider.filetransfer.httpclient4</id> -- <versionRange>0.0.0</versionRange> -- </requirement> -- <requirement> -- <type>eclipse-plugin</type> -- <id>org.eclipse.ecf.provider.filetransfer.httpclient4.ssl</id> -+ <id>org.eclipse.ecf.provider.filetransfer.httpclient45</id> - <versionRange>0.0.0</versionRange> - </requirement> - <requirement> --- -cgit v1.2.3 -
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">master-riscv64</param> + <param name="revision">master</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