extra/java-openjdk to 22.u36-1

This commit is contained in:
Kevin Mihelich 2024-03-28 12:54:04 +00:00
parent 2e9bdc7911
commit bd55a4fd0f
8 changed files with 66 additions and 66 deletions

View file

@ -1,6 +1,6 @@
pkgbase = java-openjdk pkgbase = java-openjdk
pkgver = 21.0.2.u13 pkgver = 22.u36
pkgrel = 3 pkgrel = 1
url = https://openjdk.java.net/ url = https://openjdk.java.net/
arch = x86_64 arch = x86_64
license = custom license = custom
@ -29,17 +29,17 @@ pkgbase = java-openjdk
makedepends = harfbuzz makedepends = harfbuzz
makedepends = gcc-libs makedepends = gcc-libs
makedepends = glibc makedepends = glibc
source = https://github.com/openjdk/jdk21u/archive/jdk-21.0.2+13.tar.gz source = https://github.com/openjdk/jdk22u/archive/jdk-22+36.tar.gz
source = freedesktop-java.desktop source = freedesktop-java.desktop
source = freedesktop-jconsole.desktop source = freedesktop-jconsole.desktop
source = freedesktop-jshell.desktop source = freedesktop-jshell.desktop
sha256sums = 4d8c8dd00164df0e344ed343d4ac20c1f30133f1029a83ff2c66c3557ed13a26 sha256sums = 19cbda061fa41860fa2251f0994e7792c06aec63c8d0ae650353c850be5a8a4c
sha256sums = 72111743ab6ab36854b0c85a504172983715d0798fce10bc4e35689b7d15fd93 sha256sums = 228fb453e6c652baad71abf734430cda08c287cb8df935ad3ad6d2e9346c7fdf
sha256sums = 8ecdf5c1605bafa58b3f7da615e6d8d3d943e3a2d3831930d6efa7815aacce07 sha256sums = ed9e43756f450ca01647c495070044276ee9fa7810eb90c99d7e2a29c4a61ef2
sha256sums = 50fc0d677489b73d549df2f08d759d5f057f200adbbab83ea5e87456152ee03e sha256sums = 93697b752739c1f233cf98f3fa3b945fc775de4d40a31dd21afccda7d0c9d01e
pkgname = jre-openjdk-headless pkgname = jre-openjdk-headless
pkgdesc = OpenJDK Java 21 headless runtime environment pkgdesc = OpenJDK Java 22 headless runtime environment
install = install_jre-openjdk-headless.sh install = install_jre-openjdk-headless.sh
depends = java-runtime-common>=3 depends = java-runtime-common>=3
depends = ca-certificates-utils depends = ca-certificates-utils
@ -56,9 +56,9 @@ pkgname = jre-openjdk-headless
depends = glibc depends = glibc
depends = gcc-libs depends = gcc-libs
optdepends = java-rhino: for some JavaScript support optdepends = java-rhino: for some JavaScript support
provides = java-runtime-headless=21 provides = java-runtime-headless=22
provides = java-runtime-headless-openjdk=21 provides = java-runtime-headless-openjdk=22
provides = jre21-openjdk-headless=21.0.2.u13-3 provides = jre22-openjdk-headless=22.u36-1
conflicts = jdk-openjdk conflicts = jdk-openjdk
conflicts = jre-openjdk conflicts = jre-openjdk
backup = etc/java-openjdk/logging.properties backup = etc/java-openjdk/logging.properties
@ -77,7 +77,7 @@ pkgname = jre-openjdk-headless
backup = etc/java-openjdk/sound.properties backup = etc/java-openjdk/sound.properties
pkgname = jre-openjdk pkgname = jre-openjdk
pkgdesc = OpenJDK Java 21 full runtime environment pkgdesc = OpenJDK Java 22 full runtime environment
install = install_jre-openjdk.sh install = install_jre-openjdk.sh
depends = java-runtime-common>=3 depends = java-runtime-common>=3
depends = ca-certificates-utils depends = ca-certificates-utils
@ -99,12 +99,12 @@ pkgname = jre-openjdk
optdepends = alsa-lib: for basic sound support optdepends = alsa-lib: for basic sound support
optdepends = gtk2: for the Gtk+ 2 look and feel - desktop usage optdepends = gtk2: for the Gtk+ 2 look and feel - desktop usage
optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage
provides = java-runtime=21 provides = java-runtime=22
provides = java-runtime-openjdk=21 provides = java-runtime-openjdk=22
provides = jre21-openjdk=21.0.2.u13-3 provides = jre22-openjdk=22.u36-1
provides = java-runtime-headless=21 provides = java-runtime-headless=22
provides = java-runtime-headless-openjdk=21 provides = java-runtime-headless-openjdk=22
provides = jre21-openjdk-headless=21.0.2.u13-3 provides = jre22-openjdk-headless=22.u36-1
conflicts = jdk-openjdk conflicts = jdk-openjdk
conflicts = jre-openjdk-headless conflicts = jre-openjdk-headless
backup = etc/java-openjdk/logging.properties backup = etc/java-openjdk/logging.properties
@ -123,7 +123,7 @@ pkgname = jre-openjdk
backup = etc/java-openjdk/sound.properties backup = etc/java-openjdk/sound.properties
pkgname = jdk-openjdk pkgname = jdk-openjdk
pkgdesc = OpenJDK Java 21 development kit pkgdesc = OpenJDK Java 22 development kit
install = install_jdk-openjdk.sh install = install_jdk-openjdk.sh
depends = java-runtime-common>=3 depends = java-runtime-common>=3
depends = ca-certificates-utils depends = ca-certificates-utils
@ -159,15 +159,15 @@ pkgname = jdk-openjdk
optdepends = alsa-lib: for basic sound support optdepends = alsa-lib: for basic sound support
optdepends = gtk2: for the Gtk+ 2 look and feel - desktop usage optdepends = gtk2: for the Gtk+ 2 look and feel - desktop usage
optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage
provides = java-environment=21 provides = java-environment=22
provides = java-environment-openjdk=21 provides = java-environment-openjdk=22
provides = jdk21-openjdk=21.0.2.u13-3 provides = jdk22-openjdk=22.u36-1
provides = java-runtime=21 provides = java-runtime=22
provides = java-runtime-openjdk=21 provides = java-runtime-openjdk=22
provides = jre21-openjdk=21.0.2.u13-3 provides = jre22-openjdk=22.u36-1
provides = java-runtime-headless=21 provides = java-runtime-headless=22
provides = java-runtime-headless-openjdk=21 provides = java-runtime-headless-openjdk=22
provides = jre21-openjdk-headless=21.0.2.u13-3 provides = jre22-openjdk-headless=22.u36-1
conflicts = jre-openjdk conflicts = jre-openjdk
conflicts = jre-openjdk-headless conflicts = jre-openjdk-headless
backup = etc/java-openjdk/logging.properties backup = etc/java-openjdk/logging.properties
@ -186,11 +186,11 @@ pkgname = jdk-openjdk
backup = etc/java-openjdk/sound.properties backup = etc/java-openjdk/sound.properties
pkgname = openjdk-src pkgname = openjdk-src
pkgdesc = OpenJDK Java 21 sources pkgdesc = OpenJDK Java 22 sources
depends = jdk21-openjdk=21.0.2.u13-3 depends = jdk22-openjdk=22.u36-1
provides = openjdk21-src=21.0.2.u13-3 provides = openjdk22-src=22.u36-1
pkgname = openjdk-doc pkgname = openjdk-doc
pkgdesc = OpenJDK Java 21 documentation pkgdesc = OpenJDK Java 22 documentation
depends = jdk21-openjdk=21.0.2.u13-3 depends = jdk22-openjdk=22.u36-1
provides = openjdk21-doc=21.0.2.u13-3 provides = openjdk22-doc=22.u36-1

