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

[Felix Yan]

    Date: Wednesday, July 21, 2021 @ 08:37:18
  Author: felixonmars
Revision: 420244

upgpkg: java11-openjdk 11.0.12.u7-1

Modified:
  java11-openjdk/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-21 07:43:14 UTC (rev 420243)
+++ PKGBUILD	2021-07-21 08:37:18 UTC (rev 420244)
@@ -15,11 +15,11 @@
 pkgname=('jre11-openjdk-headless' 'jre11-openjdk' 'jdk11-openjdk' 'openjdk11-src' 'openjdk11-doc')
 _majorver=11
 _minorver=0
-_securityver=11
-_updatever=9
+_securityver=12
+_updatever=7
 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')
@@ -27,11 +27,11 @@
              'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib' 'pandoc'
              'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2'
              'libnet' 'bash' 'harfbuzz' 'glibc' 'gcc-libs')
-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=('c8b9d92028f6e46d94bde65ebce3b593fdcc0d1ca1fa00482f38815ed37c92a1'
+sha256sums=('9a37c9641b45f5c51fe19c1ccae141daeb5dcdbd59fa2f56e7dea7bf09484bec'
             '575587ad58dfa9908f046d307b9afc7b0b2eb20a1eb454f8fdbbd539ea7b3d01'
             '2f57b7c7dd671eabe9fa10c4f1283573e99d7f7c36eccd82c95b705979a2e8cb'
             'f271618a8c2a892b554caf26857af41efdf0d8bcb95d57ce7ba535d6979e96da')
@@ -42,7 +42,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}-normal-server-release/images
 
 _nonheadless=(lib/libawt_xawt.{so,debuginfo}
@@ -77,7 +77,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
@@ -109,7 +109,7 @@
 }
 
 check() {
-  cd jdk${_majorver}u-${_hg_tag}
+  cd ${_jdkdir}
   # TODO package jtreg
   # make -k check
 }
@@ -241,7 +241,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}/${_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