From e0b1ef703593692549935b2c8e129d48f7b7e631 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 23 Sep 2023 16:17:21 +0000 Subject: [PATCH] extra/java-openjdk to 21.u35-3 --- extra/java-openjdk/PKGBUILD | 26 ++++++++++--------- extra/java-openjdk/freedesktop-java.desktop | 12 ++++----- .../java-openjdk/freedesktop-jconsole.desktop | 12 ++++----- extra/java-openjdk/freedesktop-jshell.desktop | 8 +++--- extra/java-openjdk/install_jdk-openjdk.sh | 2 +- .../install_jre-openjdk-headless.sh | 2 +- extra/java-openjdk/install_jre-openjdk.sh | 2 +- 7 files changed, 33 insertions(+), 31 deletions(-) diff --git a/extra/java-openjdk/PKGBUILD b/extra/java-openjdk/PKGBUILD index 9fce51f58..702aefd92 100644 --- a/extra/java-openjdk/PKGBUILD +++ b/extra/java-openjdk/PKGBUILD @@ -23,15 +23,16 @@ pkgbase=java-openjdk pkgname=('jre-openjdk-headless' 'jre-openjdk' 'jdk-openjdk' 'openjdk-src') -_majorver=20 +# on a majorver change, don't forget to update the misc files that come along this PKGBUILD +_majorver=21 _minorver=0 -_securityver=2 -_updatever=9 -pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever} -#pkgver=${_majorver}.u${_updatever} -pkgrel=3.1 -_git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever} -#_git_tag=jdk-${_majorver}+${_updatever} +_securityver=0 +_updatever=35 +# pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever} +pkgver=${_majorver}.u${_updatever} +pkgrel=3 +# _git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever} +_git_tag=jdk-${_majorver}+${_updatever} arch=('x86_64') url='https://openjdk.java.net/' license=('custom') @@ -44,10 +45,10 @@ source=(https://github.com/openjdk/jdk${_majorver}u/archive/${_git_tag}.tar.gz freedesktop-java.desktop freedesktop-jconsole.desktop freedesktop-jshell.desktop) -sha256sums=('4d6f176075d5f2ce62fd16ebd5cc4c27a3e551ce4d3d3bc0e9946454e52fc88d' - '761d4f1274c7dfb4ff61f6d6cb01504f2f886240229e371647ce227fcf81278e' - '2b17178ac414e1d0768c8f482779efa88bfeab17b8b0517df4e66b3c2874131c' - '82329d23887df14bce3f8d8f356fe8f4b643831d40ade5fed31a070516f86fd7') +sha256sums=('b798ebc2e899a98edf2be99e786bb0fbad144e2270925dffe624fbe052f07ade' + '72111743ab6ab36854b0c85a504172983715d0798fce10bc4e35689b7d15fd93' + '8ecdf5c1605bafa58b3f7da615e6d8d3d943e3a2d3831930d6efa7815aacce07' + '50fc0d677489b73d549df2f08d759d5f057f200adbbab83ea5e87456152ee03e') case "${CARCH}" in x86_64) _JARCH='x86_64';; @@ -72,6 +73,7 @@ _nonheadless=(lib/libawt_xawt.so _nonjre=(lib/ct.sym lib/libattach.so lib/libsaproc.so + lib/lible.so lib/src.zip) diff --git a/extra/java-openjdk/freedesktop-java.desktop b/extra/java-openjdk/freedesktop-java.desktop index b45a8d09c..78a4a552c 100644 --- a/extra/java-openjdk/freedesktop-java.desktop +++ b/extra/java-openjdk/freedesktop-java.desktop @@ -1,12 +1,12 @@ [Desktop Entry] -Name=OpenJDK Java 20 Runtime -Name[fi]=OpenJDK Java 20 - ajonaikainen ympäristö -Comment=OpenJDK Java 20 Runtime -Comment[fi]=OpenJDK Java 20 - ajonaikainen ympäristö +Name=OpenJDK Java 21 Runtime +Name[fi]=OpenJDK Java 21 - ajonaikainen ympäristö +Comment=OpenJDK Java 21 Runtime +Comment[fi]=OpenJDK Java 21 - ajonaikainen ympäristö Keywords=java;runtime -Exec=/usr/lib/jvm/java-20-openjdk/bin/java -jar +Exec=/usr/lib/jvm/java-21-openjdk/bin/java -jar Terminal=false Type=Application -Icon=java20-openjdk +Icon=java21-openjdk MimeType=application/x-java-archive;application/java-archive;application/x-jar; NoDisplay=true diff --git a/extra/java-openjdk/freedesktop-jconsole.desktop b/extra/java-openjdk/freedesktop-jconsole.desktop index 5487313fb..dc76c0f04 100644 --- a/extra/java-openjdk/freedesktop-jconsole.desktop +++ b/extra/java-openjdk/freedesktop-jconsole.desktop @@ -1,11 +1,11 @@ [Desktop Entry] -Name=OpenJDK Java 20 Console -Name[fi]=OpenJDK Java 20 - konsoli -Comment=OpenJDK Java 20 Monitoring & Management Console -Comment[fi]=OpenJDK Java 20 - valvonta- ja hallintakonsoli +Name=OpenJDK Java 21 Console +Name[fi]=OpenJDK Java 21 - konsoli +Comment=OpenJDK Java 21 Monitoring & Management Console +Comment[fi]=OpenJDK Java 21 - valvonta- ja hallintakonsoli Keywords=java;console;monitoring -Exec=/usr/lib/jvm/java-20-openjdk/bin/jconsole +Exec=/usr/lib/jvm/java-21-openjdk/bin/jconsole Terminal=false Type=Application -Icon=java20-openjdk +Icon=java21-openjdk Categories=Application;System; diff --git a/extra/java-openjdk/freedesktop-jshell.desktop b/extra/java-openjdk/freedesktop-jshell.desktop index 10b21d0ad..bce0aa615 100644 --- a/extra/java-openjdk/freedesktop-jshell.desktop +++ b/extra/java-openjdk/freedesktop-jshell.desktop @@ -1,9 +1,9 @@ [Desktop Entry] -Name=OpenJDK Java 20 Shell -Comment=OpenJDK Java 20 Shell +Name=OpenJDK Java 21 Shell +Comment=OpenJDK Java 21 Shell Keywords=java;shell -Exec=/usr/lib/jvm/java-20-openjdk/bin/jshell +Exec=/usr/lib/jvm/java-21-openjdk/bin/jshell Terminal=true Type=Application -Icon=java20-openjdk +Icon=java21-openjdk Categories=Application;System; diff --git a/extra/java-openjdk/install_jdk-openjdk.sh b/extra/java-openjdk/install_jdk-openjdk.sh index 434c51b96..e97f91fd8 100644 --- a/extra/java-openjdk/install_jdk-openjdk.sh +++ b/extra/java-openjdk/install_jdk-openjdk.sh @@ -1,4 +1,4 @@ -THIS_JDK='java-20-openjdk' +THIS_JDK='java-21-openjdk' fix_default() { if [ ! -x /usr/bin/java ]; then diff --git a/extra/java-openjdk/install_jre-openjdk-headless.sh b/extra/java-openjdk/install_jre-openjdk-headless.sh index 1ae1ffc7a..72c3bb17d 100644 --- a/extra/java-openjdk/install_jre-openjdk-headless.sh +++ b/extra/java-openjdk/install_jre-openjdk-headless.sh @@ -1,4 +1,4 @@ -THIS_JRE='java-20-openjdk' +THIS_JRE='java-21-openjdk' fix_default() { if [ ! -x /usr/bin/java ]; then diff --git a/extra/java-openjdk/install_jre-openjdk.sh b/extra/java-openjdk/install_jre-openjdk.sh index b64827e40..9ffb19ee0 100644 --- a/extra/java-openjdk/install_jre-openjdk.sh +++ b/extra/java-openjdk/install_jre-openjdk.sh @@ -1,4 +1,4 @@ -THIS_JRE='java-20-openjdk' +THIS_JRE='java-21-openjdk' fix_default() { if [ ! -x /usr/bin/java ]; then