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

[Levente Polyak]

    Date: Wednesday, April 25, 2018 @ 23:37:51
  Author: anthraxx
Revision: 323013

upgpkg: java10-openjdk 10.0.1.u10-1

Modified:
  java10-openjdk/trunk/PKGBUILD

----------+
 PKGBUILD |   28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-25 22:41:05 UTC (rev 323012)
+++ PKGBUILD	2018-04-25 23:37:51 UTC (rev 323013)
@@ -14,10 +14,12 @@
 pkgbase=java10-openjdk
 pkgname=('jre10-openjdk-headless' 'jre10-openjdk' 'jdk10-openjdk' 'openjdk10-src' 'openjdk10-doc')
 _majorver=10
-_updatever=46
+_minorver=0
+_securityver=1
+_updatever=10
 pkgrel=1
-pkgver=${_majorver}.u${_updatever}
-_hg_tag=jdk-${_majorver}+${_updatever}
+pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
+_hg_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
 arch=('x86_64')
 url='http://openjdk.java.net/'
 license=('custom')
@@ -25,12 +27,12 @@
              'libxrender' 'libxtst' 'libxt' 'libxext' 'alsa-lib' 'pandoc'
              'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2'
              'libnet' 'bash')
-source=(http://hg.openjdk.java.net/jdk/jdk${_majorver}/archive/${_hg_tag}.tar.gz
+source=(http://hg.openjdk.java.net/jdk-updates/jdk${_majorver}u/archive/${_hg_tag}.tar.gz
         freedesktop-java.desktop
         freedesktop-jconsole.desktop
         freedesktop-policytool.desktop
         freedesktop-jshell.desktop)
-sha256sums=('87d1ded2d911c4872494ab4fcbdc78042dedd7417edb7bf98725f02c1c63b2d8'
+sha256sums=('5ccebeaf3ed953468c2696364eb5bf41dd3cdb1f17e135f6f0c28d760bcde0b9'
             '819e6ca314641c3115566f9478fbd8671f5d884a3d4e65f05950b4bd2d3b8451'
             '5276edf203e5a75607c55b8bd4ae4f76cf61360811190286829c66d0c4b06554'
             '7f3bc3e424b6d8bac403eb336d81524680f347300c233400222a3850f937c659'
@@ -42,8 +44,8 @@
 esac
 
 _jvmdir=/usr/lib/jvm/java-${_majorver}-openjdk
-_jdkdir=jdk${_majorver}-${_hg_tag}
-_imgdir=${_jdkdir}/build/linux-$_JARCH-normal-server-release/images
+_jdkdir=jdk${_majorver}u-${_hg_tag}
+_imgdir=${_jdkdir}/build/linux-${_JARCH}-normal-server-release/images
 
 _nonheadless=(lib/libawt_xawt.so
               lib/libjawt.so
@@ -73,9 +75,9 @@
 
   # 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"
+  #  --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
@@ -233,7 +235,7 @@
   # Icons
   for s in 16 24 32 48; do
     install -Dm 644 \
-      "${srcdir}/jdk${_majorver}-${_hg_tag}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png" \
+      "${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
 
@@ -240,8 +242,8 @@
   # Desktop files
   for f in jconsole policytool java jshell; do
     install -Dm 644 \
-      "${srcdir}/freedesktop-$f.desktop" \
-      "${pkgdir}/usr/share/applications/$f-${pkgbase}.desktop"
+      "${srcdir}/freedesktop-${f}.desktop" \
+      "${pkgdir}/usr/share/applications/${f}-${pkgbase}.desktop"
   done
 }