File icedtea-web-jdk10.patch of Package icedtea-web

Overview Repositories Revisions Requests Users Attributes Meta

File icedtea-web-jdk10.patch of Package icedtea-web (Revision 70d641543082b79a686ebec2efd8fbef)

Currently displaying revision 70d641543082b79a686ebec2efd8fbef , Show latest

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;
     }

Places

File icedtea-web-jdk10.patch of Package icedtea-web (Revision 70d641543082b79a686ebec2efd8fbef)

Places