From d2b8b6da21dcee2b73832b972eb42f208da912f3 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 31 Mar 2024 02:16:08 +0000 Subject: [PATCH] removed extra/java10-openjdk --- extra/java10-openjdk/PKGBUILD | 279 ------------------ extra/java10-openjdk/freedesktop-java.desktop | 12 - .../freedesktop-jconsole.desktop | 11 - .../java10-openjdk/freedesktop-jshell.desktop | 9 - extra/java10-openjdk/install_jdk10-openjdk.sh | 50 ---- .../install_jre10-openjdk-headless.sh | 48 --- extra/java10-openjdk/install_jre10-openjdk.sh | 35 --- 7 files changed, 444 deletions(-) delete mode 100644 extra/java10-openjdk/PKGBUILD delete mode 100644 extra/java10-openjdk/freedesktop-java.desktop delete mode 100644 extra/java10-openjdk/freedesktop-jconsole.desktop delete mode 100644 extra/java10-openjdk/freedesktop-jshell.desktop delete mode 100644 extra/java10-openjdk/install_jdk10-openjdk.sh delete mode 100644 extra/java10-openjdk/install_jre10-openjdk-headless.sh delete mode 100644 extra/java10-openjdk/install_jre10-openjdk.sh diff --git a/extra/java10-openjdk/PKGBUILD b/extra/java10-openjdk/PKGBUILD deleted file mode 100644 index 17d4be836..000000000 --- a/extra/java10-openjdk/PKGBUILD +++ /dev/null @@ -1,279 +0,0 @@ -# Maintainer: Levente Polyak -# Maintainer: Guillaume ALAUX - -# ALARM: Kevin Mihelich -# - drop pandoc makedepend -# - specify ARM _JARCH's -# - use zero on ARMv5, adjusted _imgdir -# - don't build docs, removed docs package; takes a day to build -# - replace --with-num-cores with --with-jobs - -highmem=1 - -# TODO add test, see about packaging jtreg and using it here - -pkgbase=java10-openjdk -pkgname=('jre10-openjdk-headless' 'jre10-openjdk' 'jdk10-openjdk' 'openjdk10-src') -_majorver=10 -_minorver=0 -_securityver=2 -_updatever=13 -pkgrel=2 -pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever} -_hg_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever} -arch=('x86_64') -url='http://openjdk.java.net/' -license=('custom') -makedepends=('jdk10-openjdk' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'libx11' - 'libxrender' 'libxtst' 'libxt' 'libxext' 'alsa-lib' - 'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2' - 'libnet' 'bash') -source=(http://hg.openjdk.java.net/jdk-updates/jdk${_majorver}u/archive/${_hg_tag}.tar.gz - freedesktop-java.desktop - freedesktop-jconsole.desktop - freedesktop-jshell.desktop) -sha256sums=('f34a53b049f2e3ee8d954998687c4a48b56f24efbb2738ae7fe81bbbdff7f078' - '819e6ca314641c3115566f9478fbd8671f5d884a3d4e65f05950b4bd2d3b8451' - '5276edf203e5a75607c55b8bd4ae4f76cf61360811190286829c66d0c4b06554' - '0bcdb1eb9640775ca61e87ffeb9b0e0f99386b41f51fec753688bdd5ff9b6010') - -case "${CARCH}" in - x86_64) _JARCH='x86_64';; - i686) _JARCH='x86';; - arm*) _JARCH='arm';; - aarch64) _JARCH='aarch64';; -esac - -_jvmdir=/usr/lib/jvm/java-${_majorver}-openjdk -_jdkdir=jdk${_majorver}u-${_hg_tag} -if [[ $CARCH == "arm" ]]; then - _imgdir=${_jdkdir}/build/linux-${_JARCH}-normal-zero-release/images -else - _imgdir=${_jdkdir}/build/linux-${_JARCH}-normal-server-release/images -fi - -_nonheadless=(lib/libawt_xawt.so - lib/libjawt.so - lib/libjsoundalsa.so - lib/libsplashscreen.so) - -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-jobs=${MAKEFLAG_J}" - fi - - # Avoid optimization of HotSpot being lowered from O3 to O2 - local _CFLAGS="${CFLAGS//-O2/-O3} ${CPPFLAGS}" - local _CXXFLAGS="${CXXFLAGS//-O2/-O3} ${CPPFLAGS}" - 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}-${_hg_tag}/common/doc/building.md - unset CFLAGS - unset CXXFLAGS - unset LDFLAGS - - if [[ $CARCH == "arm" ]]; then - _variants='zero' - else - _variants='server' - fi - - 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 \ - --enable-unlimited-crypto \ - --disable-warnings-as-errors \ - --with-jvm-variants=$_variants \ - ${NUM_PROC_OPT} - #--disable-javac-server - - make images - - # https://bugs.openjdk.java.net/browse/JDK-8173610 - find "../${_imgdir}" -iname '*.so' -exec chmod +x {} \; -} - -check() { - cd ${_jdkdir} - #make -k check - #make run-test-tier1 -} - -package_jre10-openjdk-headless() { - pkgdesc="OpenJDK Java ${_majorver} headless runtime environment" - depends=('java-runtime-common>=3' 'ca-certificates-utils' 'nss' 'libjpeg-turbo' 'lcms2' 'libnet' 'freetype2') - optdepends=('java-rhino: for some JavaScript support') - provides=("java-runtime-headless=${_majorver}" "java-runtime-headless-openjdk=${_majorver}") - replaces=('jre9-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_jre10-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 man/man1/* man/ja/man1/*; do - install -Dm 644 "${f}" "${pkgdir}/usr/share/${f/\.1/-openjdk10.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_jre10-openjdk() { - pkgdesc="OpenJDK Java ${_majorver} full runtime environment" - depends=("jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}" 'giflib') - 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}") - replaces=('jre9-openjdk ') - install=install_jre10-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_jdk10-openjdk() { - pkgdesc="OpenJDK Java ${_majorver} development kit" - depends=("jre${_majorver}-openjdk=${pkgver}-${pkgrel}" 'java-environment-common=3' 'hicolor-icon-theme' 'libelf') - provides=("java-environment=${_majorver}" "java-environment-openjdk=${_majorver}") - replaces=('jdk9-openjdk') - install=install_jdk10-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 man/man1/* man/ja/man1/*; do - if [ ! -e "../jre/${f}" ]; then - install -Dm 644 "${f}" "${pkgdir}/usr/share/${f/\.1/-openjdk${_majorver}.1}" - fi - done - - # Icons - for s in 16 24 32 48; do - install -Dm 644 \ - "${srcdir}/jdk${_majorver}u-${_hg_tag}/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_openjdk10-src() { - pkgdesc="OpenJDK Java ${_majorver} sources" - # Depends on JDK to get license files - depends=("jdk${_majorver}-openjdk=${pkgver}-${pkgrel}") - replaces=('openjdk9-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}" -} - -# vim: ts=2 sw=2 et: diff --git a/extra/java10-openjdk/freedesktop-java.desktop b/extra/java10-openjdk/freedesktop-java.desktop deleted file mode 100644 index a84496eca..000000000 --- a/extra/java10-openjdk/freedesktop-java.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Name=OpenJDK Java 10 Runtime -Name[fi]=OpenJDK Java 10 - ajonaikainen ympäristö -Comment=OpenJDK Java 10 Runtime -Comment[fi]=OpenJDK Java 10 - ajonaikainen ympäristö -Keywords=java;runtime -Exec=/usr/lib/jvm/java-10-openjdk/bin/java -jar -Terminal=false -Type=Application -Icon=java10-openjdk -MimeType=application/x-java-archive;application/java-archive;application/x-jar; -NoDisplay=true diff --git a/extra/java10-openjdk/freedesktop-jconsole.desktop b/extra/java10-openjdk/freedesktop-jconsole.desktop deleted file mode 100644 index 50436a548..000000000 --- a/extra/java10-openjdk/freedesktop-jconsole.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=OpenJDK Java 10 Console -Name[fi]=OpenJDK Java 10 - konsoli -Comment=OpenJDK Java 10 Monitoring & Management Console -Comment[fi]=OpenJDK Java 10 - valvonta- ja hallintakonsoli -Keywords=java;console;monitoring -Exec=/usr/lib/jvm/java-10-openjdk/bin/jconsole -Terminal=false -Type=Application -Icon=java10-openjdk -Categories=Application;System; diff --git a/extra/java10-openjdk/freedesktop-jshell.desktop b/extra/java10-openjdk/freedesktop-jshell.desktop deleted file mode 100644 index a0cdd9005..000000000 --- a/extra/java10-openjdk/freedesktop-jshell.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=OpenJDK Java 10 Shell -Comment=OpenJDK Java 10 Shell -Keywords=java;shell -Exec=/usr/lib/jvm/java-10-openjdk/bin/jshell -Terminal=true -Type=Application -Icon=java10-openjdk -Categories=Application;System; diff --git a/extra/java10-openjdk/install_jdk10-openjdk.sh b/extra/java10-openjdk/install_jdk10-openjdk.sh deleted file mode 100644 index d931854c5..000000000 --- a/extra/java10-openjdk/install_jdk10-openjdk.sh +++ /dev/null @@ -1,50 +0,0 @@ -THIS_JDK='java-10-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 JRE10 is still available - if [ -x /usr/lib/jvm/${THIS_JDK}/bin/java ]; then - /usr/bin/archlinux-java unset - fi - fi -} diff --git a/extra/java10-openjdk/install_jre10-openjdk-headless.sh b/extra/java10-openjdk/install_jre10-openjdk-headless.sh deleted file mode 100644 index 1b02d7079..000000000 --- a/extra/java10-openjdk/install_jre10-openjdk-headless.sh +++ /dev/null @@ -1,48 +0,0 @@ -THIS_JRE='java-10-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/extra/java10-openjdk/install_jre10-openjdk.sh b/extra/java10-openjdk/install_jre10-openjdk.sh deleted file mode 100644 index 47003e56e..000000000 --- a/extra/java10-openjdk/install_jre10-openjdk.sh +++ /dev/null @@ -1,35 +0,0 @@ -THIS_JRE='java-10-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 -}