diff options
| -rw-r--r-- | .SRCINFO | 124 | ||||
| -rw-r--r-- | PKGBUILD | 306 | ||||
| -rw-r--r-- | freedesktop-java.desktop | 12 | ||||
| -rw-r--r-- | freedesktop-jconsole.desktop | 11 | ||||
| -rw-r--r-- | freedesktop-jshell.desktop | 9 | ||||
| -rw-r--r-- | install_jdk-openjdk.sh | 50 | ||||
| -rw-r--r-- | install_jre-openjdk-headless.sh | 48 | ||||
| -rw-r--r-- | install_jre-openjdk.sh | 35 | ||||
| -rw-r--r-- | xdg-basedir-compliant-fontconfig.patch | 35 | ||||
| -rw-r--r-- | xdg-basedir-compliant-userPrefs.patch | 38 |
10 files changed, 668 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..d03cf535d53b --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,124 @@ +pkgbase = java17-openjdk-xdg + pkgver = 17.0.6.u10 + pkgrel = 1 + url = https://openjdk.java.net/ + arch = x86_64 + license = custom + makedepends = java-environment>=11 + makedepends = cpio + makedepends = unzip + makedepends = zip + makedepends = libelf + makedepends = libcups + makedepends = libx11 + makedepends = libxrender + makedepends = libxtst + makedepends = libxt + makedepends = libxext + makedepends = libxrandr + makedepends = alsa-lib + makedepends = pandoc + makedepends = graphviz + makedepends = freetype2 + makedepends = libjpeg-turbo + makedepends = giflib + makedepends = libpng + makedepends = lcms2 + makedepends = libnet + makedepends = bash + makedepends = harfbuzz + makedepends = gcc-libs + makedepends = glibc + options = !lto + source = https://github.com/openjdk/jdk17u/archive/jdk-17.0.6+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 = 331bad1f80e98761eb9692863146fec647db573db5a5efa5b9bd6326d53a3472 + sha256sums = 85c4742764590783160af74587a47269e6797fbdf17ec485c7644bd239adf61d + sha256sums = abac1ab09a33a3654378bc69be5a7cf075263ab3ae9efec1eb25cf388e711bb7 + sha256sums = e7cce0ecf868f656d8dc2eb25ab82ab665526a0a28aba20f02632dd29962dac3 + sha256sums = a9bd9e8e4c7e57c16fac43b5fbd657f658654a30f9324013f9b47780c04b921c + sha256sums = ff160b5cb0ccc2843d2976a0b0f68b9ff7475d1999356561cbe4e53ae41d773d + +pkgname = jre17-openjdk-headless-xdg + pkgdesc = OpenJDK Java 17 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 + depends = nss + depends = libjpeg-turbo + depends = libjpeg.so + depends = lcms2 + depends = liblcms2.so + depends = libnet + depends = freetype2 + depends = libfreetype.so + depends = harfbuzz + depends = libharfbuzz.so + 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.6.u10-1 + conflicts = jre17-openjdk-headless + backup = etc/java17-openjdk-xdg/logging.properties + backup = etc/java17-openjdk-xdg/management/jmxremote.access + backup = etc/java17-openjdk-xdg/management/jmxremote.password.template + backup = etc/java17-openjdk-xdg/management/management.properties + backup = etc/java17-openjdk-xdg/net.properties + backup = etc/java17-openjdk-xdg/security/java.policy + backup = etc/java17-openjdk-xdg/security/java.security + backup = etc/java17-openjdk-xdg/security/policy/README.txt + backup = etc/java17-openjdk-xdg/security/policy/limited/default_US_export.policy + backup = etc/java17-openjdk-xdg/security/policy/limited/default_local.policy + backup = etc/java17-openjdk-xdg/security/policy/limited/exempt_local.policy + backup = etc/java17-openjdk-xdg/security/policy/unlimited/default_US_export.policy + backup = etc/java17-openjdk-xdg/security/policy/unlimited/default_local.policy + backup = etc/java17-openjdk-xdg/sound.properties + +pkgname = jre17-openjdk-xdg + pkgdesc = OpenJDK Java 17 full runtime environment - with improved Support for the XDG Base Directory Specification + install = install_jre-openjdk.sh + depends = jre17-openjdk-headless=17.0.6.u10-1 + depends = giflib + depends = libgif.so + depends = glibc + depends = gcc-libs + depends = libpng + 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.6.u10-1 + conflicts = jre17-openjdk + +pkgname = jdk17-openjdk-xdg + pkgdesc = OpenJDK Java 17 development kit - with improved Support for the XDG Base Directory Specification + install = install_jdk-openjdk.sh + depends = jre17-openjdk=17.0.6.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.6.u10-1 + conflicts = jdk17-openjdk + +pkgname = openjdk17-src-xdg + pkgdesc = OpenJDK Java 17 sources - with improved Support for the XDG Base Directory Specification + depends = jdk17-openjdk=17.0.6.u10-1 + provides = openjdk17-src=17.0.6.u10-1 + conflicts = openjdk17-src + +pkgname = openjdk17-doc-xdg + pkgdesc = OpenJDK Java 17 documentation - with improved Support for the XDG Base Directory Specification + depends = jdk17-openjdk=17.0.6.u10-1 + provides = openjdk17-doc=17.0.6.u10-1 + conflicts = openjdk17-doc diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..ea0991458d91 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,306 @@ +# Maintainer: 90 <hi@90.gripe> +# Maintainer: Noah Vogt (noahvogt) <noah@noahvogt.com> +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Maintainer: Frederik Schwan <freswa at archlinux dot org> +# Maintainer: Guillaume ALAUX <guillaume@archlinux.org> + +# TODO add test, see about packaging jtreg and using it here + +pkgbase=java17-openjdk-xdg +pkgname=('jre17-openjdk-headless-xdg' 'jre17-openjdk-xdg' 'jdk17-openjdk-xdg' 'openjdk17-src-xdg' 'openjdk17-doc-xdg') +_majorver=17 +_minorver=0 +_securityver=6 +_updatever=10 +pkgrel=1 +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') +makedepends=('java-environment>=11' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'libx11' + 'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib' 'pandoc' + 'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2' + 'libnet' 'bash' 'harfbuzz' 'gcc-libs' 'glibc') +options=(!lto) +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-userPrefs.patch) +sha256sums=('331bad1f80e98761eb9692863146fec647db573db5a5efa5b9bd6326d53a3472' + '85c4742764590783160af74587a47269e6797fbdf17ec485c7644bd239adf61d' + 'abac1ab09a33a3654378bc69be5a7cf075263ab3ae9efec1eb25cf388e711bb7' + 'e7cce0ecf868f656d8dc2eb25ab82ab665526a0a28aba20f02632dd29962dac3' + 'a9bd9e8e4c7e57c16fac43b5fbd657f658654a30f9324013f9b47780c04b921c' + 'ff160b5cb0ccc2843d2976a0b0f68b9ff7475d1999356561cbe4e53ae41d773d') + +case "${CARCH}" in + x86_64) _JARCH='x86_64';; + i686) _JARCH='x86';; +esac + +_jvmdir=/usr/lib/jvm/java-${_majorver}-openjdk +_jdkdir=jdk${_majorver}u-${_git_tag//+/-} +_imgdir=${_jdkdir}/build/linux-${_JARCH}-server-release/images + +_nonheadless=(lib/libawt_xawt.so + lib/libjawt.so + lib/libjsound.so + lib/libsplashscreen.so) + +prepare() { + cd ${_jdkdir} + patch -p1 -i "${srcdir}"/xdg-basedir-compliant-fontconfig.patch + patch -p1 -i "${srcdir}"/xdg-basedir-compliant-userPrefs.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 to be 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 + + # TODO: Should be rechecked for the next releases + # compiling with -fexceptions leads to: + # /usr/bin/ld: /build/java-openjdk/src/jdk17u-jdk-17.0.3-2/build/linux-x86_64-server-release/hotspot/variant-server/libjvm/objs/zPhysicalMemory.o: in function `ZList<ZMemory>::~ZList()': + # /build/java-openjdk/src/jdk17u-jdk-17.0.3-2/src/hotspot/share/gc/z/zList.hpp:54: undefined reference to `ZListNode<ZMemory>::~ZListNode()' + # collect2: error: ld returned 1 exit status + _CFLAGS=${CFLAGS/-fexceptions/} + _CXXFLAGS=${CXXFLAGS/-fexceptions/} + + # 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,shenandoahgc \ + --with-native-debug-symbols=internal \ + --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_jre17-openjdk-headless-xdg() { + pkgdesc="OpenJDK Java ${_majorver} headless runtime environment - with improved Support for the XDG Base Directory Specification" + depends=('java-runtime-common>=3' 'ca-certificates-utils' 'nss' 'libjpeg-turbo' 'libjpeg.so' + 'lcms2' 'liblcms2.so' 'libnet' 'freetype2' 'libfreetype.so' 'harfbuzz' 'libharfbuzz.so' + 'glibc' 'gcc-libs') + optdepends=('java-rhino: for some JavaScript support') + provides=("java-runtime-headless=${_majorver}" "java-runtime-headless-openjdk=${_majorver}" "jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}") + conflicts=("jre${_majorver}-openjdk-headless") + 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=install_jre-openjdk-headless.sh + + 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 bin/*; do + f=$(basename "${f}") + _man=../jdk/man/man1/"${f}.1" + test -f "${_man}" && install -Dm 644 "${_man}" "${pkgdir}/usr/share/man/man1/${f}-openjdk${_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_jre17-openjdk-xdg() { + pkgdesc="OpenJDK Java ${_majorver} full runtime environment - with improved Support for the XDG Base Directory Specification" + depends=("jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}" 'giflib' 'libgif.so' + 'glibc' 'gcc-libs' 'libpng') + 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-openjdk=${_majorver}" "jre${_majorver}-openjdk=${pkgver}-${pkgrel}") + conflicts=("jre${_majorver}-openjdk") + install=install_jre-openjdk.sh + + 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_jdk17-openjdk-xdg() { + pkgdesc="OpenJDK Java ${_majorver} development kit - with improved Support for the XDG Base Directory Specification" + depends=("jre${_majorver}-openjdk=${pkgver}-${pkgrel}" 'java-environment-common=3' + 'hicolor-icon-theme' 'libelf' 'glibc' 'gcc-libs') + provides=("java-environment=${_majorver}" "java-environment-openjdk=${_majorver}" "jdk${_majorver}-openjdk=${pkgver}-${pkgrel}") + conflicts=("jdk${_majorver}-openjdk") + install=install_jdk-openjdk.sh + + 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 bin/*; do + f=$(basename "${f}") + _man=man/man1/"${f}.1" + test -f "../jre/bin/${f}" && continue + test -f "${_man}" && install -Dm 644 "${_man}" "${pkgdir}/usr/share/man/man1/${f}-openjdk${_majorver}.1" + 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 + + # Desktop files + for f in jconsole java jshell; do + install -Dm 644 \ + "${srcdir}/freedesktop-${f}.desktop" \ + "${pkgdir}/usr/share/applications/${f}-${pkgbase}.desktop" + done +} + +package_openjdk17-src-xdg() { + pkgdesc="OpenJDK Java ${_majorver} sources - with improved Support for the XDG Base Directory Specification" + # Depends on JDK to get license files + depends=("jdk${_majorver}-openjdk=${pkgver}-${pkgrel}") + provides=("openjdk${_majorver}-src=${pkgver}-${pkgrel}") + conflicts=("openjdk${_majorver}-src") + + 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_openjdk17-doc-xdg() { + pkgdesc="OpenJDK Java ${_majorver} documentation - with improved Support for the XDG Base Directory Specification" + # Depends on JDK to get license files + depends=("jdk${_majorver}-openjdk=${pkgver}-${pkgrel}") + provides=("openjdk${_majorver}-doc=${pkgver}-${pkgrel}") + conflicts=("openjdk${_majorver}-doc") + + 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}" +} + +# vim: ts=2 sw=2 et: diff --git a/freedesktop-java.desktop b/freedesktop-java.desktop new file mode 100644 index 000000000000..c1b0110f115d --- /dev/null +++ b/freedesktop-java.desktop @@ -0,0 +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ö +Keywords=java;runtime +Exec=/usr/lib/jvm/java-17-openjdk/bin/java -jar +Terminal=false +Type=Application +Icon=java17-openjdk +MimeType=application/x-java-archive;application/java-archive;application/x-jar; +NoDisplay=true diff --git a/freedesktop-jconsole.desktop b/freedesktop-jconsole.desktop new file mode 100644 index 000000000000..c7a1469f1e01 --- /dev/null +++ b/freedesktop-jconsole.desktop @@ -0,0 +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 +Keywords=java;console;monitoring +Exec=/usr/lib/jvm/java-17-openjdk/bin/jconsole +Terminal=false +Type=Application +Icon=java17-openjdk +Categories=Application;System; diff --git a/freedesktop-jshell.desktop b/freedesktop-jshell.desktop new file mode 100644 index 000000000000..f02b1c2f29c9 --- /dev/null +++ b/freedesktop-jshell.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=OpenJDK Java 17 Shell +Comment=OpenJDK Java 17 Shell +Keywords=java;shell +Exec=/usr/lib/jvm/java-17-openjdk/bin/jshell +Terminal=true +Type=Application +Icon=java17-openjdk +Categories=Application;System; diff --git a/install_jdk-openjdk.sh b/install_jdk-openjdk.sh new file mode 100644 index 000000000000..27e746af39fc --- /dev/null +++ b/install_jdk-openjdk.sh @@ -0,0 +1,50 @@ +THIS_JDK='java-19-openjdk' + +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 +} diff --git a/install_jre-openjdk-headless.sh b/install_jre-openjdk-headless.sh new file mode 100644 index 000000000000..da50b9c5aae7 --- /dev/null +++ b/install_jre-openjdk-headless.sh @@ -0,0 +1,48 @@ +THIS_JRE='java-19-openjdk' + +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 +} diff --git a/install_jre-openjdk.sh b/install_jre-openjdk.sh new file mode 100644 index 000000000000..6bb9c4682a2a --- /dev/null +++ b/install_jre-openjdk.sh @@ -0,0 +1,35 @@ +THIS_JRE='java-19-openjdk' + +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 + + echo "when you use a non-reparenting window manager," + echo "set _JAVA_AWT_WM_NONREPARENTING=1 in /etc/profile.d/jre.sh" +} + +post_upgrade() { + if [ -z "$(fix_default)" ]; then + /usr/bin/archlinux-java set ${THIS_JRE} + fi +} diff --git a/xdg-basedir-compliant-fontconfig.patch b/xdg-basedir-compliant-fontconfig.patch new file mode 100644 index 000000000000..a553b1689bc6 --- /dev/null +++ b/xdg-basedir-compliant-fontconfig.patch @@ -0,0 +1,35 @@ +diff --git a/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java b/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java +index 0ea741c..53d1f4d 100644 +--- a/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java ++++ b/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java +@@ -368,7 +368,29 @@ public class FcFontConfiguration extends FontConfiguration { + 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 --git a/xdg-basedir-compliant-userPrefs.patch b/xdg-basedir-compliant-userPrefs.patch new file mode 100644 index 000000000000..d4ad0b1816b0 --- /dev/null +++ b/xdg-basedir-compliant-userPrefs.patch @@ -0,0 +1,38 @@ +diff --git a/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java b/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java +index b30a234..2618714 100644 +--- 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 @@ class FileSystemPreferences extends AbstractPreferences { + 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()) { |