From 6059972a4b2b6ce6e6161de258482b143ef74ca6 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 12 Oct 2021 13:56:40 +0000
Subject: [PATCH] extra/java-openjdk to 17.u35-1

---
 extra/java-openjdk/PKGBUILD                   | 20 ++++++++++---------
 extra/java-openjdk/freedesktop-java.desktop   | 12 +++++------
 .../java-openjdk/freedesktop-jconsole.desktop | 12 +++++------
 extra/java-openjdk/freedesktop-jshell.desktop |  8 ++++----
 extra/java-openjdk/install_jdk-openjdk.sh     |  2 +-
 .../install_jre-openjdk-headless.sh           |  2 +-
 extra/java-openjdk/install_jre-openjdk.sh     |  2 +-
 7 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/extra/java-openjdk/PKGBUILD b/extra/java-openjdk/PKGBUILD
index b2134766a..5137da265 100644
--- a/extra/java-openjdk/PKGBUILD
+++ b/extra/java-openjdk/PKGBUILD
@@ -21,13 +21,15 @@
 
 pkgbase=java-openjdk
 pkgname=('jre-openjdk-headless' 'jre-openjdk' 'jdk-openjdk' 'openjdk-src')
-_majorver=16
+_majorver=17
 _minorver=0
-_securityver=2
-_updatever=7
+_securityver=0
+_updatever=35
 pkgrel=1
-pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
-_git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
+#pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
+pkgver=${_majorver}.u${_updatever}
+#_git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
+_git_tag=jdk-${_majorver}+${_updatever}
 arch=('x86_64')
 url='https://openjdk.java.net/'
 license=('custom')
@@ -39,10 +41,10 @@ source=(https://github.com/openjdk/jdk${_majorver}u/archive/${_git_tag}.tar.gz
         freedesktop-java.desktop
         freedesktop-jconsole.desktop
         freedesktop-jshell.desktop)
-sha256sums=('b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c'
-            '11150daae08fff25309dcc060c07cd056181644d2b563c22668b98e306e8f2db'
-            'c0673d680cc728af88bec89275f0a8e2199d52e48b5c5b0aa2d921bedbc2e12f'
-            '0cdf3dc10a64c5e589e655276189422b60a6b3294539164a6f29123d6b2046c7')
+sha256sums=('30f18c49c004880ede19498c45e91bbef83fb3419aba7abd583bf03a670ea53b'
+            '85c4742764590783160af74587a47269e6797fbdf17ec485c7644bd239adf61d'
+            'abac1ab09a33a3654378bc69be5a7cf075263ab3ae9efec1eb25cf388e711bb7'
+            'e7cce0ecf868f656d8dc2eb25ab82ab665526a0a28aba20f02632dd29962dac3')
 
 case "${CARCH}" in
   x86_64) _JARCH='x86_64';;
diff --git a/extra/java-openjdk/freedesktop-java.desktop b/extra/java-openjdk/freedesktop-java.desktop
index 5921f1c7a..c1b0110f1 100644
--- a/extra/java-openjdk/freedesktop-java.desktop
+++ b/extra/java-openjdk/freedesktop-java.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Name=OpenJDK Java 16 Runtime
-Name[fi]=OpenJDK Java 16 - ajonaikainen ympäristö
-Comment=OpenJDK Java 16 Runtime
-Comment[fi]=OpenJDK Java 16 - ajonaikainen ympäristö
+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ö
 Keywords=java;runtime
-Exec=/usr/lib/jvm/java-16-openjdk/bin/java -jar
+Exec=/usr/lib/jvm/java-17-openjdk/bin/java -jar
 Terminal=false
 Type=Application
-Icon=java16-openjdk
+Icon=java17-openjdk
 MimeType=application/x-java-archive;application/java-archive;application/x-jar;
 NoDisplay=true
diff --git a/extra/java-openjdk/freedesktop-jconsole.desktop b/extra/java-openjdk/freedesktop-jconsole.desktop
index d54700843..c7a1469f1 100644
--- a/extra/java-openjdk/freedesktop-jconsole.desktop
+++ b/extra/java-openjdk/freedesktop-jconsole.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
-Name=OpenJDK Java 16 Console
-Name[fi]=OpenJDK Java 16 - konsoli
-Comment=OpenJDK Java 16 Monitoring & Management Console
-Comment[fi]=OpenJDK Java 16 - valvonta- ja hallintakonsoli
+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
 Keywords=java;console;monitoring
-Exec=/usr/lib/jvm/java-16-openjdk/bin/jconsole
+Exec=/usr/lib/jvm/java-17-openjdk/bin/jconsole
 Terminal=false
 Type=Application
-Icon=java16-openjdk
+Icon=java17-openjdk
 Categories=Application;System;
diff --git a/extra/java-openjdk/freedesktop-jshell.desktop b/extra/java-openjdk/freedesktop-jshell.desktop
index 44d21dd1d..f02b1c2f2 100644
--- a/extra/java-openjdk/freedesktop-jshell.desktop
+++ b/extra/java-openjdk/freedesktop-jshell.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=OpenJDK Java 16 Shell
-Comment=OpenJDK Java 16 Shell
+Name=OpenJDK Java 17 Shell
+Comment=OpenJDK Java 17 Shell
 Keywords=java;shell
-Exec=/usr/lib/jvm/java-16-openjdk/bin/jshell
+Exec=/usr/lib/jvm/java-17-openjdk/bin/jshell
 Terminal=true
 Type=Application
-Icon=java16-openjdk
+Icon=java17-openjdk
 Categories=Application;System;
diff --git a/extra/java-openjdk/install_jdk-openjdk.sh b/extra/java-openjdk/install_jdk-openjdk.sh
index ec0766d83..1669ae6c2 100644
--- a/extra/java-openjdk/install_jdk-openjdk.sh
+++ b/extra/java-openjdk/install_jdk-openjdk.sh
@@ -1,4 +1,4 @@
-THIS_JDK='java-16-openjdk'
+THIS_JDK='java-17-openjdk'
 
 fix_default() {
   if [ ! -x /usr/bin/java ]; then
diff --git a/extra/java-openjdk/install_jre-openjdk-headless.sh b/extra/java-openjdk/install_jre-openjdk-headless.sh
index 04a134c19..b7e65a5cc 100644
--- a/extra/java-openjdk/install_jre-openjdk-headless.sh
+++ b/extra/java-openjdk/install_jre-openjdk-headless.sh
@@ -1,4 +1,4 @@
-THIS_JRE='java-16-openjdk'
+THIS_JRE='java-17-openjdk'
 
 fix_default() {
   if [ ! -x /usr/bin/java ]; then
diff --git a/extra/java-openjdk/install_jre-openjdk.sh b/extra/java-openjdk/install_jre-openjdk.sh
index 5bb36b3e7..a6f0b401b 100644
--- a/extra/java-openjdk/install_jre-openjdk.sh
+++ b/extra/java-openjdk/install_jre-openjdk.sh
@@ -1,4 +1,4 @@
-THIS_JRE='java-16-openjdk'
+THIS_JRE='java-17-openjdk'
 
 fix_default() {
   if [ ! -x /usr/bin/java ]; then