Hello community, here is the log from the commit of package eclipse-swt for openSUSE:Factory checked in at 2014-01-17 12:00:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eclipse-swt (Old) and /work/SRC/openSUSE:Factory/.eclipse-swt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eclipse-swt" Changes: -------- --- /work/SRC/openSUSE:Factory/eclipse-swt/eclipse-swt.changes 2012-10-19 12:05:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.eclipse-swt.new/eclipse-swt.changes 2014-01-23 15:42:12.000000000 +0100 @@ -0,0 +1,16 @@ +------------------------------------------------------------------- +Tue Jan 14 23:12:53 EET 2014 - [email protected] +- Fix build for openSUSE Tumbleweed and 11.4 + +------------------------------------------------------------------- +Tue Jan 14 09:10:15 UTC 2014 - [email protected] +- update to version 4.333 +- remove libswt-version.patch +- add libswt-plugindir.patch + +------------------------------------------------------------------- +Thu Jan 2 14:27:49 UTC 2014 - [email protected] +- enable ppc64le build +- add ppc64le.patch + +------------------------------------------------------------------- @@ -6 +21,0 @@ - @@ -11 +25,0 @@ - @@ -16 +29,0 @@ - @@ -26 +38,0 @@ - @@ -31 +42,0 @@ - Old: ---- libswt-3.735.tar.bz2 libswt-version.patch org.eclipse.swt-3.7.0.tar.bz2 New: ---- libswt-4.333.tar.bz2 libswt-plugindir.patch org.eclipse.swt-4.3.1.tar.bz2 ppc64le.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eclipse-swt.spec ++++++ --- /var/tmp/diff_new_pack.Mapidz/_old 2014-01-23 15:42:13.000000000 +0100 +++ /var/tmp/diff_new_pack.Mapidz/_new 2014-01-23 15:42:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package eclipse-swt # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,18 +20,19 @@ Summary: SWT Library for GTK2 License: EPL-1.0 Group: Development/Libraries/Other -Version: 3.735 -Release: 0 -%define version_suffix 3.7.3.5 -%define so_suffix 3735 +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-3.7.0.tar.bz2 +Source1: org.eclipse.swt-4.3.1.tar.bz2 Source2: build.xml Patch0: libswt-optflags.patch Patch1: libswt-includes.patch Patch2: libswt-build.patch -Patch3: libswt-version.patch +Patch3: libswt-plugindir.patch +Patch4: ppc64le.patch Provides: libswt3-gtk2 = %{version} %if 0%{?suse_version} <= 1210 Requires: mozilla-xulrunner192 @@ -47,8 +48,10 @@ BuildRequires: make BuildRequires: pkg-config BuildRequires: unzip +BuildRequires: zip %if 0%{?suse_version} <= 1210 BuildRequires: mozilla-xulrunner192-devel +BuildRequires: libxslt %else BuildRequires: libXt-devel BuildRequires: libXtst-devel @@ -70,22 +73,19 @@ set of native widgets. %prep -%setup -n libswt-%{version} +%setup -q -n libswt-%{version} %patch0 %patch1 %patch2 pushd org/eclipse -tar -xvjf %{S:1} +tar -xjf %{S:1} %patch3 popd +%patch4 pushd org/eclipse/swt cp %{S:2} . # remove all third party jars find . -iname '*.jar' | xargs rm -rf -# change architecture if needed -%ifarch x86_64 -sed -i -e 's|x86|x86_64|g' build.xml -%endif popd %build @@ -94,7 +94,11 @@ %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 @@ -105,19 +109,23 @@ pushd org/eclipse/swt %ant \ +%ifarch x86_64 + -Dswt.arch=x86_64 \ +%else + -Dswt.arch=x86 \ +%endif -Dversion.suffix=%{version_suffix} \ -Djar.filename=swt-%{version}.jar \ build.jars rm build.xml popd -jar uf org/eclipse/swt/swt-%{version}.jar *.so - +zip -u org/eclipse/swt/swt-%{version}.jar *.so %install install -d -m755 %{buildroot}%{_libdir}/eclipse install -m644 *.so %{buildroot}%{_libdir}/eclipse install -D -m644 org/eclipse/swt/swt-%{version}.jar %{buildroot}%{_libdir}/java/swt-gtk-%{version}.jar pushd %{buildroot}%{_libdir}/eclipse -%if 0%{?suse_version} <= 1210 +%if 0%{?suse_version} < 1210 for i in atk-gtk awt-gtk cairo-gtk glx-gtk gnome-gtk gtk mozilla-gtk pi-gtk webkit-gtk; do ln -sf libswt-"$i"-%{so_suffix}.so libswt-"$i".so; ln -sf libswt-"$i"-%{so_suffix}.so swt-"$i".so; @@ -135,9 +143,6 @@ ln -sf swt-gtk-%{version}.jar swt-gtk.jar popd -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root) %{_libdir}/eclipse/libswt-atk-gtk-%{so_suffix}.so @@ -158,8 +163,7 @@ %{_libdir}/eclipse/libswt-gtk-%{so_suffix}.so %{_libdir}/eclipse/libswt-gtk.so %{_libdir}/eclipse/swt-gtk.so -%if 0%{?suse_version} <= 1210 -%{_libdir}/eclipse/libswt-mozilla-gtk-%{so_suffix}.so +%if 0%{?suse_version} < 1210 %{_libdir}/eclipse/libswt-mozilla-gtk.so %{_libdir}/eclipse/swt-mozilla-gtk.so %endif ++++++ libswt-3.735.tar.bz2 -> libswt-4.333.tar.bz2 ++++++ ++++ 76784 lines of diff (skipped) ++++++ libswt-build.patch ++++++ --- /var/tmp/diff_new_pack.Mapidz/_old 2014-01-23 15:42:14.000000000 +0100 +++ /var/tmp/diff_new_pack.Mapidz/_new 2014-01-23 15:42:14.000000000 +0100 @@ -1,6 +1,6 @@ ---- build.sh.orig 2011-03-17 20:04:59.000000000 +0100 -+++ build.sh 2011-03-17 20:04:59.000000000 +0100 -@@ -148,9 +148,9 @@ +--- build.sh.orig 2014-01-13 20:12:14.838334949 +0100 ++++ build.sh 2014-01-13 20:12:14.878334145 +0100 +@@ -472,9 +472,9 @@ fi if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${MODEL} != 'sparc64' ]; then ++++++ libswt-optflags.patch ++++++ --- /var/tmp/diff_new_pack.Mapidz/_old 2014-01-23 15:42:14.000000000 +0100 +++ /var/tmp/diff_new_pack.Mapidz/_new 2014-01-23 15:42:14.000000000 +0100 @@ -1,6 +1,6 @@ ---- make_linux.mak.orig 2010-10-09 13:21:38.000000000 +0200 -+++ make_linux.mak 2010-10-09 13:21:38.000000000 +0200 -@@ -107,7 +107,7 @@ +--- make_linux.mak.orig 2014-01-11 15:37:31.853696321 +0100 ++++ make_linux.mak 2014-01-11 15:37:31.875695888 +0100 +@@ -115,7 +115,7 @@ WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o @@ -9,7 +9,7 @@ -DSWT_VERSION=$(SWT_VERSION) \ $(NATIVE_STATS) \ -DLINUX -DGTK \ -@@ -222,19 +222,19 @@ +@@ -230,19 +230,19 @@ make_mozilla:$(MOZILLA_LIB) $(MOZILLA_LIB): $(MOZILLA_OBJECTS) @@ -34,10 +34,10 @@ # # XULRunner lib -@@ -242,19 +242,19 @@ - make_xulrunner:$(XULRUNNER_LIB) +@@ -251,19 +251,19 @@ $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS) + echo -e "#include<stdlib.h>\nsize_t je_malloc_usable_size_in_advance(size_t n) {\nreturn n;\n}" | gcc $(LFLAGS) $(CFLAGS) -xc - -o libswt-xulrunner-fix.so - $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} + $(CXX) $(RPM_OPT_FLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} @@ -59,7 +59,7 @@ # # XPCOMInit lib -@@ -262,16 +262,16 @@ +@@ -271,16 +271,16 @@ make_xpcominit:$(XPCOMINIT_LIB) $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS) ++++++ libswt-plugindir.patch ++++++ --- org.eclipse.swt/buildFragment.xml.orig 2011-09-24 23:24:09.004000036 +0200 +++ org.eclipse.swt/buildFragment.xml 2011-09-24 23:24:09.038000036 +0200 @@ -23,6 +23,7 @@ <property name="plugin.destination" value="${fragmentdir}" /> <property name="build.result.folder" value="${fragmentdir}" /> <property name="destination" value="${fragmentdir}" /> + <property name="plugindir" value="../org.eclipse.swt" /> <property name="javacVerbose" value="false" /> <property name="logExtension" value=".xml" /> <property name="javacSource" value="1.3" /> ++++++ org.eclipse.swt-3.7.0.tar.bz2 -> org.eclipse.swt-4.3.1.tar.bz2 ++++++ ++++ 336990 lines of diff (skipped) ++++++ ppc64le.patch ++++++ --- build.sh.orig 2013-09-11 10:41:54.000000000 +0200 +++ build.sh 2014-01-14 10:01:57.364202600 +0100 @@ -411,13 +411,13 @@ # For 64-bit CPUs, we have a switch -if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64' -o ${MODEL} = 's390x' ]; then +if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64' -o ${MODEL} = 's390x' ]; then SWT_PTR_CFLAGS=-DJNI64 if [ -d /lib64 ]; then XLIB64=-L/usr/X11R6/lib64 export XLIB64 fi - if [ ${MODEL} = 'ppc64' ]; then + if [ ${MODEL} = 'ppc64' -o ${MODEL} = 'ppc64le' ]; then if [ ${OS} = 'AIX' ]; then SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -maix64" SWT_LFLAGS=-maix64 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
