[arch-commits] Commit in java-openjdk/trunk (7 files)
Felix Yan
felixonmars at archlinux.org
Fri Jun 11 20:37:49 UTC 2021
Date: Friday, June 11, 2021 @ 20:37:48
Author: felixonmars
Revision: 417975
upgpkg: java-openjdk 16.0.1-1
Modified:
java-openjdk/trunk/PKGBUILD
java-openjdk/trunk/freedesktop-java.desktop
java-openjdk/trunk/freedesktop-jconsole.desktop
java-openjdk/trunk/freedesktop-jshell.desktop
java-openjdk/trunk/install_jdk-openjdk.sh
java-openjdk/trunk/install_jre-openjdk-headless.sh
java-openjdk/trunk/install_jre-openjdk.sh
---------------------------------+
PKGBUILD | 30 ++++++++++++++++--------------
freedesktop-java.desktop | 12 ++++++------
freedesktop-jconsole.desktop | 12 ++++++------
freedesktop-jshell.desktop | 8 ++++----
install_jdk-openjdk.sh | 2 +-
install_jre-openjdk-headless.sh | 2 +-
install_jre-openjdk.sh | 2 +-
7 files changed, 35 insertions(+), 33 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-06-11 19:59:09 UTC (rev 417974)
+++ PKGBUILD 2021-06-11 20:37:48 UTC (rev 417975)
@@ -5,13 +5,15 @@
pkgbase=java-openjdk
pkgname=('jre-openjdk-headless' 'jre-openjdk' 'jdk-openjdk' 'openjdk-src' 'openjdk-doc')
-_majorver=15
+_majorver=16
_minorver=0
-_securityver=3
-_updatever=3
+_securityver=1
+_updatever=0
pkgrel=1
-pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
-_hg_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
+#pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
+pkgver=${_majorver}.${_minorver}.${_securityver}
+#_git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
+_git_tag=jdk-${_majorver}.${_minorver}.${_securityver}-ga
arch=('x86_64')
url='https://openjdk.java.net/'
license=('custom')
@@ -19,14 +21,14 @@
'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib' 'pandoc'
'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=('ef53ef8796080a955efbfdbf05ea137ff95ac6d444dab3b2fcd57c9709a3b65d'
+ '11150daae08fff25309dcc060c07cd056181644d2b563c22668b98e306e8f2db'
+ 'c0673d680cc728af88bec89275f0a8e2199d52e48b5c5b0aa2d921bedbc2e12f'
+ '0cdf3dc10a64c5e589e655276189422b60a6b3294539164a6f29123d6b2046c7')
case "${CARCH}" in
x86_64) _JARCH='x86_64';;
@@ -34,7 +36,7 @@
esac
_jvmdir=/usr/lib/jvm/java-${_majorver}-openjdk
-_jdkdir=jdk${_majorver}u-${_hg_tag}
+_jdkdir=jdk${_majorver}u-${_git_tag}
_imgdir=${_jdkdir}/build/linux-${_JARCH}-server-release/images
_nonheadless=(lib/libawt_xawt.{so,debuginfo}
@@ -69,7 +71,7 @@
# --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
@@ -100,7 +102,7 @@
}
check() {
- cd jdk${_majorver}u-${_hg_tag}
+ cd jdk${_majorver}u-${_git_tag}
# TODO package jtreg
# make -k check
}
@@ -235,7 +237,7 @@
# 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}/jdk${_majorver}u-${_git_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
Modified: freedesktop-java.desktop
===================================================================
--- freedesktop-java.desktop 2021-06-11 19:59:09 UTC (rev 417974)
+++ freedesktop-java.desktop 2021-06-11 20:37:48 UTC (rev 417975)
@@ -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
Modified: freedesktop-jconsole.desktop
===================================================================
--- freedesktop-jconsole.desktop 2021-06-11 19:59:09 UTC (rev 417974)
+++ freedesktop-jconsole.desktop 2021-06-11 20:37:48 UTC (rev 417975)
@@ -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;
Modified: freedesktop-jshell.desktop
===================================================================
--- freedesktop-jshell.desktop 2021-06-11 19:59:09 UTC (rev 417974)
+++ freedesktop-jshell.desktop 2021-06-11 20:37:48 UTC (rev 417975)
@@ -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;
Modified: install_jdk-openjdk.sh
===================================================================
--- install_jdk-openjdk.sh 2021-06-11 19:59:09 UTC (rev 417974)
+++ install_jdk-openjdk.sh 2021-06-11 20:37:48 UTC (rev 417975)
@@ -1,4 +1,4 @@
-THIS_JDK='java-15-openjdk'
+THIS_JDK='java-16-openjdk'
fix_default() {
if [ ! -x /usr/bin/java ]; then
Modified: install_jre-openjdk-headless.sh
===================================================================
--- install_jre-openjdk-headless.sh 2021-06-11 19:59:09 UTC (rev 417974)
+++ install_jre-openjdk-headless.sh 2021-06-11 20:37:48 UTC (rev 417975)
@@ -1,4 +1,4 @@
-THIS_JRE='java-15-openjdk'
+THIS_JRE='java-16-openjdk'
fix_default() {
if [ ! -x /usr/bin/java ]; then
Modified: install_jre-openjdk.sh
===================================================================
--- install_jre-openjdk.sh 2021-06-11 19:59:09 UTC (rev 417974)
+++ install_jre-openjdk.sh 2021-06-11 20:37:48 UTC (rev 417975)
@@ -1,4 +1,4 @@
-THIS_JRE='java-15-openjdk'
+THIS_JRE='java-16-openjdk'
fix_default() {
if [ ! -x /usr/bin/java ]; then
More information about the arch-commits
mailing list