extra/java-openjdk to 21.u35-8

This commit is contained in:
Kevin Mihelich 2023-11-08 00:26:17 +00:00
parent dd43536770
commit bab50cf40e
2 changed files with 21 additions and 14 deletions

View file

@ -1,6 +1,6 @@
pkgbase = java-openjdk
pkgver = 21.u35
pkgrel = 7
pkgrel = 8
url = https://openjdk.java.net/
arch = x86_64
license = custom
@ -59,7 +59,7 @@ pkgname = jre-openjdk-headless
optdepends = java-rhino: for some JavaScript support
provides = java-runtime-headless=21
provides = java-runtime-headless-openjdk=21
provides = jre21-openjdk-headless=21.u35-7
provides = jre21-openjdk-headless=21.u35-8
conflicts = jdk-openjdk
conflicts = jre-openjdk
backup = etc/java-openjdk/logging.properties
@ -102,10 +102,10 @@ pkgname = jre-openjdk
optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage
provides = java-runtime=21
provides = java-runtime-openjdk=21
provides = jre21-openjdk=21.u35-7
provides = jre21-openjdk=21.u35-8
provides = java-runtime-headless=21
provides = java-runtime-headless-openjdk=21
provides = jre21-openjdk-headless=21.u35-7
provides = jre21-openjdk-headless=21.u35-8
conflicts = jdk-openjdk
conflicts = jre-openjdk-headless
backup = etc/java-openjdk/logging.properties
@ -162,13 +162,13 @@ pkgname = jdk-openjdk
optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage
provides = java-environment=21
provides = java-environment-openjdk=21
provides = jdk21-openjdk=21.u35-7
provides = jdk21-openjdk=21.u35-8
provides = java-runtime=21
provides = java-runtime-openjdk=21
provides = jre21-openjdk=21.u35-7
provides = jre21-openjdk=21.u35-8
provides = java-runtime-headless=21
provides = java-runtime-headless-openjdk=21
provides = jre21-openjdk-headless=21.u35-7
provides = jre21-openjdk-headless=21.u35-8
conflicts = jre-openjdk
conflicts = jre-openjdk-headless
backup = etc/java-openjdk/logging.properties
@ -188,10 +188,10 @@ pkgname = jdk-openjdk
pkgname = openjdk-src
pkgdesc = OpenJDK Java 21 sources
depends = jdk21-openjdk=21.u35-7
provides = openjdk21-src=21.u35-7
depends = jdk21-openjdk=21.u35-8
provides = openjdk21-src=21.u35-8
pkgname = openjdk-doc
pkgdesc = OpenJDK Java 21 documentation
depends = jdk21-openjdk=21.u35-7
provides = openjdk21-doc=21.u35-7
depends = jdk21-openjdk=21.u35-8
provides = openjdk21-doc=21.u35-8

View file

@ -30,7 +30,7 @@ _securityver=0
_updatever=35
# pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
pkgver=${_majorver}.u${_updatever}
pkgrel=7
pkgrel=8
# _git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
_git_tag=jdk-${_majorver}+${_updatever}
arch=('x86_64')
@ -270,6 +270,13 @@ package_jre-openjdk() {
# Link JKS keystore from ca-certificates-utils
rm -f "${pkgdir}${_jvmdir}/lib/security/cacerts"
ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/lib/security/cacerts"
# Desktop files
for f in java; do
install -Dm 644 \
"${srcdir}/freedesktop-${f}.desktop" \
"${pkgdir}/usr/share/applications/${f}-${pkgbase}.desktop"
done
}
package_jdk-openjdk() {
@ -277,7 +284,7 @@ package_jdk-openjdk() {
depends=("${_commondeps[@]}" 'java-environment-common=3'
'hicolor-icon-theme' 'libelf' 'libgif.so' 'libpng'
'ca-certificates-utils' 'nss' 'libjpeg-turbo' 'libjpeg.so'
'lcms2' 'liblcms2.so' 'libnet' 'freetype2' 'libfreetype.so' 'harfbuzz'
'lcms2' 'liblcms2.so' 'libnet' 'freetype2' 'libfreetype.so' 'harfbuzz'
'libharfbuzz.so')
optdepends=('java-rhino: for some JavaScript support'
'alsa-lib: for basic sound support'
@ -307,7 +314,7 @@ package_jdk-openjdk() {
install -dm 755 "${pkgdir}${_jvmdir}"
cp -a bin demo include jmods lib \
cp -a bin demo include jmods lib release\
"${pkgdir}${_jvmdir}"
rm "${pkgdir}${_jvmdir}/lib/src.zip"