uppkg -> -3${_majorver}.${_minorver}.${_securityver}.u${_updatever}

2 files changed, 21 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bbc3d0923170..35d09a1c310b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,34 +1,9 @@
 pkgbase = jdk-openjdk-xdg-bin
 	pkgver = 18.0.2.1.u0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://openjdk.java.net/
 	arch = x86_64
 	license = custom
-	makedepends = java-environment>=11
-	makedepends = cpio
-	makedepends = unzip
-	makedepends = zip
-	makedepends = libelf
-	makedepends = libcups
-	makedepends = libx11
-	makedepends = libxrender
-	makedepends = libxtst
-	makedepends = libxt
-	makedepends = libxext
-	makedepends = libxrandr
-	makedepends = alsa-lib
-	makedepends = pandoc
-	makedepends = graphviz
-	makedepends = freetype2
-	makedepends = libjpeg-turbo
-	makedepends = giflib
-	makedepends = libpng
-	makedepends = lcms2
-	makedepends = libnet
-	makedepends = bash
-	makedepends = harfbuzz
-	makedepends = gcc-libs
-	makedepends = glibc
 	provides = jre-openjdk-headless
 	provides = jre-openjdk
 	provides = jdk-openjdk
@@ -39,17 +14,17 @@ pkgbase = jdk-openjdk-xdg-bin
 	conflicts = jdk-openjdk
 	conflicts = openjdk-src
 	conflicts = openjdk-doc
-	noextract = jdk-openjdk-xdg-18.0.2.1.u0-2-x86_64.pkg.tar.zst
-	noextract = jre-openjdk-headless-xdg-18.0.2.1.u0-2-x86_64.pkg.tar.zst
-	noextract = jre-openjdk-xdg-18.0.2.1.u0-2-x86_64.pkg.tar.zst
-	noextract = openjdk-doc-xdg-18.0.2.1.u0-2-x86_64.pkg.tar.zst
-	noextract = openjdk-src-xdg-18.0.2.1.u0-2-x86_64.pkg.tar.zst
+	noextract = jdk-openjdk-xdg-18.0.2.1.u0-3-x86_64.pkg.tar.zst
+	noextract = jre-openjdk-headless-xdg-18.0.2.1.u0-3-x86_64.pkg.tar.zst
+	noextract = jre-openjdk-xdg-18.0.2.1.u0-3-x86_64.pkg.tar.zst
+	noextract = openjdk-doc-xdg-18.0.2.1.u0-3-x86_64.pkg.tar.zst
+	noextract = openjdk-src-xdg-18.0.2.1.u0-3-x86_64.pkg.tar.zst
 	options = !lto
-	source = https://github.com/noahvogt/java-openjdk-xdg-aur/releases/download/18.0.2.1.u0-2/jdk-openjdk-xdg-18.0.2.1.u0-2-x86_64.pkg.tar.zst
-	source = https://github.com/noahvogt/java-openjdk-xdg-aur/releases/download/18.0.2.1.u0-2/jre-openjdk-headless-xdg-18.0.2.1.u0-2-x86_64.pkg.tar.zst
-	source = https://github.com/noahvogt/java-openjdk-xdg-aur/releases/download/18.0.2.1.u0-2/jre-openjdk-xdg-18.0.2.1.u0-2-x86_64.pkg.tar.zst
-	source = https://github.com/noahvogt/java-openjdk-xdg-aur/releases/download/18.0.2.1.u0-2/openjdk-doc-xdg-18.0.2.1.u0-2-x86_64.pkg.tar.zst
-	source = https://github.com/noahvogt/java-openjdk-xdg-aur/releases/download/18.0.2.1.u0-2/openjdk-src-xdg-18.0.2.1.u0-2-x86_64.pkg.tar.zst
+	source = https://github.com/noahvogt/java-openjdk-xdg-aur/releases/download/18.0.2.1.u0-3/jdk-openjdk-xdg-18.0.2.1.u0-3-x86_64.pkg.tar.zst
+	source = https://github.com/noahvogt/java-openjdk-xdg-aur/releases/download/18.0.2.1.u0-3/jre-openjdk-headless-xdg-18.0.2.1.u0-3-x86_64.pkg.tar.zst
+	source = https://github.com/noahvogt/java-openjdk-xdg-aur/releases/download/18.0.2.1.u0-3/jre-openjdk-xdg-18.0.2.1.u0-3-x86_64.pkg.tar.zst
+	source = https://github.com/noahvogt/java-openjdk-xdg-aur/releases/download/18.0.2.1.u0-3/openjdk-doc-xdg-18.0.2.1.u0-3-x86_64.pkg.tar.zst
+	source = https://github.com/noahvogt/java-openjdk-xdg-aur/releases/download/18.0.2.1.u0-3/openjdk-src-xdg-18.0.2.1.u0-3-x86_64.pkg.tar.zst
 	sha256sums = f0df23f90e1457e1173670d98fdd82d60c13582e621ea34b5dd986276b690378
 	sha256sums = 4cc6d91c68d98f04af47e4e2c8a4488e579f49e91bd02aa54568e6c8f46c532b
 	sha256sums = 87956a0b991bd5c4e4fbdcc1c43a38f9274c31b698e22129fcceee6890243923
