Update to 23.0.0

With several new variables for all the different kinds of version
numbers we need now (at least some of them can be derived from each
other.) Replaces native-image because that’s now shipped with GraalVM
itself again. In test.sh, add `nice -n19` before emcc, because it likes
to take a very long time to recompile all of libc or something.

3 files changed, 17 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1ff5a0d3c05f..829c49f4b2c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = jdk17-graalvm-bin
 	pkgdesc = Universal virtual machine for running applications written in a variety of languages (JVM-based, LLVM-based, or other), Java 17 version
-	pkgver = 22.3.2
+	pkgver = 23.0.0
 	pkgrel = 1
 	url = https://www.graalvm.org/
 	install = jdk17-graalvm-bin.install
@@ -14,12 +14,13 @@ pkgbase = jdk17-graalvm-bin
 	optdepends = graal-visualvm-jdk17-bin: VisualVM component (used to be bundled with this package before the 22.2.0 release)
 	provides = java-runtime=17
 	provides = java-environment=17
+	replaces = native-image-jdk17-bin
 	options = staticlibs
 	source = graalvm-rebuild-libpolyglot.hook
 	sha256sums = SKIP
-	source_x86_64 = https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.2/graalvm-ce-java17-linux-amd64-22.3.2.tar.gz
-	sha256sums_x86_64 = e5a5868c9b498643fadebfba2040e4d9a19a13ea58ec77cec8d64ab6ee691d1e
-	source_aarch64 = https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.2/graalvm-ce-java17-linux-aarch64-22.3.2.tar.gz
-	sha256sums_aarch64 = 5d8614c75f5496b37ba52c3ae80a5e887a03981c2d22ade187e8793562b66e84
+	source_x86_64 = https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-17.0.7/graalvm-community-jdk-17.0.7_linux-x64_bin.tar.gz
+	sha256sums_x86_64 = 094e5a7dcc4a903b70741d5c3c1688f83e83e2d44eb3d8d798c5d79ed902032c
+	source_aarch64 = https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-17.0.7/graalvm-community-jdk-17.0.7_linux-aarch64_bin.tar.gz
+	sha256sums_aarch64 = cb5bedf6244d30018856559a393029e98de48c9608eb35ec6c4937dcb7d97224
 
 pkgname = jdk17-graalvm-bin
diff --git a/PKGBUILD b/PKGBUILD
index 5a778909fb1c..5284c28d940c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,10 @@
 # Maintainer: Lucas Werkmeister <mail@lucaswerkmeister.de>
 
-java_=17
+graal_=17.0.7+7.1
+jdk_=${graal_%%+*}
+java_=${jdk_%%.*}
 pkgname="jdk${java_}-graalvm-bin"
-pkgver=22.3.2
+pkgver=23.0.0
 pkgrel=1
 pkgdesc="Universal virtual machine for running applications written in a variety of languages (JVM-based, LLVM-based, or other), Java ${java_} version"
 arch=('x86_64'
@@ -17,17 +19,18 @@ optdepends=("graaljs-jdk${java_}-bin: JavaScript component (used to be bundled w
             "graal-visualvm-jdk${java_}-bin: VisualVM component (used to be bundled with this package before the 22.2.0 release)")
 provides=("java-runtime=${java_}"
           "java-environment=${java_}")
+replaces=("native-image-jdk${java_}-bin")
 options=('staticlibs')
 install="$pkgname.install"
 source=('graalvm-rebuild-libpolyglot.hook')
 sha256sums=('SKIP')
-source_x86_64=("https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${pkgver}/graalvm-ce-java${java_}-linux-amd64-${pkgver}.tar.gz")
-source_aarch64=("https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${pkgver}/graalvm-ce-java${java_}-linux-aarch64-${pkgver}.tar.gz")
-sha256sums_x86_64=('e5a5868c9b498643fadebfba2040e4d9a19a13ea58ec77cec8d64ab6ee691d1e')
-sha256sums_aarch64=('5d8614c75f5496b37ba52c3ae80a5e887a03981c2d22ade187e8793562b66e84')
+source_x86_64=("https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${jdk_}/graalvm-community-jdk-${jdk_}_linux-x64_bin.tar.gz")
+source_aarch64=("https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${jdk_}/graalvm-community-jdk-${jdk_}_linux-aarch64_bin.tar.gz")
+sha256sums_x86_64=('094e5a7dcc4a903b70741d5c3c1688f83e83e2d44eb3d8d798c5d79ed902032c')
+sha256sums_aarch64=('cb5bedf6244d30018856559a393029e98de48c9608eb35ec6c4937dcb7d97224')
 
 package() {
-    cd "graalvm-ce-java${java_}-${pkgver}"
+    cd "graalvm-community-openjdk-${graal_}"
     mkdir -p "$pkgdir/usr/lib/jvm/java-${java_}-graalvm/"
     cp -a -t "$pkgdir/usr/lib/jvm/java-${java_}-graalvm/" *
     install -DTm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/test.sh b/test.sh
index 08bddea83689..053484fda0e7 100755
--- a/test.sh
+++ b/test.sh
@@ -69,7 +69,7 @@ int main() {
   return 0;
 }
 EOF
-emcc -o hello.wasm hello.c 2>/dev/null || exit
+nice -n19 emcc -o hello.wasm hello.c 2>/dev/null || exit
 
 helloWorld=$(wasm --Builtins=wasi_snapshot_preview1 hello.wasm) || exit
 if [[ $helloWorld != 'Hello, WASM!' ]]; then