align upstream with fedora

2 files changed, 51 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7df889d3730f..e85d5b600d81 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,5 @@
-# Generated by mksrcinfo v8
-# Fri May  3 08:55:45 UTC 2019
 pkgbase = java8-openjdk-shenandoah
-	pkgver = 8.u181_20190501_hotspota994d7874724
+	pkgver = 8.u222b02
 	pkgrel = 1
 	url = http://openjdk.java.net/
 	arch = x86_64
@@ -11,27 +9,28 @@ pkgbase = java8-openjdk-shenandoah
 	makedepends = unzip
 	makedepends = zip
 	makedepends = gcc
+	makedepends = giflib
 	makedepends = libxrender
 	makedepends = libxtst
 	makedepends = fontconfig
 	makedepends = libcups
 	makedepends = alsa-lib
-	source = jdk8u-abfdf545dc36.tar.gz::http://hg.openjdk.java.net/shenandoah/jdk8u/archive/abfdf545dc36.tar.gz
-	source = corba-79a3151ebf00.tar.gz::http://hg.openjdk.java.net/shenandoah/jdk8u/corba/archive/79a3151ebf00.tar.gz
-	source = hotspot-a994d7874724.tar.gz::http://hg.openjdk.java.net/shenandoah/jdk8u/hotspot/archive/a994d7874724.tar.gz
-	source = jdk-2a6d6dfe0a5f.tar.gz::http://hg.openjdk.java.net/shenandoah/jdk8u/jdk/archive/2a6d6dfe0a5f.tar.gz
-	source = jaxws-987a27eef8e6.tar.gz::http://hg.openjdk.java.net/shenandoah/jdk8u/jaxws/archive/987a27eef8e6.tar.gz
-	source = jaxp-34889baf492b.tar.gz::http://hg.openjdk.java.net/shenandoah/jdk8u/jaxp/archive/34889baf492b.tar.gz
-	source = langtools-da3019ae4eed.tar.gz::http://hg.openjdk.java.net/shenandoah/jdk8u/langtools/archive/da3019ae4eed.tar.gz
-	source = nashorn-67f49e0ffa83.tar.gz::http://hg.openjdk.java.net/shenandoah/jdk8u/nashorn/archive/67f49e0ffa83.tar.gz
-	sha256sums = 9c9309a92f603eba3b638baa8dcbdc66666565b131e377b0be5540ecd330a9af
-	sha256sums = 67ac5b1049249af5c8caafbe4ab0e415650fccdca9f05dffdb83f735be4ec6c9
-	sha256sums = a03dc4642241cc6f7ec6abc9eeba261d25440b8457e4ef43978fce70e989f577
-	sha256sums = 95eba6158e909edee8f49a8cb79db3c3b4807402acd35a01a15bf6d508959d55
-	sha256sums = 172ac7cf908de094ab6eeda11c26e5c20fca6b909cbe81c2b141968b990b6a55
-	sha256sums = d096661e36ea4bdc1dac008330955774ef76aa8c90002eef465cfd686edd1c22
-	sha256sums = 007372f11297b99f90b1a1928e12f728e0d6549ac5fdb1f46496b9bb840841a2
-	sha256sums = 5e6030ad51e4afa155c72da399cf3c785744b32150eb5c91e6cc7b557c11f551
+	source = jdk8u-aarch64-shenandoah-jdk8u222-b02.tar.gz::http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/archive/aarch64-shenandoah-jdk8u222-b02.tar.gz
+	source = corba-aarch64-shenandoah-jdk8u222-b02.tar.gz::http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/corba/archive/aarch64-shenandoah-jdk8u222-b02.tar.gz
+	source = hotspot-aarch64-shenandoah-jdk8u222-b02.tar.gz::http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/hotspot/archive/aarch64-shenandoah-jdk8u222-b02.tar.gz
+	source = jdk-aarch64-shenandoah-jdk8u222-b02.tar.gz::http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jdk/archive/aarch64-shenandoah-jdk8u222-b02.tar.gz
+	source = jaxws-aarch64-shenandoah-jdk8u222-b02.tar.gz::http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxws/archive/aarch64-shenandoah-jdk8u222-b02.tar.gz
+	source = jaxp-aarch64-shenandoah-jdk8u222-b02.tar.gz::http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxp/archive/aarch64-shenandoah-jdk8u222-b02.tar.gz
+	source = langtools-aarch64-shenandoah-jdk8u222-b02.tar.gz::http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/aarch64-shenandoah-jdk8u222-b02.tar.gz
+	source = nashorn-aarch64-shenandoah-jdk8u222-b02.tar.gz::http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/aarch64-shenandoah-jdk8u222-b02.tar.gz
+	sha256sums = 78f90dce375b9e84e8695b802ce8619458bec086e568e7443c8a3e9d2b748f38
+	sha256sums = 4ace1b4919225722b3cdf6fc378f5a9965d40db289d84b11a4f36ab81ab39fd6
+	sha256sums = 736b9206b9e52ed8ee439cfcacd981f6b2a6e0f4d75d590b34373046744010bc
+	sha256sums = 02e94e4998676fa54b54171be2f3ba5d56ba29c695dc73b261a6c0a0936c5e26
+	sha256sums = 334ce2d600d684abd2f2a37cd593c046d2f1dfe1df7214f72b041b93b9f0277c
+	sha256sums = ec3576aa040bd2c527b34d1a2a2b4ec0c718af34a00c0b586af91223d1206874
+	sha256sums = 36dc7340ae4aed80159b21ab95b0de79d5a266e988ab19c668c502b561b17593
+	sha256sums = 53d2d7396160d39850aeb06e552b8dcb1d88eaa3c3071917c1e8bb5c96b3c14f
 
 pkgname = jre8-openjdk-shenandoah-headless
 	pkgdesc = OpenJDK Java 8 headless runtime environment
