commit eclipse-swt for openSUSE:Factory

Hello community, here is the log from the commit of package eclipse-swt for openSUSE:Factory checked in at 2014-07-02 15:04:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-21 16:19:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.eclipse-swt.new/eclipse-swt.changes 2014-07-02 15:05:06.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Jul 1 07:53:03 UTC 2014 - tchvatal@suse.com + +- Revert back to 4.333 as it broke build of only dependant package +- Removed patches: + * build.patch + * jni64.patch +- Added patches: + * libswt-includes.patch + * libswt-build.patch + * libswt-optflags.patch + * libswt-plugindir.patch + * ppc64le.patch + +------------------------------------------------------------------- Old: ---- R4_3_2.tar.bz2 build.patch jni64.patch New: ---- build.xml libswt-4.333.tar.bz2 libswt-build.patch libswt-includes.patch libswt-optflags.patch libswt-plugindir.patch org.eclipse.swt-4.3.1.tar.bz2 ppc64le.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eclipse-swt.spec ++++++ --- /var/tmp/diff_new_pack.hkkwvB/_old 2014-07-02 15:05:10.000000000 +0200 +++ /var/tmp/diff_new_pack.hkkwvB/_new 2014-07-02 15:05:10.000000000 +0200 @@ -17,17 +17,22 @@ Name: eclipse-swt -Summary: The Standard Widget Toolkit +Summary: SWT Library for GTK2 License: EPL-1.0 Group: Development/Libraries/Other -Version: 4.335 +Version: 4.333 Release: 1 -%define version_suffix 4.3.3.5 -%define so_suffix 4335 +%define version_suffix 4.3.3.3 +%define so_suffix 4333 Url: http://www.eclipse.org/swt/ -Source: http://git.eclipse.org/c/platform/eclipse.platform.swt.git/snapshot/R4_3_2.t... -Patch1: jni64.patch -Patch2: build.patch +Source0: libswt-%{version}.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-plugindir.patch +Patch4: ppc64le.patch Provides: libswt3-gtk2 = %{version} %if 0%{?suse_version} <= 1210 Requires: mozilla-xulrunner192 @@ -42,6 +47,7 @@ BuildRequires: libwebkit-devel BuildRequires: make BuildRequires: pkg-config +BuildRequires: unzip BuildRequires: zip %if 0%{?suse_version} <= 1210 BuildRequires: mozilla-xulrunner192-devel @@ -59,11 +65,6 @@ BuildRequires: libgnomeui-devel BuildRequires: mozilla-nspr-devel BuildRequires: pkgconfig(glu) -%ifarch %ix86 -%define swtarch x86 -%else -%define swtarch %{_target_cpu} -%endif %description SWT is the software component that delivers native widget functionality @@ -72,17 +73,24 @@ set of native widgets. %prep -%setup -q -c eclipse-swt-4.333 -%patch1 -p1 -%patch2 -p1 -mv R4_3_2 eclipse.platform.swt +%setup -q -n libswt-%{version} +%patch0 +%patch1 +%patch2 +pushd org/eclipse +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 +popd %build -pushd eclipse.platform.swt/bundles/org.eclipse.swt - export LIBDIR=%{_libdir} export NO_STRIP=TRUE - %if 0%{?suse_version} <= 1140 export GCJ_VERSION=4.5 %else @@ -92,45 +100,43 @@ export GCJ_VERSION=4.7 %endif %endif - -%ifarch %ix86 -export ARCH=i586 +%ifarch x86_64 +export ARCH=x86_64 %else -export ARCH=%{_target_cpu} +export ARCH=i586 %endif +./build.sh +pushd org/eclipse/swt %ant \ - -Dswt.arch=%{swtarch} \ - -Dswt.os=linux \ - -Dswt.ws=gtk \ - -f buildSWT.xml \ - build_libraries - -%ant \ - -Dswt.arch=%{swtarch} \ +%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 - -zip -u eclipse.platform.swt/bundles/org.eclipse.swt/swt-%{version}.jar eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.%{swtarch}/*.so - +zip -u org/eclipse/swt/swt-%{version}.jar *.so %install install -d -m755 %{buildroot}%{_libdir}/eclipse -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 +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 -# Drop mozilla-gtk in openSUSE 12.2 because of not existing mozilla-xulrunner192-devel -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 +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 + 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 @@ -170,7 +176,7 @@ %{_libdir}/java/swt.jar %{_libdir}/java/swt-gtk.jar %{_libdir}/java/swt-gtk-%{version}.jar -%doc eclipse.platform.swt/bundles/org.eclipse.swt/about_files/* +%doc about_files/* %dir %{_libdir}/eclipse %dir %{_libdir}/java ++++++ libswt-build.patch ++++++ --- 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 - if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then - MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom` - MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom` + if [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then + MOZILLA_INCLUDES=`pkg-config --cflags libxul` + MOZILLA_LIBS=`pkg-config --libs libxul` export MOZILLA_INCLUDES export MOZILLA_LIBS MAKE_MOZILLA=make_mozilla ++++++ libswt-includes.patch ++++++ --- 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 @@ -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} ++++++ libswt-optflags.patch ++++++ --- 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 -CFLAGS = -O -Wall \ +CFLAGS = $(RPM_OPT_FLAGS) \ -DSWT_VERSION=$(SWT_VERSION) \ $(NATIVE_STATS) \ -DLINUX -DGTK \ @@ -230,19 +230,19 @@ make_mozilla:$(MOZILLA_LIB) $(MOZILLA_LIB): $(MOZILLA_OBJECTS) - $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} + $(CXX) $(RPM_OPT_FLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} xpcom.o: xpcom.cpp - $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp + $(CXX) $(RPM_OPT_FLAGS) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp xpcom_structs.o: xpcom_structs.cpp - $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp + $(CXX) $(RPM_OPT_FLAGS) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp xpcom_custom.o: xpcom_custom.cpp - $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp + $(CXX) $(RPM_OPT_FLAGS) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp xpcom_stats.o: xpcom_stats.cpp - $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp + $(CXX) $(RPM_OPT_FLAGS) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp # # XULRunner lib @@ -251,19 +251,19 @@ $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS) echo -e "#include\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} xpcomxul.o: xpcom.cpp - $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp + $(CXX) $(RPM_OPT_FLAGS) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp xpcomxul_structs.o: xpcom_structs.cpp - $(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp + $(CXX) $(RPM_OPT_FLAGS) -o xpcomxul_structs.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp xpcomxul_custom.o: xpcom_custom.cpp - $(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp + $(CXX) $(RPM_OPT_FLAGS) -o xpcomxul_custom.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp xpcomxul_stats.o: xpcom_stats.cpp - $(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp + $(CXX) $(RPM_OPT_FLAGS) -o xpcomxul_stats.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp # # XPCOMInit lib @@ -271,16 +271,16 @@ make_xpcominit:$(XPCOMINIT_LIB) $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS) - $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} + $(CXX) $(RPM_OPT_FLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} xpcominit.o: xpcominit.cpp - $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp + $(CXX) $(RPM_OPT_FLAGS) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp xpcominit_structs.o: xpcominit_structs.cpp - $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_structs.cpp + $(CXX) $(RPM_OPT_FLAGS) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_structs.cpp xpcominit_stats.o: xpcominit_stats.cpp - $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_stats.cpp + $(CXX) $(RPM_OPT_FLAGS) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_stats.cpp # # WebKit lib ++++++ 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" /> ++++++ 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: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org