Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Backports:SLE-15-SP2
icedtea-web
icedtea-web-jdk10.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File icedtea-web-jdk10.patch of Package icedtea-web
diff -r 676a6ba5bc31 acinclude.m4 --- a/acinclude.m4 Mon Sep 25 18:05:33 2017 +0200 +++ b/acinclude.m4 Thu Nov 23 11:56:40 2017 +0100 @@ -795,10 +795,16 @@ [ AC_REQUIRE([IT_FIND_JAVA]) AC_MSG_CHECKING([JDK version]) - JAVA_VERSION=`$JAVA -version 2>&1` + JAVA_VERSION=`$JAVA -version 2>&1 | head -n 1 | cut -d'-' -f1 | cut -d'"' -f2 | cut -d'.' -f1` + if test "${JAVA_VERSION}" -eq "1"; then + JAVA_VERSION=`$JAVA -version 2>&1 | head -n 1 | cut -d'-' -f1 | cut -d'"' -f2 | cut -d'.' -f2` + fi 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 ` + if test "${JAVA_VERSION}" -eq "8"; then + HAVE_JAVA8="yes" + elif test "$JAVA_VERSION" -ge "9"; then + HAVE_JAVA9="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 Thu Nov 23 11:56:40 2017 +0100 @@ -38,7 +38,11 @@ fi; JDK9="NO" -if ${JAVA} -version 2>&1 | grep -q "version \"9-" ; then +version=`${JAVA} -version 2>&1 | head -n 1 | cut -d'-' -f1 | cut -d'"' -f2 | cut -d'.' -f1` +if [ $version -eq "1" ]; then + version=`${JAVA} -version 2>&1 | head -n 1 | cut -d'-' -f1 | cut -d'"' -f2 | cut -d'.' -f2` +fi +if [ $version -ge "9" ]; then JDK9="YES" fi 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 Thu Nov 23 11:56:40 2017 +0100 @@ -1562,11 +1562,15 @@ command_line[2] = NULL; if ( standard_error != NULL ){ - if(strstr(standard_error, "\"9") != NULL) { - PLUGIN_DEBUG ("detected 9\n"); - PLUGIN_DEBUG ("plugin_get_java_version return\n"); - return 9; - } + int major = 0; + int minor = 0; + sscanf(standard_error, "%*s %*s \"%d.%d", &major, &minor); + if (major == 1) + major = minor; + + PLUGIN_DEBUG ("detected version %d\n", major); + PLUGIN_DEBUG ("plugin_get_java_version return\n"); + return major; } PLUGIN_DEBUG ("detected 8 (or generally non nine)\n"); PLUGIN_DEBUG ("plugin_get_java_version return\n");
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor