Hello community, here is the log from the commit of package gluegen2 for openSUSE:Factory checked in at 2017-12-23 12:20:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gluegen2 (Old) and /work/SRC/openSUSE:Factory/.gluegen2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gluegen2" Sat Dec 23 12:20:58 2017 rev:13 rq:559390 version:2.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gluegen2/gluegen2.changes 2017-11-27 22:17:10.097341320 +0100 +++ /work/SRC/openSUSE:Factory/.gluegen2.new/gluegen2.changes 2017-12-23 12:21:31.333627338 +0100 @@ -1,0 +2,9 @@ +Fri Dec 22 15:03:25 UTC 2017 - [email protected] + +- Added patch: + * gluegen2-jdk10.patch + - Fix build with jdk10 by generating headers in javac target +- Require ant >= 1.9.8 that understands "nativeheaderdir" attribute + and java-devel >= 1.8 that understands javac -h option + +------------------------------------------------------------------- New: ---- gluegen2-jdk10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gluegen2.spec ++++++ --- /var/tmp/diff_new_pack.0hVayR/_old 2017-12-23 12:21:33.313530799 +0100 +++ /var/tmp/diff_new_pack.0hVayR/_new 2017-12-23 12:21:33.313530799 +0100 @@ -41,12 +41,14 @@ Patch7: gluegen2-no-static-libstdc++.patch Patch8: gluegen2-0001-Remove-version-overrides-for-memcpy.patch Patch9: gluegen2-jdk9.patch +Patch10: gluegen2-jdk10.patch +BuildRequires: ant >= 1.9.8 BuildRequires: ant-antlr BuildRequires: ant-contrib BuildRequires: ant-findbugs BuildRequires: ant-junit BuildRequires: cpptasks -BuildRequires: java-devel >= 1.6 +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-tools Requires: java @@ -79,6 +81,7 @@ %setup -q -n %{jcppsrc_name} -T -b 1 %setup -q -n %{src_name} -T -b 0 cp -pr ../%{jcppsrc_name}/src ./jcpp/ +rm -rf src/java/net/highteq/nativetaglet/ %patch0 -p1 %patch1 -p1 @@ -89,6 +92,7 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 # Fix wrong-script-end-of-line-encoding rm make/scripts/*.bat ++++++ gluegen2-jdk10.patch ++++++ diff -urEbwB gluegen-v2.3.2/make/build.xml gluegen-v2.3.2/make/build.xml --- gluegen-v2.3.2/make/build.xml 2017-12-22 15:46:45.393105390 +0100 +++ gluegen-v2.3.2/make/build.xml 2017-12-22 16:00:38.113906138 +0100 @@ -440,14 +440,10 @@ <antcall target="gluegen.build.c.impl" inheritAll="true" inheritRefs="true" /> </target> - <target name="gluegen.build.c.impl" depends="init, c.configure" unless="gluegen.build.skip.c"> + <target name="gluegen.build.c.impl" depends="init, c.configure, gluegen.build.javase" unless="gluegen.build.skip.c"> <fail message="Requires '${compiler.cfg.id}'" unless="compiler.cfg.id"/> <fail message="Requires '${linker.cfg.id}'" unless="linker.cfg.id"/> - <javah destdir="${src.generated.c}" classpath="${classes}" class="com.jogamp.common.os.Platform, com.jogamp.common.nio.PointerBuffer, jogamp.common.jvm.JVMUtil, com.jogamp.common.util.JarUtil, jogamp.common.os.MachineDataInfoRuntime" /> - <javah destdir="${src.generated.c}/Unix" classpath="${classes}" class="jogamp.common.os.UnixDynamicLinkerImpl" /> - <javah destdir="${src.generated.c}/Windows" classpath="${classes}" class="jogamp.common.os.WindowsDynamicLinkerImpl"/> - <echo message="Output lib name = ${output.lib.name} -> ${output.lib.name.os}" /> <mkdir dir="${gluegen.lib.dir}"/> @@ -485,9 +481,6 @@ <sysincludepath path="${stub.includes.dir}/platform"/> <includepath path="${src.generated.c}" /> - <includepath path="${src.generated.c}/Unix" if="isUnix"/> - <includepath path="${src.generated.c}/Unix" if="isOSX"/> - <includepath path="${src.generated.c}/Windows" if="isWindows"/> </compiler> <linker extends="${linker.cfg.id}" /> @@ -723,7 +716,7 @@ - original source. --> <!-- Compile gluegen-rt first --> - <javac destdir="${classes}" + <javac destdir="${classes}" nativeheaderdir="${src.generated.c}" includeAntRuntime="false" includes="${gluegen-rt.classes} ${jogamp.common.classes}" excludes="${gluegen.excludes.all} ${java.part.android}"