View file

@ -24,18 +24,18 @@
pkgbase=java-openjdk pkgbase=java-openjdk
pkgname=('jre-openjdk-headless' 'jre-openjdk' 'jdk-openjdk' 'openjdk-src') pkgname=('jre-openjdk-headless' 'jre-openjdk' 'jdk-openjdk' 'openjdk-src')
# on a majorver change, don't forget to update the misc files that come along this PKGBUILD # on a majorver change, don't forget to update the misc files that come along this PKGBUILD
_majorver=21 _majorver=22
_minorver=0 _minorver=0
_securityver=2 _securityver=2
_updatever=13 _updatever=36
pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever} # pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
# pkgver=${_majorver}.u${_updatever} pkgver=${_majorver}.u${_updatever}
pkgrel=3 pkgrel=1
_git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever} # _git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
# _git_tag=jdk-${_majorver}+${_updatever} _git_tag=jdk-${_majorver}+${_updatever}
arch=('x86_64') arch=('x86_64')
url='https://openjdk.java.net/' url='https://openjdk.java.net/'
license=('custom') license=('LicenseRef-Java')
makedepends=('java-environment>=17' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'libx11' makedepends=('java-environment>=17' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'libx11'
'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib' 'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib'
'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2' 'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2'
@ -44,10 +44,10 @@ source=(https://github.com/openjdk/jdk${_majorver}u/archive/${_git_tag}.tar.gz
freedesktop-java.desktop freedesktop-java.desktop
freedesktop-jconsole.desktop freedesktop-jconsole.desktop
freedesktop-jshell.desktop) freedesktop-jshell.desktop)
sha256sums=('4d8c8dd00164df0e344ed343d4ac20c1f30133f1029a83ff2c66c3557ed13a26' sha256sums=('19cbda061fa41860fa2251f0994e7792c06aec63c8d0ae650353c850be5a8a4c'
'72111743ab6ab36854b0c85a504172983715d0798fce10bc4e35689b7d15fd93' '228fb453e6c652baad71abf734430cda08c287cb8df935ad3ad6d2e9346c7fdf'
'8ecdf5c1605bafa58b3f7da615e6d8d3d943e3a2d3831930d6efa7815aacce07' 'ed9e43756f450ca01647c495070044276ee9fa7810eb90c99d7e2a29c4a61ef2'
'50fc0d677489b73d549df2f08d759d5f057f200adbbab83ea5e87456152ee03e') '93697b752739c1f233cf98f3fa3b945fc775de4d40a31dd21afccda7d0c9d01e')
case "${CARCH}" in case "${CARCH}" in
x86_64) _JARCH='x86_64';; x86_64) _JARCH='x86_64';;
@ -145,7 +145,7 @@ build() {
make images legacy-jre-image make images legacy-jre-image
# https://bugs.openjdk.java.net/browse/JDK-8173610 # https://bugs.openjdk.java.net/browse/JDK-8173610
find "../${_imgdir}" -iname '*.so' -exec chmod +x {} \; find "${srcdir}/${_imgdir}" -iname '*.so' -exec chmod +x {} \;
} }
check() { check() {

View file

@ -1,12 +1,12 @@
[Desktop Entry] [Desktop Entry]
Name=OpenJDK Java 21 Runtime Name=OpenJDK Java 22 Runtime
Name[fi]=OpenJDK Java 21 - ajonaikainen ympäristö Name[fi]=OpenJDK Java 22 - ajonaikainen ympäristö
Comment=OpenJDK Java 21 Runtime Comment=OpenJDK Java 22 Runtime
Comment[fi]=OpenJDK Java 21 - ajonaikainen ympäristö Comment[fi]=OpenJDK Java 22 - ajonaikainen ympäristö
Keywords=java;runtime Keywords=java;runtime
Exec=/usr/lib/jvm/java-21-openjdk/bin/java -jar Exec=/usr/lib/jvm/java-22-openjdk/bin/java -jar
Terminal=false Terminal=false
Type=Application Type=Application
Icon=java21-openjdk Icon=java22-openjdk
MimeType=application/x-java-archive;application/java-archive;application/x-jar; MimeType=application/x-java-archive;application/java-archive;application/x-jar;
NoDisplay=true NoDisplay=true

View file

@ -1,11 +1,11 @@
[Desktop Entry] [Desktop Entry]
Name=OpenJDK Java 21 Console Name=OpenJDK Java 22 Console
Name[fi]=OpenJDK Java 21 - konsoli Name[fi]=OpenJDK Java 22 - konsoli
Comment=OpenJDK Java 21 Monitoring & Management Console Comment=OpenJDK Java 22 Monitoring & Management Console
Comment[fi]=OpenJDK Java 21 - valvonta- ja hallintakonsoli Comment[fi]=OpenJDK Java 22 - valvonta- ja hallintakonsoli
Keywords=java;console;monitoring Keywords=java;console;monitoring
Exec=/usr/lib/jvm/java-21-openjdk/bin/jconsole Exec=/usr/lib/jvm/java-22-openjdk/bin/jconsole
Terminal=false Terminal=false
Type=Application Type=Application
Icon=java21-openjdk Icon=java22-openjdk
Categories=Application;System; Categories=Application;System;

View file

@ -1,9 +1,9 @@
[Desktop Entry] [Desktop Entry]
Name=OpenJDK Java 21 Shell Name=OpenJDK Java 22 Shell
Comment=OpenJDK Java 21 Shell Comment=OpenJDK Java 22 Shell
Keywords=java;shell Keywords=java;shell
Exec=/usr/lib/jvm/java-21-openjdk/bin/jshell Exec=/usr/lib/jvm/java-22-openjdk/bin/jshell
Terminal=true Terminal=true
Type=Application Type=Application
Icon=java21-openjdk Icon=java22-openjdk
Categories=Application;System; Categories=Application;System;

View file

@ -1,4 +1,4 @@
THIS_JDK='java-21-openjdk' THIS_JDK='java-22-openjdk'
fix_default() { fix_default() {
if [ ! -x /usr/bin/java ]; then if [ ! -x /usr/bin/java ]; then

View file

@ -1,4 +1,4 @@
THIS_JRE='java-21-openjdk' THIS_JRE='java-22-openjdk'
fix_default() { fix_default() {
if [ ! -x /usr/bin/java ]; then if [ ! -x /usr/bin/java ]; then

View file

@ -1,4 +1,4 @@
THIS_JRE='java-21-openjdk' THIS_JRE='java-22-openjdk'
fix_default() { fix_default() {
if [ ! -x /usr/bin/java ]; then if [ ! -x /usr/bin/java ]; then