From 38dec386ac0822f28cb87a492794294b2b8ea267 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Thu, 17 Jun 2021 00:28:23 +0000 Subject: [PATCH] extra/java-openjdk to 16.0.1.u9-1 --- extra/java-openjdk/PKGBUILD | 27 ++++++++++--------- 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, 33 insertions(+), 32 deletions(-) diff --git a/extra/java-openjdk/PKGBUILD b/extra/java-openjdk/PKGBUILD index 1d65e1057..fba2597e7 100644 --- a/extra/java-openjdk/PKGBUILD +++ b/extra/java-openjdk/PKGBUILD @@ -21,13 +21,13 @@ pkgbase=java-openjdk pkgname=('jre-openjdk-headless' 'jre-openjdk' 'jdk-openjdk' 'openjdk-src') -_majorver=15 +_majorver=16 _minorver=0 -_securityver=3 -_updatever=3 +_securityver=1 +_updatever=9 pkgrel=1 pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever} -_hg_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever} +_git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever} arch=('x86_64') url='https://openjdk.java.net/' license=('custom') @@ -35,14 +35,14 @@ makedepends=('java-environment>=11' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'lib 'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib' 'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2' 'libnet' 'bash' 'harfbuzz' 'gcc-libs' 'glibc') -source=(https://hg.openjdk.java.net/jdk-updates/jdk${_majorver}u/archive/${_hg_tag}.tar.gz +source=(https://github.com/openjdk/jdk${_majorver}u/archive/${_git_tag}.tar.gz freedesktop-java.desktop freedesktop-jconsole.desktop freedesktop-jshell.desktop) -sha256sums=('4bbd7a73354a2d244c7a075406339aa0ce4c5fc6be91a795af931f6dc95d067c' - '30b38fcbf1fcab6b33aea2e6d82e611f7d0ea974d1d11a87a262f598ba006fd9' - '971a71d0a80d6e5e47d5ea722b723088e86425a943a5c3615da95417c8f5aca2' - '77e45ece92bc9b0c638f5468c2050cc1dc4508308ec302e6910e793be97687ac') +sha256sums=('3b3aca61fe2834322e51636d99bcd09c4abba7d8a2cde231dbcbcbdedf829baf' + '11150daae08fff25309dcc060c07cd056181644d2b563c22668b98e306e8f2db' + 'c0673d680cc728af88bec89275f0a8e2199d52e48b5c5b0aa2d921bedbc2e12f' + '0cdf3dc10a64c5e589e655276189422b60a6b3294539164a6f29123d6b2046c7') case "${CARCH}" in x86_64) _JARCH='x86_64';; @@ -52,7 +52,7 @@ case "${CARCH}" in esac _jvmdir=/usr/lib/jvm/java-${_majorver}-openjdk -_jdkdir=jdk${_majorver}u-${_hg_tag} +_jdkdir=jdk${_majorver}u-${_git_tag//+/-} if [[ $CARCH == "arm" ]]; then _imgdir=${_jdkdir}/build/linux-${_JARCH}-zero-release/images else @@ -93,7 +93,7 @@ build() { # --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 + # See also paragraph "Configure Control Variables from "jdk${_majorver}-${_git_tag}/common/doc/building.md unset CFLAGS unset CXXFLAGS unset LDFLAGS @@ -117,6 +117,7 @@ build() { --with-libpng=system \ --with-lcms=system \ --with-zlib=system \ + --with-harfbuzz=system \ --enable-unlimited-crypto \ --disable-warnings-as-errors \ --with-jvm-variants=$_variants \ @@ -130,7 +131,7 @@ build() { } check() { - cd jdk${_majorver}u-${_hg_tag} + cd ${_jdkdir} # TODO package jtreg # make -k check } @@ -265,7 +266,7 @@ package_jdk-openjdk() { # 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" \ + "${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 diff --git a/extra/java-openjdk/freedesktop-java.desktop b/extra/java-openjdk/freedesktop-java.desktop index ea3bc1463..5921f1c7a 100644 --- a/extra/java-openjdk/freedesktop-java.desktop +++ b/extra/java-openjdk/freedesktop-java.desktop @@ -1,12 +1,12 @@ [Desktop Entry] -Name=OpenJDK Java 15 Runtime -Name[fi]=OpenJDK Java 15 - ajonaikainen ympäristö -Comment=OpenJDK Java 15 Runtime -Comment[fi]=OpenJDK Java 15 - ajonaikainen ympäristö +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ö Keywords=java;runtime -Exec=/usr/lib/jvm/java-15-openjdk/bin/java -jar +Exec=/usr/lib/jvm/java-16-openjdk/bin/java -jar Terminal=false Type=Application -Icon=java15-openjdk +Icon=java16-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 7a70f38a6..d54700843 100644 --- a/extra/java-openjdk/freedesktop-jconsole.desktop +++ b/extra/java-openjdk/freedesktop-jconsole.desktop @@ -1,11 +1,11 @@ [Desktop Entry] -Name=OpenJDK Java 15 Console -Name[fi]=OpenJDK Java 15 - konsoli -Comment=OpenJDK Java 15 Monitoring & Management Console -Comment[fi]=OpenJDK Java 15 - valvonta- ja hallintakonsoli +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 Keywords=java;console;monitoring -Exec=/usr/lib/jvm/java-15-openjdk/bin/jconsole +Exec=/usr/lib/jvm/java-16-openjdk/bin/jconsole Terminal=false Type=Application -Icon=java15-openjdk +Icon=java16-openjdk Categories=Application;System; diff --git a/extra/java-openjdk/freedesktop-jshell.desktop b/extra/java-openjdk/freedesktop-jshell.desktop index f64f79d60..44d21dd1d 100644 --- a/extra/java-openjdk/freedesktop-jshell.desktop +++ b/extra/java-openjdk/freedesktop-jshell.desktop @@ -1,9 +1,9 @@ [Desktop Entry] -Name=OpenJDK Java 15 Shell -Comment=OpenJDK Java 15 Shell +Name=OpenJDK Java 16 Shell +Comment=OpenJDK Java 16 Shell Keywords=java;shell -Exec=/usr/lib/jvm/java-15-openjdk/bin/jshell +Exec=/usr/lib/jvm/java-16-openjdk/bin/jshell Terminal=true Type=Application -Icon=java15-openjdk +Icon=java16-openjdk Categories=Application;System; diff --git a/extra/java-openjdk/install_jdk-openjdk.sh b/extra/java-openjdk/install_jdk-openjdk.sh index 154be958a..ec0766d83 100644 --- a/extra/java-openjdk/install_jdk-openjdk.sh +++ b/extra/java-openjdk/install_jdk-openjdk.sh @@ -1,4 +1,4 @@ -THIS_JDK='java-15-openjdk' +THIS_JDK='java-16-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 4c0bcdb84..04a134c19 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-15-openjdk' +THIS_JRE='java-16-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 c55c4aef5..5bb36b3e7 100644 --- a/extra/java-openjdk/install_jre-openjdk.sh +++ b/extra/java-openjdk/install_jre-openjdk.sh @@ -1,4 +1,4 @@ -THIS_JRE='java-15-openjdk' +THIS_JRE='java-16-openjdk' fix_default() { if [ ! -x /usr/bin/java ]; then