Hello community, here is the log from the commit of package eclipse-swt for openSUSE:Factory checked in at 2014-05-21 16:19:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-05-17 21:43:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.eclipse-swt.new/eclipse-swt.changes 2014-05-21 16:19:06.000000000 +0200 @@ -1,0 +2,7 @@ +Mon May 19 09:27:48 UTC 2014 - sch...@suse.de + +- Fix bogus arch setting +- jni64.patch: Fix JNI64 setting +- build.patch: Fix AWT_ARCH setting + +------------------------------------------------------------------- @@ -2,0 +10 @@ + @@ -9,0 +18 @@ + @@ -13,0 +23 @@ + @@ -19,0 +30 @@ + @@ -24,0 +36 @@ + @@ -28,0 +41 @@ + @@ -32,0 +46 @@ + @@ -36,0 +51 @@ + @@ -40,0 +56 @@ + @@ -45,0 +62 @@ + @@ -49,0 +67 @@ + @@ -54,0 +73 @@ + @@ -58,0 +78 @@ + @@ -62,0 +83 @@ + @@ -66,0 +88 @@ + @@ -70,0 +93 @@ + @@ -74,0 +98 @@ + New: ---- build.patch jni64.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eclipse-swt.spec ++++++ --- /var/tmp/diff_new_pack.9SaMWV/_old 2014-05-21 16:19:08.000000000 +0200 +++ /var/tmp/diff_new_pack.9SaMWV/_new 2014-05-21 16:19:08.000000000 +0200 @@ -26,6 +26,8 @@ %define so_suffix 4335 Url: http://www.eclipse.org/swt/ Source: http://git.eclipse.org/c/platform/eclipse.platform.swt.git/snapshot/R4_3_2.tar.bz2 +Patch1: jni64.patch +Patch2: build.patch Provides: libswt3-gtk2 = %{version} %if 0%{?suse_version} <= 1210 Requires: mozilla-xulrunner192 @@ -57,10 +59,10 @@ BuildRequires: libgnomeui-devel BuildRequires: mozilla-nspr-devel BuildRequires: pkgconfig(glu) -%ifarch x86_64 -%define swtarch x86_64 -%else +%ifarch %ix86 %define swtarch x86 +%else +%define swtarch %{_target_cpu} %endif %description @@ -70,8 +72,9 @@ set of native widgets. %prep -%setup -D -T -c eclipse-swt-4.333 -tar -xjf %{S:0} +%setup -q -c eclipse-swt-4.333 +%patch1 -p1 +%patch2 -p1 mv R4_3_2 eclipse.platform.swt %build @@ -90,10 +93,10 @@ %endif %endif -%ifarch x86_64 -export ARCH=x86_64 -%else +%ifarch %ix86 export ARCH=i586 +%else +export ARCH=%{_target_cpu} %endif %ant \ @@ -119,18 +122,15 @@ install -m644 eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.%{swtarch}/*.so %{buildroot}%{_libdir}/eclipse install -D -m644 eclipse.platform.swt/bundles/org.eclipse.swt/swt-%{version}.jar %{buildroot}%{_libdir}/java/swt-gtk-%{version}.jar pushd %{buildroot}%{_libdir}/eclipse -%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; -done -%else # Drop mozilla-gtk in openSUSE 12.2 because of not existing mozilla-xulrunner192-devel -for i in atk-gtk awt-gtk cairo-gtk glx-gtk gnome-gtk gtk pi-gtk webkit-gtk; do +libs="atk-gtk awt-gtk cairo-gtk glx-gtk gnome-gtk gtk pi-gtk webkit-gtk" +%if 0%{?suse_version} < 1210 +libs="$libs mozilla-gtk" +%endif +for i in $libs; do ln -sf libswt-"$i"-%{so_suffix}.so libswt-"$i".so; ln -sf libswt-"$i"-%{so_suffix}.so swt-"$i".so; done -%endif popd pushd %{buildroot}%{_libdir}/java ln -sf swt-gtk-%{version}.jar swt.jar @@ -142,9 +142,7 @@ %{_libdir}/eclipse/libswt-atk-gtk-%{so_suffix}.so %{_libdir}/eclipse/libswt-atk-gtk.so %{_libdir}/eclipse/swt-atk-gtk.so -%ifarch x86_64 %{_libdir}/eclipse/libswt-awt-gtk-%{so_suffix}.so -%endif %{_libdir}/eclipse/libswt-awt-gtk.so %{_libdir}/eclipse/swt-awt-gtk.so %{_libdir}/eclipse/libswt-cairo-gtk-%{so_suffix}.so ++++++ build.patch ++++++ Index: "eclipse-swt-4.335/R4_3_2/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh" =================================================================== --- "eclipse-swt-4.335.orig/R4_3_2/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh" +++ "eclipse-swt-4.335/R4_3_2/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh" @@ -91,7 +91,7 @@ case $MODEL in SWT_ARCH=$MODEL AWT_ARCH=sparcv9 ;; - i?86) + i?86|x86) SWT_ARCH=x86 AWT_ARCH=i386 ;; ++++++ jni64.patch ++++++ Index: "eclipse-swt-4.335/R4_3_2/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.h" =================================================================== --- "eclipse-swt-4.335.orig/R4_3_2/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.h" +++ "eclipse-swt-4.335/R4_3_2/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.h" @@ -29,7 +29,7 @@ extern "C" { extern int IS_JNI_1_2; #ifndef JNI64 -#if __x86_64__ +#if defined(__x86_64__) || defined(_LP64) #define JNI64 #endif #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
