uppkg -> 18.0.1.u10-1

8 files changed, 52 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5035a7a0447e..c51386c05500 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = java-openjdk-xdg
-	pkgver = 17.0.3.u3
+	pkgver = 18.0.1.u10
 	pkgrel = 1
 	url = https://openjdk.java.net/
 	arch = x86_64
@@ -40,21 +40,21 @@ pkgbase = java-openjdk-xdg
 	conflicts = openjdk-src
 	conflicts = openjdk-doc
 	options = !lto
-	source = https://github.com/openjdk/jdk17u/archive/jdk-17.0.3+3.tar.gz
+	source = https://github.com/openjdk/jdk18u/archive/jdk-18.0.1+10.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 = f985bc954c50b9c09d1f8fab698b6591cc46ce3ef6a18570aa192567ff661ca0
-	sha256sums = 85c4742764590783160af74587a47269e6797fbdf17ec485c7644bd239adf61d
-	sha256sums = abac1ab09a33a3654378bc69be5a7cf075263ab3ae9efec1eb25cf388e711bb7
-	sha256sums = e7cce0ecf868f656d8dc2eb25ab82ab665526a0a28aba20f02632dd29962dac3
+	sha256sums = 831df6eafa1698bf2dd524241a740669c9c737f1bf5872100746e745ba6dd6ea
+	sha256sums = 58bf779332d21151ba47719926ddcc8811ac7bbf414222141dcf40ac54cfaa2d
+	sha256sums = 3a50ded3918024de4e441a46744c8e342faf46441b53c8bac7d589055a28a13c
+	sha256sums = 2cace78ec911f73578991370914753c5b6abe9f7304bcbcb7a3077b8dbc7c867
 	sha256sums = 25860396475759236e0edf66711b842143b0ddee47eed61e080da158bbc58ce9
 	sha256sums = 48f9e40c4ae8eb79d17fb676893a89b95ac43616827725a9d10de2b1f357642c
 
 pkgname = jre-openjdk-headless-xdg
-	pkgdesc = OpenJDK Java 17 headless runtime environment - with improved Support for the XDG Base Directory Specification
+	pkgdesc = OpenJDK Java 18 headless runtime environment - with improved Support for the XDG Base Directory Specification
 	install = install_jre-openjdk-headless.sh
 	depends = java-runtime-common>=3
 	depends = ca-certificates-utils
@@ -71,9 +71,9 @@ pkgname = jre-openjdk-headless-xdg
 	depends = glibc
 	depends = gcc-libs
 	optdepends = java-rhino: for some JavaScript support
-	provides = java-runtime-headless=17
-	provides = java-runtime-headless-openjdk=17
-	provides = jre17-openjdk-headless=17.0.3.u3-1
+	provides = java-runtime-headless=18
+	provides = java-runtime-headless-openjdk=18
+	provides = jre18-openjdk-headless=18.0.1.u10-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
@@ -90,9 +90,9 @@ pkgname = jre-openjdk-headless-xdg
 	backup = etc/java-openjdk-xdg/sound.properties
 
 pkgname = jre-openjdk-xdg
-	pkgdesc = OpenJDK Java 17 full runtime environment - with improved Support for the XDG Base Directory Specification
+	pkgdesc = OpenJDK Java 18 full runtime environment - with improved Support for the XDG Base Directory Specification
 	install = install_jre-openjdk.sh
-	depends = jre17-openjdk-headless=17.0.3.u3-1
+	depends = jre18-openjdk-headless=18.0.1.u10-1
 	depends = giflib
 	depends = libgif.so
 	depends = glibc
@@ -101,29 +101,29 @@ pkgname = jre-openjdk-xdg
 	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=17
-	provides = java-runtime-openjdk=17
-	provides = jre17-openjdk=17.0.3.u3-1
+	provides = java-runtime=18
+	provides = java-runtime-openjdk=18
+	provides = jre18-openjdk=18.0.1.u10-1
 
 pkgname = jdk-openjdk-xdg
