make it almost buildable

still fails due to forced werror but it's an improvement

2 files changed, 30 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fc32fa17f5a9..44d594915dbe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = java-openj9
-	pkgver = 16b36_openj9_0.25.0
+	pkgver = 16.0.1.u9_openj9_0.26.0
 	pkgrel = 1
 	url = http://www.eclipse.org/openj9/
 	arch = x86_64
@@ -17,7 +17,6 @@ pkgbase = java-openj9
 	makedepends = libxext
 	makedepends = libxrandr
 	makedepends = alsa-lib
-	makedepends = pandoc
 	makedepends = graphviz
 	makedepends = freetype2
 	makedepends = libjpeg-turbo
@@ -29,17 +28,18 @@ pkgbase = java-openj9
 	makedepends = freemarker
 	makedepends = numactl
 	makedepends = nasm
-	source = openj9-openjdk-jdk-0.25.0.tar.gz::https://github.com/ibmruntimes/openj9-openjdk-jdk16/archive/v0.25.0-release.tar.gz
-	source = https://github.com/eclipse/openj9/archive/openj9-0.25.0.tar.gz
-	source = openj9-omr-0.25.0.tar.gz::https://github.com/eclipse/openj9-omr/archive/openj9-0.25.0.tar.gz
+	makedepends = cmake
+	source = openj9-openjdk-jdk-0.26.0.tar.gz::https://github.com/ibmruntimes/openj9-openjdk-jdk16/archive/v0.26.0-release.tar.gz
+	source = https://github.com/eclipse/openj9/archive/openj9-0.26.0.tar.gz
+	source = openj9-omr-0.26.0.tar.gz::https://github.com/eclipse/openj9-omr/archive/openj9-0.26.0.tar.gz
 	source = freedesktop-java.desktop
 	source = freedesktop-jconsole.desktop
 	source = freedesktop-jshell.desktop
 	source = omr-omrstr-iconv-failure-overflow.patch
 	source = omr-fam.patch
-	sha256sums = 1e112938c7260b55e28a9faa1db8608502ad08257fb56142e965d9e5a7edfc52
-	sha256sums = fdb1af35c8df1b2c92962b95e614fe6929fe677d32bca89aa407a1687e402927
-	sha256sums = 76a71eecee6bb69c14d9e63087c712f00dece1113acfbc97c6eeebdb645ff743
+	sha256sums = f412e6e44d5f379671b55bb0a646d1c0ab79fe9dc3f380a3d42ee58693149416
+	sha256sums = ffb6a76161638d2a64b731774d170eccfd77ad738a31221ee32b57d9cd27211b
+	sha256sums = 749d939b94533f6a600c5d238c82d0bf357718f6bea37f295276544eb394b5e4
 	sha256sums = 7cb89746dbbcf498dd43b53fee59b124f42e3ea0d8b7134ab803cc2bd6b50230
 	sha256sums = bf76024528d050fd912f72d73e18a814a930df3478b132a99a887fbbdc0c9dfd
 	sha256sums = bd2d4da78a65eec20dc32e21fd4fe134a2483b0bbe2dfb940d66755acc237975
@@ -59,7 +59,7 @@ pkgname = jre-openj9-headless
 	optdepends = java-rhino: for some JavaScript support
 	provides = java-runtime-headless=16
 	provides = java-runtime-headless-openj9=16
-	provides = jre16-openj9-headless=16b36_openj9_0.25.0-1
+	provides = jre16-openj9-headless=16.0.1.u9_openj9_0.26.0-1
 	backup = etc/java-openj9/logging.properties
 	backup = etc/java-openj9/management/jmxremote.access
 	backup = etc/java-openj9/management/jmxremote.password.template
@@ -78,33 +78,32 @@ pkgname = jre-openj9-headless
 pkgname = jre-openj9
 	pkgdesc = OpenJDK Java 16 full runtime environment
 	install = install_jre-openj9.sh
-	depends = jre16-openj9-headless=16b36_openj9_0.25.0-1
+	depends = jre16-openj9-headless=16.0.1.u9_openj9_0.26.0-1
 	depends = giflib
 	optdepends = alsa-lib: for basic sound support
 	optdepends = gtk2: for the Gtk+ 2 look and feel - desktop usage
 	optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage
 	provides = java-runtime=16
 	provides = java-runtime-openj9=16
-	provides = jre16-openj9=16b36_openj9_0.25.0-1
+	provides = jre16-openj9=16.0.1.u9_openj9_0.26.0-1
 
 pkgname = jdk-openj9
 	pkgdesc = OpenJDK Java 16 development kit
 	install = install_jdk-openj9.sh
-	depends = jre16-openj9=16b36_openj9_0.25.0-1
+	depends = jre16-openj9=16.0.1.u9_openj9_0.26.0-1
 	depends = java-environment-common=3
 	depends = hicolor-icon-theme
 	depends = libelf
 	provides = java-environment=16
 	provides = java-environment-openj9=16
-	provides = jdk16-openj9=16b36_openj9_0.25.0-1
+	provides = jdk16-openj9=16.0.1.u9_openj9_0.26.0-1
 
 pkgname = openj9-src
 	pkgdesc = OpenJDK Java 16 sources
