uppkg -> 17.0.1.u12-2

4 files changed, 59 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8ee12edd717e..c109779f49bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = java-openjdk-xdg
 	pkgver = 17.0.1.u12
-	pkgrel = 1
+	pkgrel = 2
 	url = https://openjdk.java.net/
 	arch = x86_64
 	license = custom
@@ -44,11 +44,13 @@ pkgbase = java-openjdk-xdg
 	source = freedesktop-jconsole.desktop
 	source = freedesktop-jshell.desktop
 	source = xdg-basedir-compliant-fontconfig.patch
+	source = xdg-basedir-compliant-userPrefs.patch
 	sha256sums = 8c076203a6f85ab916b3e54de1992bcbcc5ffe580c52b1ac8d52ca7afb9f02d1
 	sha256sums = 85c4742764590783160af74587a47269e6797fbdf17ec485c7644bd239adf61d
 	sha256sums = abac1ab09a33a3654378bc69be5a7cf075263ab3ae9efec1eb25cf388e711bb7
 	sha256sums = e7cce0ecf868f656d8dc2eb25ab82ab665526a0a28aba20f02632dd29962dac3
-	sha256sums = f0584c4224833c56340fe96c40e43ceee08c419bea6c8de483dda27df98f4c54
+	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 - with improved Support for the XDG Base Directory Specification
@@ -70,7 +72,7 @@ pkgname = jre-openjdk-headless-xdg
 	optdepends = java-rhino: for some JavaScript support
 	provides = java-runtime-headless=17
 	provides = java-runtime-headless-openjdk=17
-	provides = jre17-openjdk-headless=17.0.1.u12-1
+	provides = jre17-openjdk-headless=17.0.1.u12-2
 	backup = etc/java-openjdk-xdg/logging.properties
 	backup = etc/java-openjdk-xdg/management/jmxremote.access
 	backup = etc/java-openjdk-xdg/management/jmxremote.password.template
@@ -89,7 +91,7 @@ pkgname = jre-openjdk-headless-xdg
 pkgname = jre-openjdk-xdg
 	pkgdesc = OpenJDK Java 17 full runtime environment - with improved Support for the XDG Base Directory Specification - with improved Support for the XDG Base Directory Specification
 	install = install_jre-openjdk.sh
-	depends = jre17-openjdk-headless=17.0.1.u12-1
+	depends = jre17-openjdk-headless=17.0.1.u12-2
 	depends = giflib
 	depends = libgif.so
 	depends = glibc
@@ -100,12 +102,12 @@ pkgname = jre-openjdk-xdg
 	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.1.u12-1
+	provides = jre17-openjdk=17.0.1.u12-2
 
 pkgname = jdk-openjdk-xdg
 	pkgdesc = OpenJDK Java 17 development kit - with improved Support for the XDG Base Directory Specification - with improved Support for the XDG Base Directory Specification
 	install = install_jdk-openjdk.sh
-	depends = jre17-openjdk=17.0.1.u12-1
+	depends = jre17-openjdk=17.0.1.u12-2
 	depends = java-environment-common=3
 	depends = hicolor-icon-theme
 	depends = libelf
@@ -113,14 +115,14 @@ pkgname = jdk-openjdk-xdg
 	depends = gcc-libs
 	provides = java-environment=17
 	provides = java-environment-openjdk=17
-	provides = jdk17-openjdk=17.0.1.u12-1
+	provides = jdk17-openjdk=17.0.1.u12-2
 
 pkgname = openjdk-src-xdg
 	pkgdesc = OpenJDK Java 17 sources - with improved Support for the XDG Base Directory Specification
-	depends = jdk17-openjdk=17.0.1.u12-1
-	provides = openjdk17-src=17.0.1.u12-1
+	depends = jdk17-openjdk=17.0.1.u12-2
+	provides = openjdk17-src=17.0.1.u12-2
 
 pkgname = openjdk-doc-xdg
 	pkgdesc = OpenJDK Java 17 documentation - with improved Support for the XDG Base Directory Specification
-	depends = jdk17-openjdk=17.0.1.u12-1
-	provides = openjdk17-doc=17.0.1.u12-1
+	depends = jdk17-openjdk=17.0.1.u12-2
+	provides = openjdk17-doc=17.0.1.u12-2
diff --git a/PKGBUILD b/PKGBUILD
index 2d083be62d17..df5a1f2a0272 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ _majorver=17
 _minorver=0
 _securityver=1
 _updatever=12
-pkgrel=1
+pkgrel=2
 pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
 #pkgver=${_majorver}.u${_updatever}
 _git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
