diff options
| -rw-r--r-- | .SRCINFO | 52 | ||||
| -rw-r--r-- | PKGBUILD | 24 | ||||
| -rw-r--r-- | freedesktop-java.desktop | 12 | ||||
| -rw-r--r-- | freedesktop-jconsole.desktop | 12 | ||||
| -rw-r--r-- | freedesktop-jshell.desktop | 8 | ||||
| -rw-r--r-- | install_jdk-openjdk.sh | 2 | ||||
| -rw-r--r-- | install_jre-openjdk-headless.sh | 2 | ||||
| -rw-r--r-- | install_jre-openjdk.sh | 2 |
8 files changed, 57 insertions, 57 deletions
@@ -1,5 +1,5 @@ pkgbase = java-openjdk-xdg - pkgver = 20.0.1.u9 + pkgver = 21.u35 pkgrel = 1 url = https://openjdk.java.net/ arch = x86_64 @@ -40,21 +40,21 @@ pkgbase = java-openjdk-xdg conflicts = openjdk-src conflicts = openjdk-doc options = !lto - source = https://github.com/openjdk/jdk20u/archive/jdk-20.0.1+9.tar.gz + source = https://github.com/openjdk/jdk21u/archive/jdk-21+35.tar.gz source = freedesktop-java.desktop source = freedesktop-jconsole.desktop source = freedesktop-jshell.desktop source = xdg-basedir-compliant-fontconfig.patch source = xdg-basedir-compliant-userPrefs.patch - sha256sums = 1b7f42ecedf97a837b1f3499d2b6293b26ffed97627b1bd883452c21cf9f798b - sha256sums = 761d4f1274c7dfb4ff61f6d6cb01504f2f886240229e371647ce227fcf81278e - sha256sums = 2b17178ac414e1d0768c8f482779efa88bfeab17b8b0517df4e66b3c2874131c - sha256sums = 82329d23887df14bce3f8d8f356fe8f4b643831d40ade5fed31a070516f86fd7 + sha256sums = b798ebc2e899a98edf2be99e786bb0fbad144e2270925dffe624fbe052f07ade + sha256sums = 72111743ab6ab36854b0c85a504172983715d0798fce10bc4e35689b7d15fd93 + sha256sums = 8ecdf5c1605bafa58b3f7da615e6d8d3d943e3a2d3831930d6efa7815aacce07 + sha256sums = 50fc0d677489b73d549df2f08d759d5f057f200adbbab83ea5e87456152ee03e sha256sums = 25860396475759236e0edf66711b842143b0ddee47eed61e080da158bbc58ce9 sha256sums = 48f9e40c4ae8eb79d17fb676893a89b95ac43616827725a9d10de2b1f357642c pkgname = jre-openjdk-headless-xdg - pkgdesc = OpenJDK Java 20 headless runtime environment - with improved Support for the XDG Base Directory Specification + pkgdesc = OpenJDK Java 21 headless runtime environment - with improved Support for the XDG Base Directory Specification install = install_jre-openjdk-headless.sh depends = java-runtime-common>=3 depends = ca-certificates-utils @@ -71,9 +71,9 @@ pkgname = jre-openjdk-headless-xdg depends = glibc depends = gcc-libs optdepends = java-rhino: for some JavaScript support - provides = java-runtime-headless=20 - provides = java-runtime-headless-openjdk=20 - provides = jre20-openjdk-headless=20.0.1.u9-1 + provides = java-runtime-headless=21 + provides = java-runtime-headless-openjdk=21 + provides = jre21-openjdk-headless=21.u35-1 backup = etc/java-openjdk-xdg/logging.properties backup = etc/java-openjdk-xdg/management/jmxremote.access backup = etc/java-openjdk-xdg/management/jmxremote.password.template @@ -90,9 +90,9 @@ pkgname = jre-openjdk-headless-xdg backup = etc/java-openjdk-xdg/sound.properties pkgname = jre-openjdk-xdg - pkgdesc = OpenJDK Java 20 full runtime environment - with improved Support for the XDG Base Directory Specification + pkgdesc = OpenJDK Java 21 full runtime environment - with improved Support for the XDG Base Directory Specification install = install_jre-openjdk.sh - depends = jre20-openjdk-headless=20.0.1.u9-1 + depends = jre21-openjdk-headless=21.u35-1 depends = giflib depends = libgif.so depends = glibc @@ -101,29 +101,29 @@ pkgname = jre-openjdk-xdg optdepends = alsa-lib: for basic sound support optdepends = gtk2: for the Gtk+ 2 look and feel - desktop usage optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage - provides = java-runtime=20 - provides = java-runtime-openjdk=20 - provides = jre20-openjdk=20.0.1.u9-1 + provides = java-runtime=21 + provides = java-runtime-openjdk=21 + provides = jre21-openjdk=21.u35-1 pkgname = jdk-openjdk-xdg - pkgdesc = OpenJDK Java 20 development kit - with improved Support for the XDG Base Directory Specification + pkgdesc = OpenJDK Java 21 development kit - with improved Support for the XDG Base Directory Specification install = install_jdk-openjdk.sh - depends = jre20-openjdk=20.0.1.u9-1 + depends = jre21-openjdk=21.u35-1 depends = java-environment-common=3 depends = hicolor-icon-theme depends = libelf depends = glibc depends = gcc-libs - provides = java-environment=20 - provides = java-environment-openjdk=20 - provides = jdk20-openjdk=20.0.1.u9-1 + provides = java-environment=21 + provides = java-environment-openjdk=21 + provides = jdk21-openjdk=21.u35-1 pkgname = openjdk-src-xdg - pkgdesc = OpenJDK Java 20 sources - with improved Support for the XDG Base Directory Specification - depends = jdk20-openjdk=20.0.1.u9-1 - provides = openjdk20-src=20.0.1.u9-1 + pkgdesc = OpenJDK Java 21 sources - with improved Support for the XDG Base Directory Specification + depends = jdk21-openjdk=21.u35-1 + provides = openjdk21-src=21.u35-1 pkgname = openjdk-doc-xdg - pkgdesc = OpenJDK Java 20 documentation - with improved Support for the XDG Base Directory Specification - depends = jdk20-openjdk=20.0.1.u9-1 - provides = openjdk20-doc=20.0.1.u9-1 + pkgdesc = OpenJDK Java 21 documentation - with improved Support for the XDG Base Directory Specification + depends = jdk21-openjdk=21.u35-1 + provides = openjdk21-doc=21.u35-1 @@ -6,15 +6,14 @@ pkgbase=java-openjdk-xdg pkgname=('jre-openjdk-headless-xdg' 'jre-openjdk-xdg' 'jdk-openjdk-xdg' 'openjdk-src-xdg' 'openjdk-doc-xdg') -_majorver=20 -_minorver=0 -_securityver=1 -_updatever=9 +_majorver=21 +_securityver=0 +_updatever=35 +# pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever} +pkgver=${_majorver}.u${_updatever} pkgrel=1 -pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever} -#pkgver=${_majorver}.u${_updatever} -_git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever} -#_git_tag=jdk-${_majorver}+${_updatever} +# _git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever} +_git_tag=jdk-${_majorver}+${_updatever} arch=('x86_64') url='https://openjdk.java.net/' license=('custom') @@ -29,10 +28,10 @@ source=(https://github.com/openjdk/jdk${_majorver}u/archive/${_git_tag}.tar.gz freedesktop-jshell.desktop xdg-basedir-compliant-fontconfig.patch xdg-basedir-compliant-userPrefs.patch) -sha256sums=('1b7f42ecedf97a837b1f3499d2b6293b26ffed97627b1bd883452c21cf9f798b' - '761d4f1274c7dfb4ff61f6d6cb01504f2f886240229e371647ce227fcf81278e' - '2b17178ac414e1d0768c8f482779efa88bfeab17b8b0517df4e66b3c2874131c' - '82329d23887df14bce3f8d8f356fe8f4b643831d40ade5fed31a070516f86fd7' +sha256sums=('b798ebc2e899a98edf2be99e786bb0fbad144e2270925dffe624fbe052f07ade' + '72111743ab6ab36854b0c85a504172983715d0798fce10bc4e35689b7d15fd93' + '8ecdf5c1605bafa58b3f7da615e6d8d3d943e3a2d3831930d6efa7815aacce07' + '50fc0d677489b73d549df2f08d759d5f057f200adbbab83ea5e87456152ee03e' '25860396475759236e0edf66711b842143b0ddee47eed61e080da158bbc58ce9' '48f9e40c4ae8eb79d17fb676893a89b95ac43616827725a9d10de2b1f357642c') provides=('jre-openjdk-headless' 'jre-openjdk' 'jdk-openjdk' 'openjdk-src' 'openjdk-doc') @@ -55,6 +54,7 @@ _nonheadless=(lib/libawt_xawt.so _nonjre=(lib/ct.sym lib/libattach.so lib/libsaproc.so + lib/lible.so lib/src.zip) prepare() { diff --git a/freedesktop-java.desktop b/freedesktop-java.desktop index b45a8d09cc93..78a4a552c98a 100644 --- a/freedesktop-java.desktop +++ b/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/freedesktop-jconsole.desktop b/freedesktop-jconsole.desktop index 5487313fb3de..dc76c0f04195 100644 --- a/freedesktop-jconsole.desktop +++ b/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/freedesktop-jshell.desktop b/freedesktop-jshell.desktop index 10b21d0ad661..bce0aa6157fc 100644 --- a/freedesktop-jshell.desktop +++ b/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/install_jdk-openjdk.sh b/install_jdk-openjdk.sh index 434c51b96055..e97f91fd8148 100644 --- a/install_jdk-openjdk.sh +++ b/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/install_jre-openjdk-headless.sh b/install_jre-openjdk-headless.sh index 1ae1ffc7a0eb..72c3bb17d910 100644 --- a/install_jre-openjdk-headless.sh +++ b/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/install_jre-openjdk.sh b/install_jre-openjdk.sh index b64827e40028..9ffb19ee0651 100644 --- a/install_jre-openjdk.sh +++ b/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 |