@@ -39,6 +38,7 @@ pkgname = jre8-openjdk-shenandoah-headless
 	depends = java-runtime-common
 	depends = ca-certificates-utils
 	depends = nss
+	depends = giflib
 	optdepends = java-rhino: for some JavaScript support
 	provides = java-runtime-headless=8
 	provides = java-runtime-headless-openjdk=8
@@ -48,7 +48,7 @@ pkgname = jre8-openjdk-shenandoah-headless
 pkgname = jre8-openjdk-shenandoah
 	pkgdesc = OpenJDK Java 8 full runtime environment
 	install = install_jre8-openjdk.sh
-	depends = jre8-openjdk-shenandoah-headless=8.u181_20190501_hotspota994d7874724-1
+	depends = jre8-openjdk-shenandoah-headless=8.u222b02-1
 	depends = xdg-utils
 	depends = hicolor-icon-theme
 	optdepends = icedtea-web: web browser plugin + Java Web Start
@@ -63,7 +63,7 @@ pkgname = jdk8-openjdk-shenandoah
 	pkgdesc = OpenJDK Java 8 development kit
 	install = install_jdk8-openjdk.sh
 	depends = java-environment-common
-	depends = jre8-openjdk-shenandoah=8.u181_20190501_hotspota994d7874724-1
+	depends = jre8-openjdk-shenandoah=8.u222b02-1
 	provides = java-environment=8
 	provides = java-environment-openjdk=8
 	provides = java-environment-openjdk-shenandoah=8
diff --git a/PKGBUILD b/PKGBUILD
index d6edfd4f2ad1..d25bd6f91f17 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,46 +10,34 @@
 pkgname=('jre8-openjdk-shenandoah-headless' 'jre8-openjdk-shenandoah' 'jdk8-openjdk-shenandoah' 'openjdk8-shenandoah-src' 'openjdk8-shenandoah-doc')
 pkgbase=java8-openjdk-shenandoah
 _java_ver=8
-# Found @ http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
-_jdk_update=181
-_jdk_build=31
-# _repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
+_jdk_update=222
+_jdk_build=02
+_repo_ver=aarch64-shenandoah-jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
 pkgrel=1
 arch=('x86_64')
 url='http://openjdk.java.net/'
 license=('custom')