@@ -26,12 +26,14 @@ source=(https://github.com/openjdk/jdk${_majorver}u/archive/${_git_tag}.tar.gz
         freedesktop-java.desktop
         freedesktop-jconsole.desktop
         freedesktop-jshell.desktop
-        xdg-basedir-compliant-fontconfig.patch)
+        xdg-basedir-compliant-fontconfig.patch
+        xdg-basedir-compliant-userPrefs.patch)
 sha256sums=('8c076203a6f85ab916b3e54de1992bcbcc5ffe580c52b1ac8d52ca7afb9f02d1'
             '85c4742764590783160af74587a47269e6797fbdf17ec485c7644bd239adf61d'
             'abac1ab09a33a3654378bc69be5a7cf075263ab3ae9efec1eb25cf388e711bb7'
             'e7cce0ecf868f656d8dc2eb25ab82ab665526a0a28aba20f02632dd29962dac3'
-            'f0584c4224833c56340fe96c40e43ceee08c419bea6c8de483dda27df98f4c54')
+            '25860396475759236e0edf66711b842143b0ddee47eed61e080da158bbc58ce9'
+            '48f9e40c4ae8eb79d17fb676893a89b95ac43616827725a9d10de2b1f357642c')
 provides=('jre-openjdk-headless' 'jre-openjdk' 'jdk-openjdk' 'openjdk-src' 'openjdk-doc')
 conflicts=('jre-openjdk-headless' 'jre-openjdk' 'jdk-openjdk' 'openjdk-src' 'openjdk-doc')
 
@@ -52,12 +54,13 @@ _nonheadless=(lib/libawt_xawt.{so,debuginfo}
 prepare() {
   cd ${_jdkdir}
   patch -p1 -i ../xdg-basedir-compliant-fontconfig.patch
+  patch -p1 -i ../xdg-basedir-compliant-userPrefs.patch
 }
 
 build() {
   cd ${_jdkdir}
 
-  # export old flags to avoid zlist fail with hotspot agent
+  # 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"
diff --git a/xdg-basedir-compliant-fontconfig.patch b/xdg-basedir-compliant-fontconfig.patch
index 04f1d6817f0a..40d72f4b41e3 100644
--- a/xdg-basedir-compliant-fontconfig.patch
+++ b/xdg-basedir-compliant-fontconfig.patch
@@ -24,7 +24,7 @@
 +                else
 +                    xdgConfigDir = xdgSetConfigDir;
 +
-+                dir = xdgSetConfigDir+"/java/fonts/"+version;
++                dir = xdgConfigDir+"/java/fonts/"+version;
 +            } else {
 +                dir = userDir+fs+".java"+fs+"fonts"+fs+version;
 +            }
diff --git a/xdg-basedir-compliant-userPrefs.patch b/xdg-basedir-compliant-userPrefs.patch
new file mode 100644
index 000000000000..78601d6442b4
--- /dev/null
+++ b/xdg-basedir-compliant-userPrefs.patch
@@ -0,0 +1,38 @@
+# TODO: consider changing system-wide preferences
+#       consider removing dot in front of 'lock' files (both system and user)
+--- a/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java
++++ b/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java
+@@ -114,9 +114,30 @@
+     private static void setupUserRoot() {
+         AccessController.doPrivileged(new PrivilegedAction<Void>() {
+             public Void run() {
+-                userRootDir =
+-                      new File(System.getProperty("java.util.prefs.userRoot",
+-                      System.getProperty("user.home")), ".java/.userPrefs");
++                /* On Linux systems, put the userPrefs dir into
++                 * ${XDG_CONFIG_HOME:-$HOME/.config}/java/userPrefs in order to
++                 * follow the XDG Base Directory Specification.
++                 */
++                if (System.getProperty("os.name").equals("Linux")) {
++                    /* assume findable homedir, which the jvm already does */
++                    String xdgDefaultConfigHome = System.getenv("HOME") +
++                                                  "/.config";
++                    String xdgConfigHomeEnvVar = "XDG_CONFIG_HOME";
++                    String xdgConfigDir;
++
++                    String xdgSetConfigDir = System.getenv(xdgConfigHomeEnvVar);
++
++                    if (xdgSetConfigDir == null)
++                        xdgConfigDir = xdgDefaultConfigHome;
++                    else
++                        xdgConfigDir = xdgSetConfigDir;
++
++                    userRootDir = new File(xdgConfigDir, "java/userPrefs");
++                } else {
++                    userRootDir =
++                        new File(System.getProperty("java.util.prefs.userRoot",
++                        System.getProperty("user.home")), ".java/.userPrefs");
++                }
+                 // Attempt to create root dir if it does not yet exist.
+                 if (!userRootDir.exists()) {
+                     if (userRootDir.mkdirs()) {