From 0cfa4e510404052679eb8a20da7232c7c5268b0b Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 3 Feb 2018 16:08:33 +0000
Subject: [PATCH] extra/java9-openjdk to 9.0.4.u11-1

---
 extra/java9-openjdk/PKGBUILD | 42 +++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/extra/java9-openjdk/PKGBUILD b/extra/java9-openjdk/PKGBUILD
index f2ccdbf02..305b21aa8 100644
--- a/extra/java9-openjdk/PKGBUILD
+++ b/extra/java9-openjdk/PKGBUILD
@@ -4,7 +4,7 @@
 #  - drop pandoc makedepend
 #  - specify ARM _JARCH's
 #  - use zero on ARMv5, adjusted _imgdir
-#  - don't build odcs, removed docs package; takes a day to build
+#  - don't build docs, removed docs package; takes a day to build
 
 highmem=1
 
@@ -23,14 +23,16 @@ highmem=1
 
 pkgname=('jre9-openjdk-headless' 'jre9-openjdk' 'jdk9-openjdk' 'openjdk9-src')
 _majorver=9
-_updatever=181
+_minorver=0
+_securityver=4
+_updatever=11
 pkgbase=java$_majorver-openjdk
-pkgver=$_majorver.u$_updatever
-_hg_tag="jdk-$_majorver+$_updatever"
+pkgver=$_majorver.$_minorver.$_securityver.u$_updatever
+_hg_tag="jdk-$_majorver.$_minorver.$_securityver+$_updatever"
 _repo_ver=jdk$_java_ver.$_hg_tag
-pkgrel=4
+pkgrel=1
 _pkg_full_ver=$pkgver-$pkgrel
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='http://openjdk.java.net/'
 license=('custom')
 makedepends=('jdk8-openjdk' 'cpio' 'unzip' 'zip'
@@ -43,7 +45,7 @@ makedepends=('jdk8-openjdk' 'cpio' 'unzip' 'zip'
              # 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2' already pulled
              # 'bash' OpenJDK scripts are explicitly Bash
 checkdepends=()
-_url_src=http://hg.openjdk.java.net/jdk9/jdk9
+_url_src=http://hg.openjdk.java.net/jdk-updates/jdk9u
 source=("jdk9u-${_repo_ver}.tar.gz::$_url_src/archive/$_hg_tag.tar.gz"
         "corba-${_repo_ver}.tar.gz::$_url_src/corba/archive/$_hg_tag.tar.gz"
         "hotspot-${_repo_ver}.tar.gz::$_url_src/hotspot/archive/$_hg_tag.tar.gz"
@@ -55,14 +57,14 @@ source=("jdk9u-${_repo_ver}.tar.gz::$_url_src/archive/$_hg_tag.tar.gz"
         freedesktop-java.desktop
         freedesktop-jconsole.desktop
         freedesktop-policytool.desktop)
-sha256sums=('02fd41467add2e02e0a4e278c0a2d99a8e2d986b640b66745e23d18dc9e7f230'
-            '72c388d71e9610905a1b62e837fd8a277533766c1c47440c5af9c84f57337dbf'
-            '1a0e239643c0157b940f3e4a3c545d99d317ba8b28dfdcf5ed2fd49853905602'
-            'f963e67c791d96fc7e98126eff8fced4b6d457ea42174a4d51db74cc60cabdc9'
-            '7071612b0c3a8e270e90999606fc60b9499a6cc87c872dd6f2e7e4b7e415e34b'
-            '5c25d68928300df962ec5a339f8244542e701c79dd80fe04f72e0fa00d6ffc96'
-            'f7120270546c7e26a58edfe811005f78f4f90cbf7c35dbad459a516395cc45f1'
-            'd6b4f79182fda4abea7bb2c53181aa734a469772db1901c187dea8977885918a'
+sha256sums=('bd8f7d0a945cad70f6321300d1c67e1977104e5e55545cfa2bbac8dd1dc01af9'
+            '27092712fa9058f5242e39cee1e7b094b63af14ff373ba432135c0e2ba2fd9cc'
+            '50bbfdb27e2ec32cff994dfe2f5e0fca4af003c653ff64c894966ac1ee9864c4'
+            '3a9445d9a7d771276095394d7fe5dbdb904c1f32892eb15b96033d51ab856e18'
+            'b708aefda1b4ad5f81740e76fc1467cd4f0faaab0c5e73febb46d96ac8f883af'
+            'c2c74b04638a98995397bbbd1e0e1f2a709d71ed3fe5188d1fa13bd425604e3d'
+            '9e9f87c56af02682eb9426bf94487376090fcb431390e87cbf3a29036fc5cad8'
+            'c64c7c51fcca7c8f1dc4705842c1f2d8ad3479b78aa45b37f1dd6cd2ac39dd73'
             '85d32321fb59a89e4f9ab320060597d4ca9d5e23b995c61549a48b41ac908a67'
             'bf197deb003879ed01adc6973a2430a41574f638667a5ecfbb1aad1403897ddc'
             '9394de47b5c38826ab837145816667d96b697998bafec5dd132d39d4846ac70e')
@@ -74,11 +76,11 @@ case "$CARCH" in
   aarch64) _JARCH='aarch64';;
 esac
 
-_jvmdir=/usr/lib/jvm/java-$_majorver-openjdk
+_jdkdir=jdk${_majorver}u-$_hg_tag
 if [[ $CARCH == "arm" ]]; then
-  _imgdir=jdk$_majorver-$_hg_tag/build/linux-$_JARCH-normal-zero-release/images
+  _imgdir=$_jdkdir/build/linux-$_JARCH-normal-zero-release/images
 else
-  _imgdir=jdk$_majorver-$_hg_tag/build/linux-$_JARCH-normal-server-release/images
+  _imgdir=$_jdkdir/build/linux-$_JARCH-normal-server-release/images
 fi
 
 _nonheadless=(lib/libawt_xawt.{so,diz}
@@ -87,7 +89,7 @@ _nonheadless=(lib/libawt_xawt.{so,diz}
               lib/libsplashscreen.{so,diz})
 
 prepare() {
-  cd "jdk$_majorver-$_hg_tag"
+  cd $_jdkdir
   for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn
   do
     ln -s ../$subrepo-$_hg_tag $subrepo
@@ -95,7 +97,7 @@ prepare() {
 }
 
 build() {
-  cd "jdk$_majorver-$_hg_tag"
+  cd $_jdkdir
 
   NUM_PROC_OPT=''
   MAKEFLAG_J=$(echo $MAKEFLAGS | sed -En 's/.*-j([0-9]+).*/\1/p')