Hello community,
here is the log from the commit of package eclipse for openSUSE:Factory checked
in at 2019-11-26 16:54:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/eclipse (Old)
and /work/SRC/openSUSE:Factory/.eclipse.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eclipse"
Tue Nov 26 16:54:29 2019 rev:2 rq:750484 version:4.9.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/eclipse/eclipse.changes 2019-11-19
13:44:38.480406538 +0100
+++ /work/SRC/openSUSE:Factory/.eclipse.new.26869/eclipse.changes
2019-11-26 16:54:56.864195277 +0100
@@ -1,0 +2,10 @@
+Sun Nov 24 06:50:20 UTC 2019 - Fridrich Strba <fst...@suse.com>
+
+- Added patch:
+ * eclipse-ppc64.patch
+ + Fix build of SWT on ppc64 big endian
+- Modified patch:
+ * eclipse-secondary-arches.patch
+ + Fix build on ppc64 big endian
+
+-------------------------------------------------------------------
New:
----
eclipse-ppc64.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ eclipse.spec ++++++
--- /var/tmp/diff_new_pack.2RgvlU/_old 2019-11-26 16:55:00.600194044 +0100
+++ /var/tmp/diff_new_pack.2RgvlU/_new 2019-11-26 16:55:00.604194042 +0100
@@ -1,7 +1,7 @@
#
# spec file for package eclipse
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -108,6 +108,8 @@
Patch31: eclipse-suse-batik.patch
# Fix build of ImageDescriptor.createImage(boolean, Device)
Patch32: eclipse-imagedescriptor.patch
+# Fix build on ppc64 big endian
+Patch33: eclipse-ppc64.patch
BuildRequires: ant >= 1.10.5
BuildRequires: ant-antlr
BuildRequires: ant-apache-bcel
@@ -140,6 +142,8 @@
BuildRequires: cbi-plugins
BuildRequires: desktop-file-utils
BuildRequires: easymock
+BuildRequires: eclipse-ecf-core >= 3.14.1
+BuildRequires: eclipse-emf-core > 2.14.99
BuildRequires: eclipse-license2
BuildRequires: gcc
BuildRequires: glassfish-el > 3.0.0
@@ -206,8 +210,6 @@
BuildRequires: pkgconfig(webkit2gtk-4.0)
BuildRequires: pkgconfig(xt)
BuildRequires: pkgconfig(xtst)
-BuildRequires: eclipse-ecf-core >= 3.14.1
-BuildRequires: eclipse-emf-core > 2.14.99
BuildConflicts: java-devel >= 9
%if %{with bootstrap}
Name: eclipse-bootstrap
@@ -497,6 +499,7 @@
%patch30 -p1
%patch31 -p1
%patch32 -p1
+%patch33 -p1
# Use ecj when bootstrapping
%if %{with bootstrap}
++++++ eclipse-ppc64.patch ++++++
---
"eclipse-platform-sources-I20180906-0745/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse
SWT PI/gtk/library/build.sh" 2018-08-21 14:03:55.000000000 +0200
+++
"eclipse-platform-sources-I20180906-0745/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse
SWT PI/gtk/library/build.sh" 2019-11-23 18:56:22.469583236 +0100
@@ -195,13 +195,13 @@
# For 64-bit CPUs, we have a switch
-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o
${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o
${MODEL} = 'ppc64le' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'aarch64' ]; then
SWT_PTR_CFLAGS=-DJNI64
if [ -d /lib64 ]; then
XLIB64=-L/usr/X11R6/lib64
export XLIB64
fi
- if [ ${MODEL} = 'ppc64le' ]; then
+ if [ ${MODEL} = 'ppc64le' -o ${MODEL} = 'ppc64']; then
SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -m64"
XLIB64="${XLIB64} -L/usr/lib64"
SWT_LFLAGS=-m64
++++++ eclipse-secondary-arches.patch ++++++
--- /var/tmp/diff_new_pack.2RgvlU/_old 2019-11-26 16:55:00.704194009 +0100
+++ /var/tmp/diff_new_pack.2RgvlU/_new 2019-11-26 16:55:00.704194009 +0100
@@ -1,11 +1,57 @@
-diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
-index 7e1f520..734dd10 100644
---- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
-+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
-@@ -418,6 +418,36 @@
- install-size="0"
- version="0.0.0"
+---
eclipse-platform-sources-I20180906-0745/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
2018-06-13 09:08:26.000000000 +0200
++++
eclipse-platform-sources-I20180906-0745/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
2019-11-23 19:43:05.635964482 +0100
+@@ -34,3 +34,23 @@
+ requires.7.name = org.eclipse.swt.gtk.linux.ppc64le
+ requires.7.range = [$version$,$version$]
+ requires.7.filter =
(&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
++
++requires.8.namespace = org.eclipse.equinox.p2.iu
++requires.8.name = org.eclipse.swt.gtk.linux.ppc64
++requires.8.range = [$version$,$version$]
++requires.8.filter =
(&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64)(!(org.eclipse.swt.buildtime=true)))
++
++requires.9.namespace = org.eclipse.equinox.p2.iu
++requires.9.name = org.eclipse.swt.gtk.linux.arm
++requires.9.range = [$version$,$version$]
++requires.9.filter =
(&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true)))
++
++requires.10.namespace = org.eclipse.equinox.p2.iu
++requires.10.name = org.eclipse.swt.gtk.linux.aarch64
++requires.10.range = [$version$,$version$]
++requires.10.filter =
(&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
++
++requires.11.namespace = org.eclipse.equinox.p2.iu
++requires.11.name = org.eclipse.swt.gtk.linux.s390x
++requires.11.range = [$version$,$version$]
++requires.11.filter =
(&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
+---
eclipse-platform-sources-I20180906-0745/eclipse.platform.swt.binaries/pom.xml
2018-09-06 13:47:25.000000000 +0200
++++
eclipse-platform-sources-I20180906-0745/eclipse.platform.swt.binaries/pom.xml
2019-11-23 19:43:05.635964482 +0100
+@@ -54,7 +54,11 @@
+
+ <modules>
+ <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.ppc64</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>
+ <module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
+ <module>bundles/org.eclipse.swt.win32.win32.x86</module>
+---
eclipse-platform-sources-I20180906-0745/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
2018-09-06 06:27:51.000000000 +0200
++++
eclipse-platform-sources-I20180906-0745/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
2019-11-23 19:44:52.823489642 +0100
+@@ -420,6 +420,46 @@
fragment="true"/>
+
+ <plugin
++ id="org.eclipse.equinox.launcher.gtk.linux.ppc64"
++ os="linux"
++ ws="gtk"
++ arch="ppc64"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"/>
+
+ <plugin
+ id="org.eclipse.equinox.launcher.gtk.linux.arm"
@@ -36,17 +82,15 @@
+ install-size="0"
+ version="0.0.0"
+ fragment="true"/>
-
- <plugin
- id="org.eclipse.equinox.launcher.gtk.linux.x86"
-@@ -496,6 +526,39 @@
- download-size="0"
- install-size="0"
- version="0.0.0"
-+ fragment="true"
-+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.launcher.gtk.linux.x86"
+ os="linux"
+ ws="gtk"
+@@ -500,6 +540,39 @@
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.swt.gtk.linux.s390x"
+ os="linux"
+ ws="gtk"
@@ -76,25 +120,43 @@
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++ <plugin
+ id="org.eclipse.swt.gtk.linux.ppc64le"
+ os="linux"
+ ws="gtk"
+@@ -507,6 +580,17 @@
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.swt.gtk.linux.ppc64"
++ os="linux"
++ ws="gtk"
++ arch="ppc64"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
fragment="true"
unpack="false"/>
----
a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
2014-11-28 15:09:42.000000000 +0000
-+++
b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
2014-11-28 16:52:00.315007846 +0000
-@@ -123,7 +123,11 @@
- <copy todir="bin" verbose="true" includeEmptyDirs="false"
failonerror="true">
- <fileset
dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/">
- <include name="cocoa/macosx/x86_64/**/*"/>
-+ <include name="gtk/linux/arm/**/*"/>
-+ <include name="gtk/linux/aarch64/**/*"/>
-+ <include name="gtk/linux/ppc64/**/*"/>
- <include name="gtk/linux/ppc64le/**/*"/>
-+ <include name="gtk/linux/s390x/**/*"/>
- <include name="gtk/linux/x86/**/*"/>
- <include name="gtk/linux/x86_64/**/*"/>
- <include name="win32/win32/x86/**/*"/>
----
a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
2015-01-30 14:44:03.436891441 +0000
-+++
b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
2015-01-30 14:45:25.232480509 +0000
+---
eclipse-platform-sources-I20180906-0745/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml
2019-11-23 19:40:36.264645015 +0100
++++
eclipse-platform-sources-I20180906-0745/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml
2019-11-23 20:29:03.687864708 +0100
+@@ -46,6 +46,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.ppc64" />
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.s390x" />
+ <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa"
/>
+ <plugin id="org.apache.commons.jxpath" />
+---
eclipse-platform-sources-I20180906-0745/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
2018-08-23 02:04:10.000000000 +0200
++++
eclipse-platform-sources-I20180906-0745/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
2019-11-23 19:43:05.631964499 +0100
@@ -37,3 +37,15 @@
root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
@@ -111,48 +173,8 @@
+
+root.linux.gtk.s390x=bin/gtk/linux/s390x,gtk_root
+root.linux.gtk.s390x.permissions.755=launcher
---- a/eclipse.platform.swt.binaries/pom.xml 2017-04-05 01:57:59.142576722
+0100
-+++ b/eclipse.platform.swt.binaries/pom.xml 2017-04-05 02:00:00.153247342
+0100
-@@ -54,7 +54,11 @@
-
- <modules>
- <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.ppc64</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>
- <module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
- <module>bundles/org.eclipse.swt.win32.win32.x86</module>
---- a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
2017-04-21 10:15:34.857977599 +0100
-+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
2017-04-21 10:18:22.878025820 +0100
-@@ -34,3 +34,23 @@
- requires.7.name = org.eclipse.swt.gtk.linux.ppc64le
- requires.7.range = [$version$,$version$]
- requires.7.filter =
(&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
-+
-+requires.8.namespace = org.eclipse.equinox.p2.iu
-+requires.8.name = org.eclipse.swt.gtk.linux.ppc64
-+requires.8.range = [$version$,$version$]
-+requires.8.filter =
(&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64)(!(org.eclipse.swt.buildtime=true)))
-+
-+requires.9.namespace = org.eclipse.equinox.p2.iu
-+requires.9.name = org.eclipse.swt.gtk.linux.arm
-+requires.9.range = [$version$,$version$]
-+requires.9.filter =
(&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true)))
-+
-+requires.10.namespace = org.eclipse.equinox.p2.iu
-+requires.10.name = org.eclipse.swt.gtk.linux.aarch64
-+requires.10.range = [$version$,$version$]
-+requires.10.filter =
(&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
-+
-+requires.11.namespace = org.eclipse.equinox.p2.iu
-+requires.11.name = org.eclipse.swt.gtk.linux.s390x
-+requires.11.range = [$version$,$version$]
-+requires.11.filter =
(&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
----
a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
2017-04-19 13:31:15.000000000 +0100
-+++
b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
2017-04-23 16:58:34.022207885 +0100
+---
eclipse-platform-sources-I20180906-0745/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
2018-08-23 02:04:10.000000000 +0200
++++
eclipse-platform-sources-I20180906-0745/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
2019-11-23 19:43:05.635964482 +0100
@@ -109,7 +109,7 @@
"s390x")
defaultOSArch="s390x"
@@ -162,8 +184,22 @@
;;
arm*)
defaultOSArch="arm"
---- a/rt.equinox.framework/pom.xml 2017-04-26 22:19:15.548461372 +0100
-+++ b/rt.equinox.framework/pom.xml 2017-04-26 22:20:41.348571492 +0100
+---
eclipse-platform-sources-I20180906-0745/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
2018-09-06 13:47:31.000000000 +0200
++++
eclipse-platform-sources-I20180906-0745/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
2019-11-23 19:43:05.631964499 +0100
+@@ -123,7 +123,11 @@
+ <copy todir="bin" verbose="true" includeEmptyDirs="false"
failonerror="true">
+ <fileset
dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/">
+ <include name="cocoa/macosx/x86_64/**/*"/>
++ <include name="gtk/linux/arm/**/*"/>
++ <include name="gtk/linux/aarch64/**/*"/>
++ <include name="gtk/linux/ppc64/**/*"/>
+ <include name="gtk/linux/ppc64le/**/*"/>
++ <include name="gtk/linux/s390x/**/*"/>
+ <include name="gtk/linux/x86/**/*"/>
+ <include name="gtk/linux/x86_64/**/*"/>
+ <include name="win32/win32/x86/**/*"/>
+--- eclipse-platform-sources-I20180906-0745/rt.equinox.framework/pom.xml
2018-09-06 13:47:31.000000000 +0200
++++ eclipse-platform-sources-I20180906-0745/rt.equinox.framework/pom.xml
2019-11-23 19:43:05.635964482 +0100
@@ -73,6 +73,30 @@
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
</modules>
