diff options
author | Burgess Chang | 2022-06-05 11:35:42 +0800 |
---|---|---|
committer | Burgess Chang | 2022-06-05 11:35:42 +0800 |
commit | 5efa0b825909ac942671f4f748032aa8216f20ca (patch) | |
tree | fc82902031537f6435dd783b18ce023131bcbf95 | |
download | aur-5efa0b825909ac942671f4f748032aa8216f20ca.tar.gz |
Initial commit
Signed-off-by: Burgess Chang <bsc@brsvh.org>
-rw-r--r-- | .SRCINFO | 112 | ||||
-rw-r--r-- | PKGBUILD | 363 | ||||
-rw-r--r-- | jdk-jbr-xdg.install | 58 | ||||
-rw-r--r-- | jre-jbr-xdg-headless.install | 56 | ||||
-rw-r--r-- | jre-jbr-xdg.install | 40 | ||||
-rw-r--r-- | xdg-user-directories-compliant.patch | 70 |
6 files changed, 699 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..a68322285d2a --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,112 @@ +pkgbase = java-jbr-xdg + pkgver = 17.0.3.0.b463.3 + pkgrel = 1 + url = https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime + arch = x86_64 + license = custom + makedepends = alsa-lib + makedepends = bash + makedepends = cpio + makedepends = freetype2 + makedepends = giflib + makedepends = gcc-libs + makedepends = glibc + makedepends = graphviz + makedepends = harfbuzz + makedepends = java-environment>=10 + makedepends = java-environment<12 + makedepends = libcups + makedepends = libelf + makedepends = libjpeg-turbo + makedepends = libnet + makedepends = libpng + makedepends = libx11 + makedepends = libxrender + makedepends = libxt + makedepends = libxext + makedepends = libxrandr + makedepends = libxtst + makedepends = pandoc + makedepends = lcms2 + makedepends = unzip + makedepends = zip + options = !lto + source = https://github.com/JetBrains/JetBrainsRuntime/archive/refs/tags/jbr17.0.3b463.3.tar.gz + source = xdg-user-directories-compliant.patch + sha256sums = 311605e3a30367e455cf95d20bd1923ae9adec1acbe86199400ee778bca1ba04 + sha256sums = 09e6f320362ca0a0bd1ce380c9e89ea145131aa56a3f258607c6bd9ded586739 + +pkgname = jre-jbr-xdg-headless + pkgdesc = JetBrainsRuntime Java 17 headless runtime environment + install = jre-jbr-xdg-headless.install + depends = ca-certificates-utils + depends = freetype2 + depends = glibc + depends = gcc-libs + depends = harfbuzz + depends = java-runtime-common>=3 + depends = libjpeg-turbo + depends = lcms2 + depends = libnet + depends = nss + depends = libfreetype.so + depends = libharfbuzz.so + depends = libjpeg.so + depends = liblcms2.so + optdepends = java-rhino: for some JavaScript support + provides = java-runtime-headless=17 + provides = java-runtime-headless-jbr-xdg=17 + provides = jre17-jbr-xdg-headless=17.0.3.0.b463.3-1 + backup = etc/java-jbr-xdg/logging.properties + backup = etc/java-jbr-xdg/management/jmxremote.access + backup = etc/java-jbr-xdg/management/jmxremote.password.template + backup = etc/java-jbr-xdg/management/management.properties + backup = etc/java-jbr-xdg/net.properties + backup = etc/java-jbr-xdg/security/java.policy + backup = etc/java-jbr-xdg/security/java.security + backup = etc/java-jbr-xdg/security/policy/README.txt + backup = etc/java-jbr-xdg/security/policy/limited/default_US_export.policy + backup = etc/java-jbr-xdg/security/policy/limited/default_local.policy + backup = etc/java-jbr-xdg/security/policy/limited/exempt_local.policy + backup = etc/java-jbr-xdg/security/policy/unlimited/default_US_export.policy + backup = etc/java-jbr-xdg/security/policy/unlimited/default_local.policy + backup = etc/java-jbr-xdg/sound.properties + +pkgname = jre-jbr-xdg + pkgdesc = JetBrainsRuntime Java 17 full runtime environment + install = jre-jbr-xdg.install + depends = gcc-libs + depends = giflib + depends = glibc + depends = jre17-jbr-xdg-headless=17.0.3.0.b463.3-1 + depends = libpng + depends = libgif.so + 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-jbr-xdg=17 + provides = jre17-jbr-xdg=17.0.3.0.b463.3-1 + +pkgname = jdk-jbr-xdg + pkgdesc = JetBrainsRuntime Java 17 development kit + install = jdk-jbr-xdg.install + depends = glibc + depends = gcc-libs + depends = hicolor-icon-theme + depends = jre17-jbr-xdg=17.0.3.0.b463.3-1 + depends = java-environment-common=3 + depends = libelf + provides = java-environment=17 + provides = java-environment-jbr-xdg=17 + provides = jdk17-jbr-xdg=17.0.3.0.b463.3-1 + +pkgname = jbr-xdg-src + pkgdesc = JetBrainsRuntime Java 17 sources + depends = jdk17-jbr-xdg=17.0.3.0.b463.3-1 + provides = jbr17-xdg-src=17.0.3.0.b463.3-1 + +pkgname = jbr-xdg-doc + pkgdesc = JetBrainsRuntime Java 17 documentation + depends = jdk17-jbr-xdg=17.0.3.0.b463.3-1 + provides = jbr17-xdg-doc=17.0.3.0.b463.3-1 diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..7f9447d29c52 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,363 @@ +# Maintainer: Burgess Chang<bsc@brsvh.org> +# Contributor: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Contributor: Frederik Schwan <freswa at archlinux dot org> +# Contributor: Guillaume ALAUX <guillaume@archlinux.org> + +_majorver=17 +_minorver=0 +_securityver=3 +_updatever=0 +_cyclever=463 +_ver=3 + +if [ $_updatever -eq 0 ]; then + _git_tag=${_majorver}.${_minorver}.${_securityver}b${_cyclever}.${_ver} +else + _git_tag=${_majorver}.${_minorver}.${_securityver}.${_updatever}b${_cyclever}.${_ver} +fi + +pkgbase=java-jbr-xdg +pkgname=( + 'jre-jbr-xdg-headless' + 'jre-jbr-xdg' + 'jdk-jbr-xdg' + 'jbr-xdg-src' + 'jbr-xdg-doc' +) +pkgver=$_majorver.$_minorver.$_securityver.$_updatever.b$_cyclever.$_ver +pkgrel=1 +arch=('x86_64') +url="https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime" +license=('custom') + +makedepends=( + 'alsa-lib' + 'bash' + 'cpio' + 'freetype2' + 'giflib' + 'gcc-libs' + 'glibc' + 'graphviz' + 'harfbuzz' + 'java-environment>=10' + 'java-environment<12' + 'libcups' + 'libelf' + 'libjpeg-turbo' + 'libnet' + 'libpng' + 'libx11' + 'libxrender' + 'libxt' + 'libxext' + 'libxrandr' + 'libxtst' + 'pandoc' + 'lcms2' + 'unzip' + 'zip' +) +options=(!lto) +source=( + https://github.com/JetBrains/JetBrainsRuntime/archive/refs/tags/jbr${_git_tag}.tar.gz + xdg-user-directories-compliant.patch +) + +sha256sums=( + '311605e3a30367e455cf95d20bd1923ae9adec1acbe86199400ee778bca1ba04' + '09e6f320362ca0a0bd1ce380c9e89ea145131aa56a3f258607c6bd9ded586739' +) + +case "${CARCH}" in + x86_64) _JARCH='x86_64';; + i686) _JARCH='x86';; +esac + +_jvmdir=/usr/lib/jvm/java-${_majorver}-jbr-xdg +_jdkdir=JetBrainsRuntime-jbr${_git_tag} +_imgdir=${_jdkdir}/build/linux-${_JARCH}-normal-server-release/images + +_nonheadless=( + lib/libawt_xawt.{so,debuginfo} + lib/libjawt.{so,debuginfo} + lib/libjsound.{so,debuginfo} + lib/libsplashscreen.{so,debuginfo} +) + +prepare() { + cd ${_jdkdir} + patch -p1 -i ../xdg-user-directories-compliant.patch +} + +build() { + cd ${_jdkdir} + + NUM_PROC_OPT='' + MAKEFLAG_J=$(echo ${MAKEFLAGS} | sed -En 's/.*-j([0-9]+).*/\1/p') + if [ -n "${MAKEFLAG_J}" ]; then + # http://hg.openjdk.java.net/jdk10/jdk10/file/85e6cb013b98/make/InitSupport.gmk#l105 + echo "Removing '-j${MAKEFLAG_J}' from MAKEFLAGS to prevent build fail. Passing it directly to ./configure." + export MAKEFLAGS=${MAKEFLAGS/-j${MAKEFLAG_J}/} + NUM_PROC_OPT="--with-num-cores=${MAKEFLAG_J}" + fi + + # Avoid optimization of HotSpot being lowered from O3 to O2 + local _CFLAGS="${CFLAGS//-O2/-O3} ${CPPFLAGS} -fcommon" + local _CXXFLAGS="${CXXFLAGS//-O2/-O3} ${CPPFLAGS} -fcommon" + local _LDFLAGS=${LDFLAGS} + if [[ ${CARCH} = i686 ]]; then + echo "Removing '-fno-plt' from CFLAGS and CXXFLAGS to prevent build fail with this architecture" + _CFLAGS=${CFLAGS/-fno-plt/} + _CXXFLAGS=${CXXFLAGS/-fno-plt/} + fi + + # CFLAGS, CXXFLAGS and LDFLAGS are ignored as shown by a warning + # in the output of ./configure unless used like such: + # --with-extra-cflags="${CFLAGS}" + # --with-extra-cxxflags="${CXXFLAGS}" + # --with-extra-ldflags="${LDFLAGS}" + # See also paragraph "Configure Control Variables from "jdk${_majorver}-${_git_tag}/common/doc/building.md + unset CFLAGS + unset CXXFLAGS + unset LDFLAGS + + bash configure \ + --with-version-build="${_updatever}" \ + --with-version-pre="" \ + --with-version-opt="" \ + --with-stdc++lib=dynamic \ + --with-extra-cflags="${_CFLAGS}" \ + --with-extra-cxxflags="${_CXXFLAGS}" \ + --with-extra-ldflags="${_LDFLAGS}" \ + --with-libjpeg=system \ + --with-giflib=system \ + --with-libpng=system \ + --with-lcms=system \ + --with-zlib=system \ + --with-harfbuzz=system \ + --with-jvm-features=zgc \ + --enable-unlimited-crypto \ + --disable-warnings-as-errors \ + ${NUM_PROC_OPT} + #--disable-javac-server + + make images legacy-jre-image docs + + # https://bugs.openjdk.java.net/browse/JDK-8173610 + find "../${_imgdir}" -iname '*.so' -exec chmod +x {} \; +} + +check() { + cd ${_jdkdir} + # TODO package jtreg + # make -k check +} + +package_jre-jbr-xdg-headless() { + pkgdesc="JetBrainsRuntime Java ${_majorver} headless runtime environment" + depends=( + 'ca-certificates-utils' + 'freetype2' + 'glibc' + 'gcc-libs' + 'harfbuzz' + 'java-runtime-common>=3' + 'libjpeg-turbo' + 'lcms2' + 'libnet' + 'nss' + 'libfreetype.so' + 'libharfbuzz.so' + 'libjpeg.so' + 'liblcms2.so' + ) + optdepends=( + 'java-rhino: for some JavaScript support' + ) + provides=( + "java-runtime-headless=${_majorver}" + "java-runtime-headless-jbr-xdg=${_majorver}" + "jre${_majorver}-jbr-xdg-headless=${pkgver}-${pkgrel}" + ) + backup=( + etc/${pkgbase}/logging.properties + etc/${pkgbase}/management/jmxremote.access + etc/${pkgbase}/management/jmxremote.password.template + etc/${pkgbase}/management/management.properties + etc/${pkgbase}/net.properties + etc/${pkgbase}/security/java.policy + etc/${pkgbase}/security/java.security + etc/${pkgbase}/security/policy/README.txt + etc/${pkgbase}/security/policy/limited/default_US_export.policy + etc/${pkgbase}/security/policy/limited/default_local.policy + etc/${pkgbase}/security/policy/limited/exempt_local.policy + etc/${pkgbase}/security/policy/unlimited/default_US_export.policy + etc/${pkgbase}/security/policy/unlimited/default_local.policy + etc/${pkgbase}/sound.properties + ) + install=jre-jbr-xdg-headless.install + + cd ${_imgdir}/jre + + install -dm 755 "${pkgdir}${_jvmdir}" + + cp -a bin lib \ + "${pkgdir}${_jvmdir}" + + for f in "${_nonheadless[@]}"; do + rm "${pkgdir}${_jvmdir}/${f}" + done + + cp ../jdk/release "${pkgdir}${_jvmdir}" + cp ../jdk/lib/modules "${pkgdir}${_jvmdir}/lib" + + # Conf + install -dm 755 "${pkgdir}/etc" + cp -r conf "${pkgdir}/etc/${pkgbase}" + ln -s /etc/${pkgbase} "${pkgdir}/${_jvmdir}/conf" + + # Legal + install -dm 755 "${pkgdir}/usr/share/licenses" + cp -r legal "${pkgdir}/usr/share/licenses/${pkgbase}" + ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" + ln -s /usr/share/licenses/${pkgbase} "${pkgdir}/${_jvmdir}/legal" + + # Man pages + for f in man/man1/* man/ja/man1/*; do + install -Dm 644 "${f}" "${pkgdir}/usr/share/${f/\.1/-jbr-xdg${_majorver}.1}" + done + ln -s /usr/share/man "${pkgdir}/${_jvmdir}/man" + + # Link JKS keystore from ca-certificates-utils + rm -f "${pkgdir}${_jvmdir}/lib/security/cacerts" + ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/lib/security/cacerts" +} + +package_jre-jbr-xdg() { + pkgdesc="JetBrainsRuntime Java ${_majorver} full runtime environment" + depends=( + 'gcc-libs' + 'giflib' + 'glibc' + "jre${_majorver}-jbr-xdg-headless=${pkgver}-${pkgrel}" + 'libpng' + 'libgif.so' + ) + optdepends=( + 'alsa-lib: for basic sound support' + 'gtk2: for the Gtk+ 2 look and feel - desktop usage' + 'gtk3: for the Gtk+ 3 look and feel - desktop usage' + ) + provides=( + "java-runtime=${_majorver}" + "java-runtime-jbr-xdg=${_majorver}" + "jre${_majorver}-jbr-xdg=${pkgver}-${pkgrel}" + ) + install=jre-jbr-xdg.install + + cd ${_imgdir}/jre + + install -dm 755 "${pkgdir}${_jvmdir}" + + for f in "${_nonheadless[@]}"; do + install -Dm 644 ${f} "${pkgdir}${_jvmdir}/${f}" + done + + # Licenses + install -dm 755 "${pkgdir}/usr/share/licenses" + ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" +} + +package_jdk-jbr-xdg() { + pkgdesc="JetBrainsRuntime Java ${_majorver} development kit" + depends=( + 'glibc' + 'gcc-libs' + 'hicolor-icon-theme' + "jre${_majorver}-jbr-xdg=${pkgver}-${pkgrel}" + 'java-environment-common=3' + 'libelf' + ) + provides=( + "java-environment=${_majorver}" + "java-environment-jbr-xdg=${_majorver}" + "jdk${_majorver}-jbr-xdg=${pkgver}-${pkgrel}" + ) + install=jdk-jbr-xdg.install + + cd ${_imgdir}/jdk + + install -dm 755 "${pkgdir}${_jvmdir}" + + cp -a bin demo include jmods lib \ + "${pkgdir}${_jvmdir}" + + rm "${pkgdir}${_jvmdir}/lib/src.zip" + + # Remove files held by JRE + pushd ../jre + for d in bin lib; do + find ${d} ! -type d -exec rm "${pkgdir}${_jvmdir}/{}" \; + done + popd + find "${pkgdir}${_jvmdir}/lib" -type d -empty -delete + + # Conf files all belong to JRE + + # Legal + install -dm 755 "${pkgdir}/usr/share/licenses" + cp -r legal "${pkgdir}/usr/share/licenses/${pkgbase}" + pushd ../jre/legal + find . ! -type d -exec rm "${pkgdir}/usr/share/licenses/${pkgbase}/{}" \; + popd + find "${pkgdir}/usr/share/licenses" -type d -empty -delete + ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" + + # Man pages + for f in man/man1/* man/ja/man1/*; do + if [ ! -e "../jre/${f}" ]; then + install -Dm 644 "${f}" "${pkgdir}/usr/share/${f/\.1/-jbr-xdg${_majorver}.1}" + fi + done + + # Icons + for s in 16 24 32 48; do + install -Dm 644 \ + "${srcdir}/${_jdkdir}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png" \ + "${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/${pkgbase}.png" + done +} + +package_jbr-xdg-src() { + pkgdesc="JetBrainsRuntime Java ${_majorver} sources" + # Depends on JDK to get license files + depends=("jdk${_majorver}-jbr-xdg=${pkgver}-${pkgrel}") + provides=("jbr${_majorver}-xdg-src=${pkgver}-${pkgrel}") + + install -Dm 644 -t "${pkgdir}${_jvmdir}/lib" ${_imgdir}/jdk/lib/src.zip + + install -dm 755 "${pkgdir}/usr/share/licenses" + ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" +} + +package_jbr-xdg-doc() { + pkgdesc="JetBrainsRuntime Java ${_majorver} documentation" + # Depends on JDK to get license files + depends=("jdk${_majorver}-jbr-xdg=${pkgver}-${pkgrel}") + provides=("jbr${_majorver}-xdg-doc=${pkgver}-${pkgrel}") + + install -dm 755 "${pkgdir}/usr/share/doc" + cp -r ${_imgdir}/docs "${pkgdir}/usr/share/doc/${pkgbase}" + + install -dm 755 "${pkgdir}/usr/share/licenses" + ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" +} + +# Local Variables: +# indent-tabs-mode: nil +# mode: sh +# sh-shell: bash +# tab-width: 4 +# End: +# vim: filetype=bash tabstop=4 shiftwidth=4 expandtab: diff --git a/jdk-jbr-xdg.install b/jdk-jbr-xdg.install new file mode 100644 index 000000000000..9a2f3c509542 --- /dev/null +++ b/jdk-jbr-xdg.install @@ -0,0 +1,58 @@ +THIS_JDK='java-jbr' + +fix_default() { + if [ ! -x /usr/bin/java ]; then + /usr/bin/archlinux-java unset + echo "" + else + /usr/bin/archlinux-java get + fi +} + +post_install() { + default=$(fix_default) + case ${default} in + "") + /usr/bin/archlinux-java set ${THIS_JDK} + ;; + ${THIS_JDK}) + # Nothing + ;; + *) + echo "Default Java environment is already set to '${default}'" + echo "See 'archlinux-java help' to change it" + ;; + esac + + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + /usr/bin/update-ca-trust + fi +} + +post_upgrade() { + default=$(fix_default) + if [ -z "${default}" ]; then + /usr/bin/archlinux-java set ${THIS_JDK} + fi + + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + /usr/bin/update-ca-trust + fi +} + +pre_remove() { + if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then + # Check JRE is still available + if [ -x /usr/lib/jvm/${THIS_JDK}/bin/java ]; then + /usr/bin/archlinux-java unset + fi + fi +} + +# Local Variables: +# indent-tabs-mode: nil +# mode: sh +# sh-shell: bash +# tab-width: 4 +# End: +# vim: filetype=bash tabstop=4 shiftwidth=4 expandtab: diff --git a/jre-jbr-xdg-headless.install b/jre-jbr-xdg-headless.install new file mode 100644 index 000000000000..abdd9cb6e42d --- /dev/null +++ b/jre-jbr-xdg-headless.install @@ -0,0 +1,56 @@ +THIS_JRE='java-jbr' + +fix_default() { + if [ ! -x /usr/bin/java ]; then + /usr/bin/archlinux-java unset + echo "" + else + /usr/bin/archlinux-java get + fi +} + +post_install() { + default=$(fix_default) + case ${default} in + "") + /usr/bin/archlinux-java set ${THIS_JRE} + ;; + ${THIS_JRE}) + # Nothing + ;; + *) + echo "Default Java environment is already set to '${default}'" + echo "See 'archlinux-java help' to change it" + ;; + esac + + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + /usr/bin/update-ca-trust + fi +} + +post_upgrade() { + if [ -z "$(fix_default)" ]; then + /usr/bin/archlinux-java set ${THIS_JRE} + fi + + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + /usr/bin/update-ca-trust + fi +} + +pre_remove() { + default=$(fix_default) + if [ "x${default}" = "x${THIS_JRE}" ]; then + /usr/bin/archlinux-java unset + echo "No Java environment is set as default anymore" + fi +} + +# Local Variables: +# indent-tabs-mode: nil +# mode: sh +# sh-shell: bash +# tab-width: 4 +# End: +# vim: filetype=bash tabstop=4 shiftwidth=4 expandtab: diff --git a/jre-jbr-xdg.install b/jre-jbr-xdg.install new file mode 100644 index 000000000000..f5009785e419 --- /dev/null +++ b/jre-jbr-xdg.install @@ -0,0 +1,40 @@ +THIS_JRE='java-jbr' + +fix_default() { + if [ ! -x /usr/bin/java ]; then + /usr/bin/archlinux-java unset + echo "" + else + /usr/bin/archlinux-java get + fi +} + +post_install() { + default=$(fix_default) + case ${default} in + "") + /usr/bin/archlinux-java set ${THIS_JRE} + ;; + ${THIS_JRE}) + # Nothing + ;; + *) + echo "Default Java environment is already set to '${default}'" + echo "See 'archlinux-java help' to change it" + ;; + esac +} + +post_upgrade() { + if [ -z "$(fix_default)" ]; then + /usr/bin/archlinux-java set ${THIS_JRE} + fi +} + +# Local Variables: +# indent-tabs-mode: nil +# mode: sh +# sh-shell: bash +# tab-width: 4 +# End: +# vim: filetype=bash tabstop=4 shiftwidth=4 expandtab: diff --git a/xdg-user-directories-compliant.patch b/xdg-user-directories-compliant.patch new file mode 100644 index 000000000000..fc5c3fd8137c --- /dev/null +++ b/xdg-user-directories-compliant.patch @@ -0,0 +1,70 @@ +diff -aru a/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java b/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java +--- a/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java 2022-06-05 11:19:08.427653868 +0800 ++++ b/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java 2022-06-05 11:21:39.300102583 +0800 +@@ -371,7 +371,28 @@ + String userDir = System.getProperty("user.home"); + String version = System.getProperty("java.version"); + String fs = File.separator; +- String dir = userDir+fs+".java"+fs+"fonts"+fs+version; ++ String dir; ++ /* On Linux systems, put the font config into ++ * ${XDG_CONFIG_HOME:-$HOME/.config}/java/fonts in order to follow ++ * the XDG Base Directory Specification. ++ */ ++ if (System.getProperty("os.name").equals("Linux")) { ++ /* assume homedir can be found, 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; ++ ++ dir = xdgConfigDir+"/java/fonts/"+version; ++ } else { ++ dir = userDir+fs+".java"+fs+"fonts"+fs+version; ++ } + Locale locale = SunToolkit.getStartupLocale(); + String lang = locale.getLanguage(); + String country = locale.getCountry(); +diff -aru a/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java b/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java +--- a/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java 2022-06-05 11:19:08.464321174 +0800 ++++ b/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java 2022-06-05 11:23:26.031650504 +0800 +@@ -121,9 +121,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()) { |