Hello community, here is the log from the commit of package icedtea-web for openSUSE:Factory checked in at 2017-11-14 13:07:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icedtea-web (Old) and /work/SRC/openSUSE:Factory/.icedtea-web.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icedtea-web" Tue Nov 14 13:07:03 2017 rev:21 rq:541764 version:1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/icedtea-web/icedtea-web.changes 2017-09-26 21:17:42.634659964 +0200 +++ /work/SRC/openSUSE:Factory/.icedtea-web.new/icedtea-web.changes 2017-11-14 13:07:04.505332446 +0100 @@ -1,0 +2,7 @@ +Tue Nov 14 09:32:33 UTC 2017 - [email protected] + +- Added patch: + * icedtea-web-jdk10.patch + + Allow build/run with jdk10 + +------------------------------------------------------------------- New: ---- icedtea-web-jdk10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icedtea-web.spec ++++++ --- /var/tmp/diff_new_pack.Ue1w8b/_old 2017-11-14 13:07:05.053312409 +0100 +++ /var/tmp/diff_new_pack.Ue1w8b/_new 2017-11-14 13:07:05.057312262 +0100 @@ -40,12 +40,13 @@ Patch1: icedtea-web-exports.patch Patch2: icedtea-web-x509factory.patch Patch3: icedtea-web-javadoc9.patch +Patch4: icedtea-web-jdk10.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: hamcrest -BuildRequires: java-devel >= 1.8 +BuildRequires: java-devel >= 10 # owns javadocdir BuildRequires: javapackages-tools BuildRequires: junit @@ -108,6 +109,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build autoreconf -fiv ++++++ icedtea-web-jdk10.patch ++++++ diff -r 676a6ba5bc31 acinclude.m4 --- a/acinclude.m4 Mon Sep 25 18:05:33 2017 +0200 +++ b/acinclude.m4 Tue Nov 14 10:08:22 2017 +0100 @@ -798,7 +798,7 @@ JAVA_VERSION=`$JAVA -version 2>&1` AC_MSG_RESULT($JAVA_VERSION) HAVE_JAVA8=`if echo $JAVA_VERSION | grep -q -e 1.8.0 ; then echo yes ; fi` - HAVE_JAVA9=`if echo $JAVA_VERSION | grep -q -e 1.9.0 -e \"9 -e "build 9" ; then echo yes ; fi ` + HAVE_JAVA9=`if echo $JAVA_VERSION | grep -q -e \"9 -e "build 9" -e \"10 -e "build 10" ; then echo yes ; fi ` if test -z "$HAVE_JAVA8" -a -z "$HAVE_JAVA9"; then AC_MSG_ERROR([JDK8 or newer is required, detected was: $JAVA_VERSION]) fi diff -r 676a6ba5bc31 launcher/launchers.in --- a/launcher/launchers.in Mon Sep 25 18:05:33 2017 +0200 +++ b/launcher/launchers.in Tue Nov 14 10:08:22 2017 +0100 @@ -38,10 +38,14 @@ fi; JDK9="NO" -if ${JAVA} -version 2>&1 | grep -q "version \"9-" ; then +if ${JAVA} -version 2>&1 | grep -q "version \"9" ; then + JDK9="YES" +elif ${JAVA} -version 2>&1 | grep -q "version \"10" ; then JDK9="YES" fi +echo "Is JDK9+? $JDK9" + JAVA_ARGS=( ) ARGS=( ) COMMAND=() diff -r 676a6ba5bc31 plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Sep 25 18:05:33 2017 +0200 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Tue Nov 14 10:08:22 2017 +0100 @@ -1562,8 +1562,9 @@ command_line[2] = NULL; if ( standard_error != NULL ){ - if(strstr(standard_error, "\"9") != NULL) { - PLUGIN_DEBUG ("detected 9\n"); + if(strstr(standard_error, "\"9") != NULL + || strstr(standard_error, "\"10") != NULL) { + PLUGIN_DEBUG ("detected 9+\n"); PLUGIN_DEBUG ("plugin_get_java_version return\n"); return 9; }