-makedepends=('java-environment=8' 'cpio' 'unzip' 'zip' 'gcc'
+makedepends=('java-environment=8' 'cpio' 'unzip' 'zip' 'gcc' 'giflib'
              'libxrender' 'libxtst' 'fontconfig' 'libcups' 'alsa-lib')
-_url_src=http://hg.openjdk.java.net/shenandoah/jdk8u
-_last_update=20190501
-declare -g -A _repo_versions=(
-    [jdk8u]=abfdf545dc36
-    [corba]=79a3151ebf00
-    [hotspot]=a994d7874724
-    [jdk]=2a6d6dfe0a5f
-    [jaxws]=987a27eef8e6
-    [jaxp]=34889baf492b
-    [langtools]=da3019ae4eed
-    [nashorn]=67f49e0ffa83
-)
-pkgver=${_java_ver}.u${_jdk_update}_${_last_update}_hotspot${_repo_versions[hotspot]}
-source=("jdk8u-${_repo_versions[jdk8u]}.tar.gz::${_url_src}/archive/${_repo_versions[jdk8u]}.tar.gz"
-        "corba-${_repo_versions[corba]}.tar.gz::${_url_src}/corba/archive/${_repo_versions[corba]}.tar.gz"
-        "hotspot-${_repo_versions[hotspot]}.tar.gz::${_url_src}/hotspot/archive/${_repo_versions[hotspot]}.tar.gz"
-        "jdk-${_repo_versions[jdk]}.tar.gz::${_url_src}/jdk/archive/${_repo_versions[jdk]}.tar.gz"
-        "jaxws-${_repo_versions[jaxws]}.tar.gz::${_url_src}/jaxws/archive/${_repo_versions[jaxws]}.tar.gz"
-        "jaxp-${_repo_versions[jaxp]}.tar.gz::${_url_src}/jaxp/archive/${_repo_versions[jaxp]}.tar.gz"
-        "langtools-${_repo_versions[langtools]}.tar.gz::${_url_src}/langtools/archive/${_repo_versions[langtools]}.tar.gz"
-        "nashorn-${_repo_versions[nashorn]}.tar.gz::${_url_src}/nashorn/archive/${_repo_versions[nashorn]}.tar.gz")
-
-sha256sums=('9c9309a92f603eba3b638baa8dcbdc66666565b131e377b0be5540ecd330a9af'
-            '67ac5b1049249af5c8caafbe4ab0e415650fccdca9f05dffdb83f735be4ec6c9'
-            'a03dc4642241cc6f7ec6abc9eeba261d25440b8457e4ef43978fce70e989f577'
-            '95eba6158e909edee8f49a8cb79db3c3b4807402acd35a01a15bf6d508959d55'
-            '172ac7cf908de094ab6eeda11c26e5c20fca6b909cbe81c2b141968b990b6a55'
-            'd096661e36ea4bdc1dac008330955774ef76aa8c90002eef465cfd686edd1c22'
-            '007372f11297b99f90b1a1928e12f728e0d6549ac5fdb1f46496b9bb840841a2'
-            '5e6030ad51e4afa155c72da399cf3c785744b32150eb5c91e6cc7b557c11f551')
+_url_src=http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah
+pkgver=${_java_ver}.u${_jdk_update}b${_jdk_build}
+source=("jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz"
+        "corba-${_repo_ver}.tar.gz::${_url_src}/corba/archive/${_repo_ver}.tar.gz"
+        "hotspot-${_repo_ver}.tar.gz::${_url_src}/hotspot/archive/${_repo_ver}.tar.gz"
+        "jdk-${_repo_ver}.tar.gz::${_url_src}/jdk/archive/${_repo_ver}.tar.gz"
+        "jaxws-${_repo_ver}.tar.gz::${_url_src}/jaxws/archive/${_repo_ver}.tar.gz"
+        "jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz"
+        "langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz"
+        "nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz")
+
+sha256sums=('78f90dce375b9e84e8695b802ce8619458bec086e568e7443c8a3e9d2b748f38'
+            '4ace1b4919225722b3cdf6fc378f5a9965d40db289d84b11a4f36ab81ab39fd6'
+            '736b9206b9e52ed8ee439cfcacd981f6b2a6e0f4d75d590b34373046744010bc'
+            '02e94e4998676fa54b54171be2f3ba5d56ba29c695dc73b261a6c0a0936c5e26'
+            '334ce2d600d684abd2f2a37cd593c046d2f1dfe1df7214f72b041b93b9f0277c'
+            'ec3576aa040bd2c527b34d1a2a2b4ec0c718af34a00c0b586af91223d1206874'
+            '36dc7340ae4aed80159b21ab95b0de79d5a266e988ab19c668c502b561b17593'
+            '53d2d7396160d39850aeb06e552b8dcb1d88eaa3c3071917c1e8bb5c96b3c14f')
 
 case "${CARCH}" in
   'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
@@ -58,7 +46,7 @@ esac
 
 _jdkname=openjdk8
 _jvmdir=/usr/lib/jvm/java-8-openjdk-shenandoah
-_prefix="jdk8u-${_repo_versions[jdk8u]}/image"
+_prefix="jdk8u-${_repo_ver}/image"
 _imgdir="${_prefix}/jvm/openjdk-1.8.0_$(printf '%.2d' ${_jdk_update})"
 _nonheadless=(bin/policytool
               lib/${_JARCH}/libjsound.so
@@ -66,14 +54,14 @@ _nonheadless=(bin/policytool
               lib/${_JARCH}/libsplashscreen.so)
 
 prepare() {
-  cd "${srcdir}/jdk8u-${_repo_versions[jdk8u]}"
+  cd "${srcdir}/jdk8u-shenandoah-${_repo_ver}"
   for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn; do
-    ln -s "../${subrepo}-${_repo_versions[$subrepo]}" ${subrepo}
+    ln -s "../${subrepo}-${_repo_ver}" ${subrepo}
   done
 }
 
 build() {
-  cd "${srcdir}/jdk8u-${_repo_versions[jdk8u]}"
+  cd "${srcdir}/jdk8u-shenandoah-${_repo_ver}"
 
   # Detecting Java version by the first line of the output
   # of `java --version` is such a great idea
@@ -93,6 +81,7 @@ build() {
     --with-milestone="fcs" \
     --enable-unlimited-crypto \
     --with-zlib=system \
+    --with-giflib=system \
     --with-extra-cflags="${CFLAGS}" \
     --with-extra-cxxflags="${CXXFLAGS}" \
     --with-extra-ldflags="${LDFLAGS}"
@@ -129,7 +118,7 @@ build() {
 
 package_jre8-openjdk-shenandoah-headless() {
   pkgdesc='OpenJDK Java 8 headless runtime environment'
-  depends=('java-runtime-common' 'ca-certificates-utils' 'nss')
+  depends=('java-runtime-common' 'ca-certificates-utils' 'nss' 'giflib')
   optdepends=('java-rhino: for some JavaScript support')
   provides=('java-runtime-headless=8' 'java-runtime-headless-openjdk=8' 'java-runtime-headless-shenandoah=8')
   # Upstream config files that should go to etc and get backup
@@ -283,7 +272,7 @@ package_openjdk8-shenandoah-doc() {
   pkgdesc='OpenJDK Java 8 documentation'
 
   install -d -m 755 "${pkgdir}/usr/share/doc/${pkgbase}/"
-  cp -r "${srcdir}"/jdk8u-${_repo_versions[jdk8u]}/build/linux-${_DOC_ARCH}-normal-server-release/docs/* \
+  cp -r "${srcdir}"/jdk8u-shenandoah-${_repo_ver}/build/linux-${_DOC_ARCH}-normal-server-release/docs/* \
     "${pkgdir}/usr/share/doc/${pkgbase}/"
 }