-	depends = jdk16-openj9=16b36_openj9_0.25.0-1
-	provides = openj916-src=16b36_openj9_0.25.0-1
+	depends = jdk16-openj9=16.0.1.u9_openj9_0.26.0-1
+	provides = openj916-src=16.0.1.u9_openj9_0.26.0-1
 
 pkgname = openj9-doc
 	pkgdesc = OpenJDK Java 16 documentation
-	depends = jdk16-openj9=16b36_openj9_0.25.0-1
-	provides = openj916-doc=16b36_openj9_0.25.0-1
-
+	depends = jdk16-openj9=16.0.1.u9_openj9_0.26.0-1
+	provides = openj916-doc=16.0.1.u9_openj9_0.26.0-1
diff --git a/PKGBUILD b/PKGBUILD
index e312c8e0f658..f2ffeebda596 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,19 +7,19 @@
 pkgbase=java-openj9
 pkgname=('jre-openj9-headless' 'jre-openj9' 'jdk-openj9' 'openj9-src' 'openj9-doc')
 _majorver=16
-_minorver=
-_securityver=
-_updatever=36
-_openj9ver=0.25.0
+_minorver=0
+_securityver=1
+_updatever=9
+_openj9ver=0.26.0
 pkgrel=1
-pkgver=${_majorver}${_minorver:+.${_minorver}}${_securityver:+.${_securityver}}b${_updatever}_openj9_${_openj9ver}
+pkgver=${_majorver}${_minorver:+.${_minorver}}${_securityver:+.${_securityver}}.u${_updatever}_openj9_${_openj9ver}
 arch=('x86_64')
 url='http://www.eclipse.org/openj9/'
 license=('custom')
 makedepends=('java-environment>=11' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'libx11'
-             'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib' 'pandoc'
+             'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib'
              'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2'
-             'libnet' 'bash' 'freemarker' 'numactl' 'nasm')
+             'libnet' 'bash' 'freemarker' 'numactl' 'nasm' 'cmake')
 source=(openj9-openjdk-jdk-${_openj9ver}.tar.gz::https://github.com/ibmruntimes/openj9-openjdk-jdk${_majorver}/archive/v${_openj9ver}-release.tar.gz
         https://github.com/eclipse/openj9/archive/openj9-${_openj9ver}.tar.gz
         openj9-omr-${_openj9ver}.tar.gz::https://github.com/eclipse/openj9-omr/archive/openj9-${_openj9ver}.tar.gz
@@ -28,9 +28,9 @@ source=(openj9-openjdk-jdk-${_openj9ver}.tar.gz::https://github.com/ibmruntimes/
         freedesktop-jshell.desktop
         omr-omrstr-iconv-failure-overflow.patch
         omr-fam.patch)
-sha256sums=('1e112938c7260b55e28a9faa1db8608502ad08257fb56142e965d9e5a7edfc52'
-            'fdb1af35c8df1b2c92962b95e614fe6929fe677d32bca89aa407a1687e402927'
-            '76a71eecee6bb69c14d9e63087c712f00dece1113acfbc97c6eeebdb645ff743'
+sha256sums=('f412e6e44d5f379671b55bb0a646d1c0ab79fe9dc3f380a3d42ee58693149416'
+            'ffb6a76161638d2a64b731774d170eccfd77ad738a31221ee32b57d9cd27211b'
+            '749d939b94533f6a600c5d238c82d0bf357718f6bea37f295276544eb394b5e4'
             '7cb89746dbbcf498dd43b53fee59b124f42e3ea0d8b7134ab803cc2bd6b50230'
             'bf76024528d050fd912f72d73e18a814a930df3478b132a99a887fbbdc0c9dfd'
             'bd2d4da78a65eec20dc32e21fd4fe134a2483b0bbe2dfb940d66755acc237975'
@@ -43,7 +43,7 @@ case "${CARCH}" in
 esac
 
 _jvmdir=/usr/lib/jvm/java-${_majorver}-openj9
-_jdkdir=openj9-openjdk-jdk${_majorver}-openj9-${_openj9ver}
+_jdkdir=openj9-openjdk-jdk${_majorver}-${_openj9ver}-release
 _imgdir=${_jdkdir}/build/linux-${_JARCH}-server-release/images
 
 _nonheadless=(lib/libawt_xawt.{so,debuginfo}
@@ -60,7 +60,8 @@ prepare() {
   patch -d omr -p1 -i $srcdir/omr-omrstr-iconv-failure-overflow.patch
   patch -d omr -p1 -i $srcdir/omr-fam.patch
 
-  sed -i -e '/^OPENJ9_SHA :=/s/:=.*/:= openj9-'${_openj9ver}/ \
+  sed -i -e '/^OPENJDK_SHA :=/s/:=.*/:= __OPENJDK_SHA__/' \
+         -e '/^OPENJ9_SHA :=/s/:=.*/:= openj9-'${_openj9ver}/ \
          -e '/^OPENJ9_TAG :=/s/:=.*/:= openj9-'${_openj9ver}/ \
          -e '/^OPENJ9OMR_SHA :=/s/:=.*/:= openj9-'${_openj9ver}/ \
          closed/OpenJ9.gmk