From 2e4928ed91c47cbcacc8dbba0ffc055633fc2d7a Mon Sep 17 00:00:00 2001 From: David Beauchamp Date: Wed, 17 Jul 2024 12:21:54 -0400 Subject: [PATCH] extra/java21-openjdk to 21.0.4.u7-1 --- extra/java21-openjdk/.SRCINFO | 28 +++++++++++++--------------- extra/java21-openjdk/PKGBUILD | 11 +++++------ 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/extra/java21-openjdk/.SRCINFO b/extra/java21-openjdk/.SRCINFO index 464441b3a..4ba9162f2 100644 --- a/extra/java21-openjdk/.SRCINFO +++ b/extra/java21-openjdk/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = java21-openjdk - pkgver = 21.0.3.u9 + pkgver = 21.0.4.u7 pkgrel = 1 url = https://openjdk.java.net/ arch = x86_64 @@ -29,11 +29,11 @@ pkgbase = java21-openjdk makedepends = harfbuzz makedepends = gcc-libs makedepends = glibc - source = https://github.com/openjdk/jdk21u/archive/jdk-21.0.3+9.tar.gz + source = https://github.com/openjdk/jdk21u/archive/jdk-21.0.4+7.tar.gz source = freedesktop-java.desktop source = freedesktop-jconsole.desktop source = freedesktop-jshell.desktop - sha256sums = b7a78e596b272d958843eab0c0412fd7ee874a3b6fff577584ebeed39dfef7ee + sha256sums = b8b37fa6fcc284d91e7458c703ca4c893a1dd5a6e0f6b9e198e7d13cd8efd24d sha256sums = 72111743ab6ab36854b0c85a504172983715d0798fce10bc4e35689b7d15fd93 sha256sums = 8ecdf5c1605bafa58b3f7da615e6d8d3d943e3a2d3831930d6efa7815aacce07 sha256sums = 50fc0d677489b73d549df2f08d759d5f057f200adbbab83ea5e87456152ee03e @@ -58,7 +58,7 @@ pkgname = jre21-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.0.3.u9-1 + provides = jre21-openjdk-headless=21.0.4.u7-1 conflicts = jdk21-openjdk conflicts = jre21-openjdk backup = etc/java21-openjdk/logging.properties @@ -97,14 +97,13 @@ pkgname = jre21-openjdk depends = libgif.so depends = libpng 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=21 provides = java-runtime-openjdk=21 - provides = jre21-openjdk=21.0.3.u9-1 + provides = jre21-openjdk=21.0.4.u7-1 provides = java-runtime-headless=21 provides = java-runtime-headless-openjdk=21 - provides = jre21-openjdk-headless=21.0.3.u9-1 + provides = jre21-openjdk-headless=21.0.4.u7-1 conflicts = jdk21-openjdk conflicts = jre21-openjdk-headless backup = etc/java21-openjdk/logging.properties @@ -157,17 +156,16 @@ pkgname = jdk21-openjdk depends = libharfbuzz.so optdepends = java-rhino: for some JavaScript support 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-environment=21 provides = java-environment-openjdk=21 - provides = jdk21-openjdk=21.0.3.u9-1 + provides = jdk21-openjdk=21.0.4.u7-1 provides = java-runtime=21 provides = java-runtime-openjdk=21 - provides = jre21-openjdk=21.0.3.u9-1 + provides = jre21-openjdk=21.0.4.u7-1 provides = java-runtime-headless=21 provides = java-runtime-headless-openjdk=21 - provides = jre21-openjdk-headless=21.0.3.u9-1 + provides = jre21-openjdk-headless=21.0.4.u7-1 conflicts = jre21-openjdk conflicts = jre21-openjdk-headless backup = etc/java21-openjdk/logging.properties @@ -187,10 +185,10 @@ pkgname = jdk21-openjdk pkgname = openjdk21-src pkgdesc = OpenJDK Java 21 sources - depends = jdk21-openjdk=21.0.3.u9-1 - provides = openjdk21-src=21.0.3.u9-1 + depends = jdk21-openjdk=21.0.4.u7-1 + provides = openjdk21-src=21.0.4.u7-1 pkgname = openjdk21-doc pkgdesc = OpenJDK Java 21 documentation - depends = jdk21-openjdk=21.0.3.u9-1 - provides = openjdk21-doc=21.0.3.u9-1 + depends = jdk21-openjdk=21.0.4.u7-1 + provides = openjdk21-doc=21.0.4.u7-1 diff --git a/extra/java21-openjdk/PKGBUILD b/extra/java21-openjdk/PKGBUILD index d58e1416f..f918a4a2d 100644 --- a/extra/java21-openjdk/PKGBUILD +++ b/extra/java21-openjdk/PKGBUILD @@ -17,10 +17,10 @@ pkgname=('jre21-openjdk-headless' 'jre21-openjdk' 'jdk21-openjdk' 'openjdk21-src # on a majorver change, don't forget to update the misc files that come along this PKGBUILD _majorver=21 _minorver=0 -_securityver=2 -_updatever=13 +_securityver=4 +_updatever=7 pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever} -pkgrel=2 +pkgrel=1 _git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever} arch=('x86_64') url='https://openjdk.java.net/' @@ -33,7 +33,7 @@ source=(https://github.com/openjdk/jdk${_majorver}u/archive/${_git_tag}.tar.gz freedesktop-java.desktop freedesktop-jconsole.desktop freedesktop-jshell.desktop) -sha256sums=('4d8c8dd00164df0e344ed343d4ac20c1f30133f1029a83ff2c66c3557ed13a26' +sha256sums=('b8b37fa6fcc284d91e7458c703ca4c893a1dd5a6e0f6b9e198e7d13cd8efd24d' '72111743ab6ab36854b0c85a504172983715d0798fce10bc4e35689b7d15fd93' '8ecdf5c1605bafa58b3f7da615e6d8d3d943e3a2d3831930d6efa7815aacce07' '50fc0d677489b73d549df2f08d759d5f057f200adbbab83ea5e87456152ee03e') @@ -118,6 +118,7 @@ build() { --with-native-debug-symbols=none \ --enable-unlimited-crypto \ --disable-warnings-as-errors \ + --with-vendor-name="Arch Linux" \ ${NUM_PROC_OPT} #--disable-javac-server @@ -194,7 +195,6 @@ package_jre21-openjdk() { pkgdesc="OpenJDK Java ${_majorver} full runtime environment" depends=("${_commondeps[@]}" 'giflib' 'libgif.so' 'libpng') optdepends=('alsa-lib: for basic sound support' - 'gtk2: for the Gtk+ 2 look and feel - desktop usage' 'gtk3: for the Gtk+ 3 look and feel - desktop usage') provides=("java-runtime=${_majorver}" "java-runtime-openjdk=${_majorver}" "jre${_majorver}-openjdk=${pkgver}-${pkgrel}" "java-runtime-headless=${_majorver}" "java-runtime-headless-openjdk=${_majorver}" "jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}") @@ -266,7 +266,6 @@ package_jdk21-openjdk() { 'libharfbuzz.so') optdepends=('java-rhino: for some JavaScript support' 'alsa-lib: for basic sound support' - 'gtk2: for the Gtk+ 2 look and feel - desktop usage' 'gtk3: for the Gtk+ 3 look and feel - desktop usage') provides=("java-environment=${_majorver}" "java-environment-openjdk=${_majorver}" "jdk${_majorver}-openjdk=${pkgver}-${pkgrel}" "java-runtime=${_majorver}" "java-runtime-openjdk=${_majorver}" "jre${_majorver}-openjdk=${pkgver}-${pkgrel}"