Hello community, here is the log from the commit of package eclipse-swt for openSUSE:Factory checked in at 2017-10-07 17:52:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eclipse-swt (Old) and /work/SRC/openSUSE:Factory/.eclipse-swt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eclipse-swt" Sat Oct 7 17:52:33 2017 rev:22 rq:532349 version:4.333 Changes: -------- --- /work/SRC/openSUSE:Factory/eclipse-swt/eclipse-swt.changes 2017-09-20 17:14:16.852126623 +0200 +++ /work/SRC/openSUSE:Factory/.eclipse-swt.new/eclipse-swt.changes 2017-10-07 17:52:59.429171531 +0200 @@ -1,0 +2,14 @@ +Fri Oct 6 23:00:06 UTC 2017 - [email protected] + +- Build with java source and target 1.6 in order to allow building + with jdk9 +- Added patch: + * libswt-bootclasspath.patch + + Don't use bootclasspath; it does not work with java9, since + no jar files are distributed, and it is not needed for + java 7 or 8. +- Modified patch: + * libswt-4.333-libjawt.patch + + Use elif in order to make the patch shorter and more elegant + +------------------------------------------------------------------- New: ---- libswt-bootclasspath.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eclipse-swt.spec ++++++ --- /var/tmp/diff_new_pack.gjPNDv/_old 2017-10-07 17:53:00.833109810 +0200 +++ /var/tmp/diff_new_pack.gjPNDv/_new 2017-10-07 17:53:00.833109810 +0200 @@ -35,6 +35,7 @@ Patch4: ppc64le.patch Patch5: ppc64le_path_for_jre_1_7_0.patch Patch6: libswt-4.333-libjawt.patch +Patch7: libswt-bootclasspath.patch BuildRequires: Mesa-devel BuildRequires: ant BuildRequires: cairo @@ -55,7 +56,6 @@ 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 @@ -81,6 +81,7 @@ pushd org/eclipse tar -xjf %{SOURCE1} %patch3 +%patch7 popd %patch4 %patch5 -p1 @@ -99,6 +100,7 @@ pushd org/eclipse/swt %{ant} \ + -DjavacTarget=1.6 -DjavacSource=1.6 \ -Dversion.suffix=%{version_suffix} \ -Djar.filename=swt-%{version}.jar \ build.jars ++++++ libswt-4.333-libjawt.patch ++++++ --- /var/tmp/diff_new_pack.gjPNDv/_old 2017-10-07 17:53:00.889107348 +0200 +++ /var/tmp/diff_new_pack.gjPNDv/_new 2017-10-07 17:53:00.897106997 +0200 @@ -1,18 +1,12 @@ --- 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 @@ ++++ libswt-4.333/build.sh 2017-10-07 00:11:25.119470543 +0200 +@@ -501,6 +501,9 @@ + if [ -f ${JAVA_HOME}/jre/lib/${AWT_ARCH}/libjawt.* ]; then AWT_LIB_PATH=${JAVA_HOME}/jre/lib/${AWT_ARCH} export AWT_LIB_PATH ++ elif [ -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 -+ 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 - + AWT_LIB_PATH=${JAVA_HOME}/jre/bin + export AWT_LIB_PATH ++++++ libswt-bootclasspath.patch ++++++ --- org.eclipse.swt/buildFragment.xml 2014-01-12 22:26:01.022764236 +0100 +++ org.eclipse.swt/buildFragment.xml 2017-10-07 00:35:19.914441896 +0200 @@ -27,24 +27,8 @@ <property name="logExtension" value=".xml" /> <property name="javacSource" value="1.3" /> <property name="javacTarget" value="1.2" /> - <condition property="bootclasspath" value=""> - <equals arg1="${swt.os}" arg2="macosx"/> - </condition> - <path id="path_bootclasspath"> - <fileset dir="${java.home}/lib"> - <include name="*.jar" /> - </fileset> - </path> - <property name="bootclasspath" refid="path_bootclasspath" /> - <condition property="bundleBootClasspath" value="${CDC-1.0/Foundation-1.0}"> - <isset property="CDC-1.0/Foundation-1.0" /> - </condition> - <condition property="bundleBootClasspath" value="${J2SE-1.3}"> - <isset property="J2SE-1.3" /> - </condition> <property name="bundleJavacSource" value="${javacSource}" /> <property name="bundleJavacTarget" value="${javacTarget}" /> - <property name="bundleBootClasspath" value="${bootclasspath}" /> <condition property="p2.publish.parts" value="true"> <istrue value="${p2.gathering}" /> </condition> @@ -72,7 +56,7 @@ <delete dir="${temp.folder}/@dot.bin" /> <mkdir dir="${temp.folder}/@dot.bin" /> <antcall target="copy.${swt.ws}.src"/> - <javac destdir="${temp.folder}/@dot.bin" verbose="${javacVerbose}" debug="${debug}" failonerror="no" classpath="${plugindir}/extra_jars/exceptions.jar" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}"> + <javac destdir="${temp.folder}/@dot.bin" verbose="${javacVerbose}" debug="${debug}" failonerror="no" classpath="${plugindir}/extra_jars/exceptions.jar" source="${bundleJavacSource}" target="${bundleJavacTarget}"> <src path="${temp.folder}/@dot.src/"/> <compilerarg line="-log '${temp.folder}'/@dot.bin${logExtension}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" /> <compilerarg line="${compilerArg}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" />
