[arch-commits] Commit in java-openjdk/trunk (PKGBUILD)

[Felix Yan]

    Date: Friday, June 11, 2021 @ 21:37:17
  Author: felixonmars
Revision: 417981

upgpkg: java-openjdk 16.0.1.u9-1

Modified:
  java-openjdk/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-11 20:58:12 UTC (rev 417980)
+++ PKGBUILD	2021-06-11 21:37:17 UTC (rev 417981)
@@ -8,12 +8,10 @@
 _majorver=16
 _minorver=0
 _securityver=1
-_updatever=0
+_updatever=9
 pkgrel=1
-#pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
-pkgver=${_majorver}.${_minorver}.${_securityver}
-#_git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
-_git_tag=jdk-${_majorver}.${_minorver}.${_securityver}-ga
+pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
+_git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
 arch=('x86_64')
 url='https://openjdk.java.net/'
 license=('custom')
@@ -25,7 +23,7 @@
         freedesktop-java.desktop
         freedesktop-jconsole.desktop
         freedesktop-jshell.desktop)
-sha256sums=('ef53ef8796080a955efbfdbf05ea137ff95ac6d444dab3b2fcd57c9709a3b65d'
+sha256sums=('3b3aca61fe2834322e51636d99bcd09c4abba7d8a2cde231dbcbcbdedf829baf'
             '11150daae08fff25309dcc060c07cd056181644d2b563c22668b98e306e8f2db'
             'c0673d680cc728af88bec89275f0a8e2199d52e48b5c5b0aa2d921bedbc2e12f'
             '0cdf3dc10a64c5e589e655276189422b60a6b3294539164a6f29123d6b2046c7')
@@ -36,7 +34,7 @@
 esac
 
 _jvmdir=/usr/lib/jvm/java-${_majorver}-openjdk
-_jdkdir=jdk${_majorver}u-${_git_tag}
+_jdkdir=jdk${_majorver}u-${_git_tag//+/-}
 _imgdir=${_jdkdir}/build/linux-${_JARCH}-server-release/images
 
 _nonheadless=(lib/libawt_xawt.{so,debuginfo}
@@ -89,6 +87,7 @@
     --with-libpng=system \
     --with-lcms=system \
     --with-zlib=system \
+    --with-harfbuzz=system \
     --with-jvm-features=zgc \
     --enable-unlimited-crypto \
     --disable-warnings-as-errors \
@@ -102,7 +101,7 @@
 }
 
 check() {
-  cd jdk${_majorver}u-${_git_tag}
+  cd ${_jdkdir}
   # TODO package jtreg
   # make -k check
 }
@@ -237,7 +236,7 @@
   # Icons
   for s in 16 24 32 48; do
     install -Dm 644 \
-      "${srcdir}/jdk${_majorver}u-${_git_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