uppkg -> 18.0.1.1.u2-1

2 files changed, 15 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c51386c05500..9913c0bd697f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = java-openjdk-xdg
-	pkgver = 18.0.1.u10
+	pkgver = 18.0.1.1.u2
 	pkgrel = 1
 	url = https://openjdk.java.net/
 	arch = x86_64
@@ -40,13 +40,13 @@ pkgbase = java-openjdk-xdg
 	conflicts = openjdk-src
 	conflicts = openjdk-doc
 	options = !lto
-	source = https://github.com/openjdk/jdk18u/archive/jdk-18.0.1+10.tar.gz
+	source = https://github.com/openjdk/jdk18u/archive/jdk-18.0.1.1+2.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 = 831df6eafa1698bf2dd524241a740669c9c737f1bf5872100746e745ba6dd6ea
+	sha256sums = 57ed6b990b24b1e8b50099a265841add596d2c82e73c7c82bb530a8f53a47732
 	sha256sums = 58bf779332d21151ba47719926ddcc8811ac7bbf414222141dcf40ac54cfaa2d
 	sha256sums = 3a50ded3918024de4e441a46744c8e342faf46441b53c8bac7d589055a28a13c
 	sha256sums = 2cace78ec911f73578991370914753c5b6abe9f7304bcbcb7a3077b8dbc7c867
@@ -73,7 +73,7 @@ pkgname = jre-openjdk-headless-xdg
 	optdepends = java-rhino: for some JavaScript support
 	provides = java-runtime-headless=18
 	provides = java-runtime-headless-openjdk=18
-	provides = jre18-openjdk-headless=18.0.1.u10-1
+	provides = jre18-openjdk-headless=18.0.1.1.u2-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
@@ -92,7 +92,7 @@ pkgname = jre-openjdk-headless-xdg
 pkgname = jre-openjdk-xdg
 	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.1.u10-1
+	depends = jre18-openjdk-headless=18.0.1.1.u2-1
 	depends = giflib
 	depends = libgif.so
 	depends = glibc
@@ -103,12 +103,12 @@ pkgname = jre-openjdk-xdg
 	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.1.u10-1
+	provides = jre18-openjdk=18.0.1.1.u2-1
 
 pkgname = jdk-openjdk-xdg
 	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.1.u10-1
+	depends = jre18-openjdk=18.0.1.1.u2-1
 	depends = java-environment-common=3
 	depends = hicolor-icon-theme
 	depends = libelf
@@ -116,14 +116,14 @@ pkgname = jdk-openjdk-xdg
 	depends = gcc-libs
 	provides = java-environment=18
 	provides = java-environment-openjdk=18
-	provides = jdk18-openjdk=18.0.1.u10-1
+	provides = jdk18-openjdk=18.0.1.1.u2-1
 
 pkgname = openjdk-src-xdg
 	pkgdesc = OpenJDK Java 18 sources - with improved Support for the XDG Base Directory Specification
-	depends = jdk18-openjdk=18.0.1.u10-1
-	provides = openjdk18-src=18.0.1.u10-1
+	depends = jdk18-openjdk=18.0.1.1.u2-1
+	provides = openjdk18-src=18.0.1.1.u2-1
 
 pkgname = openjdk-doc-xdg
 	pkgdesc = OpenJDK Java 18 documentation - with improved Support for the XDG Base Directory Specification
-	depends = jdk18-openjdk=18.0.1.u10-1
-	provides = openjdk18-doc=18.0.1.u10-1
+	depends = jdk18-openjdk=18.0.1.1.u2-1
+	provides = openjdk18-doc=18.0.1.1.u2-1
diff --git a/PKGBUILD b/PKGBUILD
index d72ab8f1e927..49a84e15ab2a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@ pkgbase=java-openjdk-xdg
 pkgname=('jre-openjdk-headless-xdg' 'jre-openjdk-xdg' 'jdk-openjdk-xdg' 'openjdk-src-xdg' 'openjdk-doc-xdg')
 _majorver=18
 _minorver=0
-_securityver=1
-_updatever=10
+_securityver=1.1
+_updatever=2
 pkgrel=1
 pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
 #pkgver=${_majorver}.u${_updatever}
@@ -29,7 +29,7 @@ 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=('831df6eafa1698bf2dd524241a740669c9c737f1bf5872100746e745ba6dd6ea'
+sha256sums=('57ed6b990b24b1e8b50099a265841add596d2c82e73c7c82bb530a8f53a47732'
             '58bf779332d21151ba47719926ddcc8811ac7bbf414222141dcf40ac54cfaa2d'
             '3a50ded3918024de4e441a46744c8e342faf46441b53c8bac7d589055a28a13c'
             '2cace78ec911f73578991370914753c5b6abe9f7304bcbcb7a3077b8dbc7c867'
@@ -61,11 +61,6 @@ prepare() {
 build() {
   cd ${_jdkdir}
 
-  # export old flags to avoid zlist fail with hotspot agent (used in artix)
-  export CPPFLAGS="-D_FORTIFY_SOURCE=2"
-  export CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
-  export CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
-
   NUM_PROC_OPT=''
   MAKEFLAG_J=$(echo ${MAKEFLAGS} | sed -En 's/.*-j([0-9]+).*/\1/p')
   if [ -n "${MAKEFLAG_J}" ]; then