diff options
author | Platon Pronko | 2023-02-03 09:25:04 +0400 |
---|---|---|
committer | Platon Pronko | 2023-02-03 09:25:04 +0400 |
commit | b692517166a46250b8d1c1d06e65fd09fd9738f6 (patch) | |
tree | c5f121bd609fd8da3e82fd16cd2f5d26dcf78efa | |
parent | 800925c82ada4add27ef3b774de8c98de7bef737 (diff) | |
download | aur-b692517166a46250b8d1c1d06e65fd09fd9738f6.tar.gz |
fix java version detection in presence of _JAVA_OPTIONS env var
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 11 | ||||
-rw-r--r-- | java8-openjfx-fix-java-version-check.patch | 30 |
3 files changed, 42 insertions, 7 deletions
@@ -1,7 +1,7 @@ pkgbase = java8-openjfx pkgdesc = Java OpenJFX 8 client application platform (open-source implementation of JavaFX) pkgver = 8.u202 - pkgrel = 7 + pkgrel = 8 url = https://wiki.openjdk.java.net/display/OpenJFX/Main arch = x86_64 license = GPL @@ -15,7 +15,7 @@ pkgbase = java8-openjfx makedepends = gperf makedepends = gtk2 makedepends = gtk3 - makedepends = java-environment-openjdk=8 + makedepends = jdk8-openjdk makedepends = libgl makedepends = libx11 makedepends = libxtst @@ -35,6 +35,7 @@ pkgbase = java8-openjfx source = java8-openjfx-CVE-2021-3522-fix.patch::https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/8a88e5c1db05ebadfd4569955f6f47c23cdca3c4.patch source = java8-openjfx-include-iterator.patch source = java8-openjfx-no-check-jfxrt-jar.patch + source = java8-openjfx-fix-java-version-check.patch sha256sums = 12b0538d04c4bd451e4692ee06357ac36233ff4ec2af9fa3b9bbdbab48c3f2fc sha256sums = d1c2255893e5ec6268d7c92bb6539cde629d325872f26cffb5f1f616c9d5f30d sha256sums = f3e29692a8faa94eb0b02ebf36fa263a642b3ae8694ef806c45c345b8683f1ba @@ -45,9 +46,10 @@ pkgbase = java8-openjfx sha256sums = 3487eb180fff9866c8b8b08be45f13fa9e8edd04e5719bc867e59b09b81954b4 sha256sums = bd69e8a3363f9b3ade50fb29d4c9e3d7e59b42472ae00d425d20ddcda720b919 sha256sums = 47822da975832551bc3b20b3d75891135314f89cfcb75f7212eece148902aea3 + sha256sums = 88ecba988b6e05580cecc09c37add8e375097619d9fa106d65c09edd993c3bc7 pkgname = java8-openjfx - depends = java-runtime-openjdk=8 + depends = jre8-openjdk depends = libgl depends = libx11 depends = libxtst @@ -16,7 +16,7 @@ pkgname=( java8-openjfx-src ) pkgver=8.u202 -pkgrel=7 +pkgrel=8 pkgdesc='Java OpenJFX 8 client application platform (open-source implementation of JavaFX)' arch=(x86_64) url=https://wiki.openjdk.java.net/display/OpenJFX/Main @@ -32,7 +32,7 @@ makedepends=( gperf gtk2 gtk3 - java-environment-openjdk=8 + jdk8-openjdk libgl libx11 libxtst @@ -54,6 +54,7 @@ source=( java8-openjfx-CVE-2021-3522-fix.patch::https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/8a88e5c1db05ebadfd4569955f6f47c23cdca3c4.patch java8-openjfx-include-iterator.patch java8-openjfx-no-check-jfxrt-jar.patch + java8-openjfx-fix-java-version-check.patch ) sha256sums=('12b0538d04c4bd451e4692ee06357ac36233ff4ec2af9fa3b9bbdbab48c3f2fc' 'd1c2255893e5ec6268d7c92bb6539cde629d325872f26cffb5f1f616c9d5f30d' @@ -64,7 +65,8 @@ sha256sums=('12b0538d04c4bd451e4692ee06357ac36233ff4ec2af9fa3b9bbdbab48c3f2fc' '4db6e995d46f5ab29c4169dab5dbbe367ebd01dee66ef1750abe5cf0c8364d42' '3487eb180fff9866c8b8b08be45f13fa9e8edd04e5719bc867e59b09b81954b4' 'bd69e8a3363f9b3ade50fb29d4c9e3d7e59b42472ae00d425d20ddcda720b919' - '47822da975832551bc3b20b3d75891135314f89cfcb75f7212eece148902aea3') + '47822da975832551bc3b20b3d75891135314f89cfcb75f7212eece148902aea3' + '88ecba988b6e05580cecc09c37add8e375097619d9fa106d65c09edd993c3bc7') prepare() { cd rt-${pkgver//./}-ga @@ -78,6 +80,7 @@ prepare() { patch -Np1 -i "$srcdir"/java8-openjfx-CVE-2021-3522-fix.patch -d modules/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base patch -Np1 -i ../java8-openjfx-include-iterator.patch patch -Np1 -i ../java8-openjfx-no-check-jfxrt-jar.patch + patch -Np1 -i ../java8-openjfx-fix-java-version-check.patch } build() { @@ -93,7 +96,7 @@ build() { package_java8-openjfx() { depends=( - java-runtime-openjdk=8 + jre8-openjdk libgl libx11 libxtst diff --git a/java8-openjfx-fix-java-version-check.patch b/java8-openjfx-fix-java-version-check.patch new file mode 100644 index 000000000000..ce96be9b9358 --- /dev/null +++ b/java8-openjfx-fix-java-version-check.patch @@ -0,0 +1,30 @@ +--- rt-8u202-ga/build.gradle.orig 2023-02-03 09:18:01.865503996 +0400 ++++ rt-8u202-ga/build.gradle 2023-02-03 09:19:07.562750178 +0400 +@@ -736,21 +736,20 @@ + // Java(TM) SE Runtime Environment (build 1.7.0_45-b18) + // Java HotSpot(TM) 64-Bit Server VM (build 24.45-b08, mixed mode) + // +-// We need to parse the second line + def inStream = new java.io.BufferedReader(new java.io.InputStreamReader(new java.lang.ProcessBuilder(JAVA, "-version").start().getErrorStream())); + try { +- if (inStream.readLine() != null) { +- String v = inStream.readLine(); +- if (v != null) { +- int ib = v.indexOf(" (build "); ++ String line = inStream.readLine(); ++ while (line != null) { ++ if (line.contains("Runtime Environment (build ")) { ++ int ib = line.indexOf(" (build "); + if (ib != -1) { +- String ver = v.substring(ib + 8, v.size() - 1); +- ++ String ver = line.substring(ib + 8, line.size() - 1); + defineProperty("jdkRuntimeVersion", ver) + defineProperty("jdkVersion", jdkRuntimeVersion.split("-")[0]) + defineProperty("jdkBuildNumber", jdkRuntimeVersion.substring(jdkRuntimeVersion.lastIndexOf("-b") + 2)) + } + } ++ line = inStream.readLine(); + } + } finally { + inStream.close(); |