-	pkgdesc = OpenJDK Java 17 development kit - with improved Support for the XDG Base Directory Specification
+	pkgdesc = OpenJDK Java 18 development kit - with improved Support for the XDG Base Directory Specification
 	install = install_jdk-openjdk.sh
-	depends = jre17-openjdk=17.0.3.u3-1
+	depends = jre18-openjdk=18.0.1.u10-1
 	depends = java-environment-common=3
 	depends = hicolor-icon-theme
 	depends = libelf
 	depends = glibc
 	depends = gcc-libs
-	provides = java-environment=17
-	provides = java-environment-openjdk=17
-	provides = jdk17-openjdk=17.0.3.u3-1
+	provides = java-environment=18
+	provides = java-environment-openjdk=18
+	provides = jdk18-openjdk=18.0.1.u10-1
 
 pkgname = openjdk-src-xdg
-	pkgdesc = OpenJDK Java 17 sources - with improved Support for the XDG Base Directory Specification
-	depends = jdk17-openjdk=17.0.3.u3-1
-	provides = openjdk17-src=17.0.3.u3-1
+	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
 
 pkgname = openjdk-doc-xdg
-	pkgdesc = OpenJDK Java 17 documentation - with improved Support for the XDG Base Directory Specification
-	depends = jdk17-openjdk=17.0.3.u3-1
-	provides = openjdk17-doc=17.0.3.u3-1
+	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
diff --git a/PKGBUILD b/PKGBUILD
index f85aebcbc1fe..d72ab8f1e927 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,10 +6,10 @@
 
 pkgbase=java-openjdk-xdg
 pkgname=('jre-openjdk-headless-xdg' 'jre-openjdk-xdg' 'jdk-openjdk-xdg' 'openjdk-src-xdg' 'openjdk-doc-xdg')
-_majorver=17
+_majorver=18
 _minorver=0
-_securityver=3
-_updatever=3
+_securityver=1
+_updatever=10
 pkgrel=1
 pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
 #pkgver=${_majorver}.u${_updatever}
