Hello community, here is the log from the commit of package eclipse-swt for openSUSE:Factory checked in at 2017-09-20 17:14:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eclipse-swt (Old) and /work/SRC/openSUSE:Factory/.eclipse-swt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eclipse-swt" Wed Sep 20 17:14:13 2017 rev:21 rq:527528 version:4.333 Changes: -------- --- /work/SRC/openSUSE:Factory/eclipse-swt/eclipse-swt.changes 2016-06-12 18:54:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.eclipse-swt.new/eclipse-swt.changes 2017-09-20 17:14:16.852126623 +0200 @@ -1,0 +2,18 @@ +Wed Sep 20 06:32:32 UTC 2017 - [email protected] + +- Drop libwebkit-devel BuildRequires: webkitgtk is deprecated, and + will be removed from tumbleweed. + +------------------------------------------------------------------- +Mon Sep 18 07:21:18 UTC 2017 - [email protected] + +- Temporarily build against jdk8 until the build is fixed +- Modified patch: + * libswt-includes.patch + + Do not explicitely look for gcj includes, since we use the + includes in JAVA_HOME +- Added patch: + * libswt-4.333-libjawt.patch + + Find libjawt correctly also in jdk9 + +------------------------------------------------------------------- New: ---- libswt-4.333-libjawt.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eclipse-swt.spec ++++++ --- /var/tmp/diff_new_pack.10WGAo/_old 2017-09-20 17:14:19.767716199 +0200 +++ /var/tmp/diff_new_pack.10WGAo/_new 2017-09-20 17:14:19.771715636 +0200 @@ -1,7 +1,7 @@ # # spec file for package eclipse-swt # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,14 @@ # +%define version_suffix 4.3.3.3 +%define so_suffix 4333 Name: eclipse-swt +Version: 4.333 +Release: 0 Summary: SWT Library for GTK2 License: EPL-1.0 Group: Development/Libraries/Other -Version: 4.333 -Release: 1 -%define version_suffix 4.3.3.3 -%define so_suffix 4333 Url: http://www.eclipse.org/swt/ Source0: libswt-%{version}.tar.bz2 Source1: org.eclipse.swt-4.3.1.tar.bz2 @@ -34,38 +34,38 @@ Patch3: libswt-plugindir.patch Patch4: ppc64le.patch Patch5: ppc64le_path_for_jre_1_7_0.patch -Provides: libswt3-gtk2 = %{version} -%if 0%{?suse_version} <= 1210 -Requires: mozilla-xulrunner192 -%endif -Requires: java >= 1.6 +Patch6: libswt-4.333-libjawt.patch +BuildRequires: Mesa-devel BuildRequires: ant +BuildRequires: cairo BuildRequires: gcc BuildRequires: gcc-c++ +BuildRequires: glib2-devel +BuildRequires: gnome-vfs2-devel +BuildRequires: gtk2-devel BuildRequires: java-devel >= 1.6 BuildRequires: jpackage-utils -BuildRequires: libgcj-devel -BuildRequires: libwebkit-devel +BuildRequires: libgnome-devel +BuildRequires: libgnomeui-devel BuildRequires: make -BuildRequires: pkg-config +BuildRequires: mozilla-nspr-devel +BuildRequires: pkgconfig BuildRequires: unzip BuildRequires: zip +BuildRequires: pkgconfig(glu) +Requires: java >= 1.6 +Provides: libswt3-gtk2 = %{version} +BuildConflicts: java-devel >= 1.9 +%if 0%{?suse_version} <= 1210 +Requires: mozilla-xulrunner192 +%endif %if 0%{?suse_version} <= 1210 -BuildRequires: mozilla-xulrunner192-devel BuildRequires: libxslt +BuildRequires: mozilla-xulrunner192-devel %else BuildRequires: libXt-devel BuildRequires: libXtst-devel %endif -BuildRequires: Mesa-devel -BuildRequires: cairo -BuildRequires: glib2-devel -BuildRequires: gnome-vfs2-devel -BuildRequires: gtk2-devel -BuildRequires: libgnome-devel -BuildRequires: libgnomeui-devel -BuildRequires: mozilla-nspr-devel -BuildRequires: pkgconfig(glu) %description SWT is the software component that delivers native widget functionality @@ -79,13 +79,14 @@ %patch1 %patch2 pushd org/eclipse -tar -xjf %{S:1} +tar -xjf %{SOURCE1} %patch3 popd %patch4 %patch5 -p1 +%patch6 -p1 pushd org/eclipse/swt -cp %{S:2} . +cp %{SOURCE2} . # remove all third party jars find . -iname '*.jar' | xargs rm -rf popd @@ -93,35 +94,18 @@ %build export LIBDIR=%{_libdir} export NO_STRIP=TRUE -%if 0%{?suse_version} <= 1140 -export GCJ_VERSION=4.5 -%else -%if 0%{?suse_version} <= 1210 -export GCJ_VERSION=4.6 -%else -export GCJ_VERSION=4.7 -%endif -%endif -%ifarch x86_64 -export ARCH=x86_64 -%else -export ARCH=i586 -%endif +export JAVA_HOME="%{_sysconfdir}/alternatives/java_sdk" ./build.sh pushd org/eclipse/swt -%ant \ -%ifarch x86_64 - -Dswt.arch=x86_64 \ -%else - -Dswt.arch=x86 \ -%endif +%{ant} \ -Dversion.suffix=%{version_suffix} \ -Djar.filename=swt-%{version}.jar \ build.jars rm build.xml popd zip -u org/eclipse/swt/swt-%{version}.jar *.so + %install install -d -m755 %{buildroot}%{_libdir}/eclipse install -m644 *.so %{buildroot}%{_libdir}/eclipse @@ -146,7 +130,6 @@ popd %files -%defattr(-,root,root) %{_libdir}/eclipse/libswt-atk-gtk-%{so_suffix}.so %{_libdir}/eclipse/libswt-atk-gtk.so %{_libdir}/eclipse/swt-atk-gtk.so ++++++ libswt-4.333-libjawt.patch ++++++ --- libswt-4.333/build.sh 2013-09-11 10:41:54.000000000 +0200 +++ libswt-4.333/build.sh 2017-09-18 09:02:16.621659303 +0200 @@ -502,8 +502,13 @@ AWT_LIB_PATH=${JAVA_HOME}/jre/lib/${AWT_ARCH} export AWT_LIB_PATH else - AWT_LIB_PATH=${JAVA_HOME}/jre/bin - export AWT_LIB_PATH + if [ -f ${JAVA_HOME}/lib/libjawt.* ]; then + AWT_LIB_PATH=${JAVA_HOME}/lib + export AWT_LIB_PATH + else + AWT_LIB_PATH=${JAVA_HOME}/jre/bin + export AWT_LIB_PATH + fi fi fi ++++++ libswt-includes.patch ++++++ --- /var/tmp/diff_new_pack.10WGAo/_old 2017-09-20 17:14:19.839706065 +0200 +++ /var/tmp/diff_new_pack.10WGAo/_new 2017-09-20 17:14:19.843705502 +0200 @@ -1,12 +1,11 @@ --- make_linux.mak.orig 2010-10-09 13:13:09.000000000 +0200 +++ make_linux.mak 2010-10-09 13:13:09.000000000 +0200 -@@ -113,6 +113,9 @@ +@@ -113,6 +113,8 @@ -DLINUX -DGTK \ -I$(JAVA_HOME)/include \ -I$(JAVA_HOME)/include/linux \ + -I/usr/include/xulrunner-$(XULRUNNER_VERSION) \ + -I/usr/include/nspr4 \ -+ -I$(LIBDIR)/gcc/$(ARCH)-suse-linux/$(GCJ_VERSION)/include \ -fPIC \ ${SWT_PTR_CFLAGS} LFLAGS = -shared -fPIC ${SWT_LFLAGS}