@@ -76,7 +51,7 @@ pkgname = jre-openjdk-headless-xdg-bin
 	optdepends = java-rhino: for some JavaScript support
 	provides = java-runtime-headless=18
 	provides = java-runtime-headless-openjdk=18
-	provides = jre18-openjdk-headless=18.0.2.1.u0-2
+	provides = jre18-openjdk-headless=18.0.2.1.u0-3
 	backup = etc/jdk-openjdk-xdg/logging.properties
 	backup = etc/jdk-openjdk-xdg/management/jmxremote.access
 	backup = etc/jdk-openjdk-xdg/management/jmxremote.password.template
@@ -95,7 +70,7 @@ pkgname = jre-openjdk-headless-xdg-bin
 pkgname = jre-openjdk-xdg-bin
 	pkgdesc = OpenJDK Java 18 full runtime environment - with improved Support for the XDG Base Directory Specification
 	install = install_jre-openjdk.sh
-	depends = jre18-openjdk-headless=18.0.2.1.u0-2
+	depends = jre18-openjdk-headless=18.0.2.1.u0-3
 	depends = giflib
 	depends = libgif.so
 	depends = glibc
@@ -106,12 +81,12 @@ pkgname = jre-openjdk-xdg-bin
 	optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage
 	provides = java-runtime=18
 	provides = java-runtime-openjdk=18
-	provides = jre18-openjdk=18.0.2.1.u0-2
+	provides = jre18-openjdk=18.0.2.1.u0-3
 
 pkgname = jdk-openjdk-xdg-bin
 	pkgdesc = OpenJDK Java 18 development kit - with improved Support for the XDG Base Directory Specification
 	install = install_jdk-openjdk.sh
-	depends = jre18-openjdk=18.0.2.1.u0-2
+	depends = jre18-openjdk=18.0.2.1.u0-3
 	depends = java-environment-common=3
 	depends = hicolor-icon-theme
 	depends = libelf
@@ -119,14 +94,14 @@ pkgname = jdk-openjdk-xdg-bin
 	depends = gcc-libs
 	provides = java-environment=18
 	provides = java-environment-openjdk=18
-	provides = jdk18-openjdk=18.0.2.1.u0-2
+	provides = jdk18-openjdk=18.0.2.1.u0-3
 
 pkgname = openjdk-src-xdg-bin
 	pkgdesc = OpenJDK Java 18 sources - with improved Support for the XDG Base Directory Specification
-	depends = jdk18-openjdk=18.0.2.1.u0-2
-	provides = openjdk18-src=18.0.2.1.u0-2
+	depends = jdk18-openjdk=18.0.2.1.u0-3
+	provides = openjdk18-src=18.0.2.1.u0-3
 
 pkgname = openjdk-doc-xdg-bin
 	pkgdesc = OpenJDK Java 18 documentation - with improved Support for the XDG Base Directory Specification
-	depends = jdk18-openjdk=18.0.2.1.u0-2
-	provides = openjdk18-doc=18.0.2.1.u0-2
+	depends = jdk18-openjdk=18.0.2.1.u0-3
+	provides = openjdk18-doc=18.0.2.1.u0-3
diff --git a/PKGBUILD b/PKGBUILD
index d29ede5c1c57..34f4c42a3698 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ _majorver=18
 _minorver=0
 _securityver=2.1
 _updatever=0
-pkgrel=2
+pkgrel=3
 pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
 #pkgver=${_majorver}.u${_updatever}
 _git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
@@ -18,10 +18,6 @@ _git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
 arch=('x86_64')
 url='https://openjdk.java.net/'
 license=('custom')
-makedepends=('java-environment>=11' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'libx11'
-             'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib' 'pandoc'
-             'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2'
-             'libnet' 'bash' 'harfbuzz' 'gcc-libs' 'glibc')
 options=(!lto)
 source=("https://github.com/noahvogt/java-openjdk-xdg-aur/releases/download/$pkgver-$pkgrel/jdk-openjdk-xdg-$pkgver-$pkgrel-x86_64.pkg.tar.zst"
         "https://github.com/noahvogt/java-openjdk-xdg-aur/releases/download/$pkgver-$pkgrel/jre-openjdk-headless-xdg-$pkgver-$pkgrel-x86_64.pkg.tar.zst"
@@ -48,19 +44,6 @@ case "${CARCH}" in
   i686)   _JARCH='x86';;
 esac
 
-_jvmdir=/usr/lib/jvm/java-${_majorver}-openjdk
-_jdkdir=jdk${_majorver}u-${_git_tag//+/-}
-_imgdir=${_jdkdir}/build/linux-${_JARCH}-server-release/images
-
-_nonheadless=(lib/libawt_xawt.{so,debuginfo}
-              lib/libjawt.{so,debuginfo}
-              lib/libjsound.{so,debuginfo}
-              lib/libsplashscreen.{so,debuginfo})
-# prepare() {
-# echo oof
-# exit 1
-# }
-
 package_jre-openjdk-headless-xdg-bin() {
   pkgdesc="OpenJDK Java ${_majorver} headless runtime environment - with improved Support for the XDG Base Directory Specification"
   depends=('java-runtime-common>=3' 'ca-certificates-utils' 'nss' 'libjpeg-turbo' 'libjpeg.so'