[voltdb] Update to 8.4.11

2 files changed, 12 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 65853b115221..0b6a05fc2332 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Fri Feb  5 08:43:45 UTC 2016
 pkgbase = voltdb
 	pkgdesc = An in-memory database with pre-compiled Java stored procedures (Community Edition)
-	pkgver = 6.0
+	pkgver = 8.4.11
 	pkgrel = 1
 	url = http://voltdb.com/
 	arch = i686
@@ -11,10 +9,10 @@ pkgbase = voltdb
 	makedepends = apache-ant
 	makedepends = python2-virtualenv
 	depends = python2
-	depends = java-environment-jdk=7
+	depends = java-environment-openjdk=8
 	conflicts = voltdb-enterprise
-	source = https://github.com/voltdb/voltdb/archive/voltdb-6.0.tar.gz
-	md5sums = 1e2a7979899b9f04f6318b3e713acb2b
+	source = https://github.com/voltdb/voltdb/archive/voltdb-8.4.11.tar.gz
+	md5sums = 85d200c015cd13c333fe23adc7aec99d
 
 pkgname = voltdb
 
diff --git a/PKGBUILD b/PKGBUILD
index dd247f194d69..564837a63e31 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,30 @@
 # Maintainer: D. Can Celasun <can[at]dcc[dot]im>
 pkgname=voltdb
-pkgver=6.0
+pkgver=8.4.11
 pkgrel=1
 pkgdesc="An in-memory database with pre-compiled Java stored procedures (Community Edition)"
 arch=('i686' 'x86_64')
 url="http://voltdb.com/"
 license=('AGPL3')
-depends=('python2' 'java-environment-jdk=7')
+depends=('python2' 'java-environment-openjdk=8')
 makedepends=('apache-ant' 'python2-virtualenv')
 conflicts=('voltdb-enterprise')
 source=("https://github.com/${pkgname}/${pkgname}/archive/${pkgname}-${pkgver}.tar.gz")
-md5sums=('1e2a7979899b9f04f6318b3e713acb2b')
+md5sums=('85d200c015cd13c333fe23adc7aec99d')
 build() {
   cd "${srcdir}"/${pkgname}-${pkgname}-${pkgver}
   
   # python2 stuff
-  /usr/bin/virtualenv2 --no-site-packages voltdb_env
+  /usr/bin/virtualenv2 voltdb_env
   source voltdb_env/bin/activate
   
   find . -type f -exec sed -i 's|^#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' {} \;
   find . -type f -exec sed -i 's|^#!/usr/bin/python\s*$|#!/usr/bin/python2|' {} \;
 
-  export PATH=/usr/lib/jvm/java-7-jdk/jre/bin:/usr/lib/jvm/java-7-jdk/jre/bin:$PATH
+  export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin:/usr/lib/jvm/java-8-openjdk/jre/bin:$PATH
   
-  sed -i 's/-Werror//g' "${srcdir}"/voltdb-voltdb-${pkgver}/build.py
+  # GCC 10/11 is buggy: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94335
+  sed -i 's/-Werror//g' "${srcdir}"/voltdb-voltdb-${pkgver}/tools/VoltDBCompilation.cmake
 
   ant clean
   ant -Djmemcheck=NO_MEMCHECK dist
@@ -33,7 +34,7 @@ package() {
     mkdir -p "${pkgdir}/opt/voltdb"
     mkdir -p "${pkgdir}/usr/bin"
 
-    mv "${srcdir}"/${pkgname}-${pkgname}-${pkgver}/{bin,bundles,doc,examples,lib,third_party,tools,voltdb,LICENSE,README,version.txt} "${pkgdir}"/opt/${pkgname}
+    mv "${srcdir}"/${pkgname}-${pkgname}-${pkgver}/{bin,bundles,doc,examples,lib,third_party,tools,voltdb,LICENSE,README.md,version.txt} "${pkgdir}"/opt/${pkgname}
     mv "${srcdir}"/${pkgname}-${pkgname}-${pkgver}/obj/release/*.tar.gz "${pkgdir}"/opt/${pkgname}/voltdb
 
     cd "${pkgdir}"/opt/${pkgname}