@@ -29,10 +29,10 @@ 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=('f985bc954c50b9c09d1f8fab698b6591cc46ce3ef6a18570aa192567ff661ca0'
-            '85c4742764590783160af74587a47269e6797fbdf17ec485c7644bd239adf61d'
-            'abac1ab09a33a3654378bc69be5a7cf075263ab3ae9efec1eb25cf388e711bb7'
-            'e7cce0ecf868f656d8dc2eb25ab82ab665526a0a28aba20f02632dd29962dac3'
+sha256sums=('831df6eafa1698bf2dd524241a740669c9c737f1bf5872100746e745ba6dd6ea'
+            '58bf779332d21151ba47719926ddcc8811ac7bbf414222141dcf40ac54cfaa2d'
+            '3a50ded3918024de4e441a46744c8e342faf46441b53c8bac7d589055a28a13c'
+            '2cace78ec911f73578991370914753c5b6abe9f7304bcbcb7a3077b8dbc7c867'
             '25860396475759236e0edf66711b842143b0ddee47eed61e080da158bbc58ce9'
             '48f9e40c4ae8eb79d17fb676893a89b95ac43616827725a9d10de2b1f357642c')
 provides=('jre-openjdk-headless' 'jre-openjdk' 'jdk-openjdk' 'openjdk-src' 'openjdk-doc')
diff --git a/freedesktop-java.desktop b/freedesktop-java.desktop
index c1b0110f115d..dfb8482575aa 100644
--- a/freedesktop-java.desktop
+++ b/freedesktop-java.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Name=OpenJDK Java 17 Runtime
-Name[fi]=OpenJDK Java 17 - ajonaikainen ympäristö
-Comment=OpenJDK Java 17 Runtime
-Comment[fi]=OpenJDK Java 17 - ajonaikainen ympäristö
+Name=OpenJDK Java 18 Runtime
+Name[fi]=OpenJDK Java 18 - ajonaikainen ympäristö
+Comment=OpenJDK Java 18 Runtime
+Comment[fi]=OpenJDK Java 18 - ajonaikainen ympäristö
 Keywords=java;runtime
-Exec=/usr/lib/jvm/java-17-openjdk/bin/java -jar
+Exec=/usr/lib/jvm/java-18-openjdk/bin/java -jar
 Terminal=false
 Type=Application
-Icon=java17-openjdk
+Icon=java18-openjdk
 MimeType=application/x-java-archive;application/java-archive;application/x-jar;
 NoDisplay=true
diff --git a/freedesktop-jconsole.desktop b/freedesktop-jconsole.desktop
index c7a1469f1e01..44fb3b44beea 100644
--- a/freedesktop-jconsole.desktop
+++ b/freedesktop-jconsole.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
-Name=OpenJDK Java 17 Console
-Name[fi]=OpenJDK Java 17 - konsoli
-Comment=OpenJDK Java 17 Monitoring & Management Console
-Comment[fi]=OpenJDK Java 17 - valvonta- ja hallintakonsoli
+Name=OpenJDK Java 18 Console
+Name[fi]=OpenJDK Java 18 - konsoli
+Comment=OpenJDK Java 18 Monitoring & Management Console
+Comment[fi]=OpenJDK Java 18 - valvonta- ja hallintakonsoli
 Keywords=java;console;monitoring
-Exec=/usr/lib/jvm/java-17-openjdk/bin/jconsole
+Exec=/usr/lib/jvm/java-18-openjdk/bin/jconsole
 Terminal=false
 Type=Application
-Icon=java17-openjdk
+Icon=java18-openjdk
 Categories=Application;System;
diff --git a/freedesktop-jshell.desktop b/freedesktop-jshell.desktop
index f02b1c2f29c9..d513704e9f6a 100644
--- a/freedesktop-jshell.desktop
+++ b/freedesktop-jshell.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=OpenJDK Java 17 Shell
-Comment=OpenJDK Java 17 Shell
+Name=OpenJDK Java 18 Shell
+Comment=OpenJDK Java 18 Shell
 Keywords=java;shell
-Exec=/usr/lib/jvm/java-17-openjdk/bin/jshell
+Exec=/usr/lib/jvm/java-18-openjdk/bin/jshell
 Terminal=true
 Type=Application
-Icon=java17-openjdk
+Icon=java18-openjdk
 Categories=Application;System;
diff --git a/install_jdk-openjdk.sh b/install_jdk-openjdk.sh
index 1669ae6c21ce..76300b9cbf43 100644
--- a/install_jdk-openjdk.sh
+++ b/install_jdk-openjdk.sh
@@ -1,4 +1,4 @@
-THIS_JDK='java-17-openjdk'
+THIS_JDK='java-18-openjdk'
 
 fix_default() {
   if [ ! -x /usr/bin/java ]; then
diff --git a/install_jre-openjdk-headless.sh b/install_jre-openjdk-headless.sh
index b7e65a5cc4ac..cee45b4ff488 100644
--- a/install_jre-openjdk-headless.sh
+++ b/install_jre-openjdk-headless.sh
@@ -1,4 +1,4 @@
-THIS_JRE='java-17-openjdk'
+THIS_JRE='java-18-openjdk'
 
 fix_default() {
   if [ ! -x /usr/bin/java ]; then
diff --git a/install_jre-openjdk.sh b/install_jre-openjdk.sh
index a6f0b401bfd2..75a2eb12aa7f 100644
--- a/install_jre-openjdk.sh
+++ b/install_jre-openjdk.sh
@@ -1,4 +1,4 @@
-THIS_JRE='java-17-openjdk'
+THIS_JRE='java-18-openjdk'
 
 fix_default() {
   if [ ! -x /usr/bin/java ]; then