fix build, deps and bump version

1 files changed, 19 insertions, 18 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 9a8211c50a57..4c3a73e14548 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,41 +7,42 @@
 
 pkgname=hdfview
 _pkgname=HDFView
-pkgver=3.1.0
+pkgver=3.1.1
 _pkgver=${pkgver::-2}
 pkgrel=1
 pkgdesc="a GUI browser for reading hdf5 files"
 arch=('x86_64')
 url="https://www.hdfgroup.org/downloads/hdfview/"
 license=('custom')
-depends=('hdf5-java' 'hdf4')
+depends=('hdf5110')
+optdepends=(hdf4)
 replaces=('hdfview-beta')
 conflicts=('hdfview-beta')
 makedepends=('ant' 'java-environment')
 options=(!strip)
-source=("https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/${pkgname}-${_pkgver}/src/${pkgname}-${pkgver}.tar.gz"
-        build.patch
+source=("${pkgname}-${pkgver}.tar.gz::https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdfview-${pkgver}/src/hdfview-${pkgver}.tar.gz"
         ${_pkgname}.desktop
         HDF_logo.svg)
-sha512sums=(
-    'ae9b180c0da2b4b9a39189a7e42068435e29802469488b5880c4eea6e9cc4a63ad19b5c90529e55cbd62e4085379259782d404105b85ec52b837196fd43701a0'
-    '18a20af53ea2c075a26e22dbab6d7cecb67bead97db49569963e60d589c59f183ad97e796f0a2b67b59cdd311ff2831a134d69ee560a50c2ff8e821472ac82cb'
-    'c92d8cd4818feabb996b43c81e4e554e16f8120c80c73a5b7cc8bb2c4c4a59bdd47d42b19ec7a3454f855155ba17b65631e7016f891f29ef4ee8fd4ee45caf90'
-    '649eb81f33a3b38a7ae2ee9a7f286ffa489d0bd7a9f37a0face64fe7956863dcab2131be3792c45dc03b1a6955fda2b37d168698922e938b73c90d24fee7a8c4')
+sha512sums=('c1ae719059d32a568c34f0526aad2adbf87f1a88cd3b4d9509a3373a6c1cb31c6223bc985740cf7edf0673c1e08c0addadf926a84c91806826cbb1c7514615d7'
+            'c92d8cd4818feabb996b43c81e4e554e16f8120c80c73a5b7cc8bb2c4c4a59bdd47d42b19ec7a3454f855155ba17b65631e7016f891f29ef4ee8fd4ee45caf90'
+            '649eb81f33a3b38a7ae2ee9a7f286ffa489d0bd7a9f37a0face64fe7956863dcab2131be3792c45dc03b1a6955fda2b37d168698922e938b73c90d24fee7a8c4')
 
 prepare() {
-    cd "${pkgname}-${pkgver}"
-    patch --forward --strip=1 --input="${srcdir}/build.patch"
+  cd "${pkgname}-${pkgver}"
+
+  if pacman -Q hdf4
+  then
+    sed 's,^hdf.lib.dir.*,hdf.lib.dir = /opt/hdf4/lib,g' -i build.properties
+  else
+    sed 's,^hdf.lib.dir.*,hdf.lib.dir = /opt/hdf5110/lib,g' -i build.properties
+  fi
+
+  sed 's,^hdf5.lib.dir.*,hdf5.lib.dir = /opt/hdf5110/lib,g' -i build.properties
 }
 
 build() {
-    # workaround for java exception thrown @ build.xml:838
-    # [...] error=7 chmod  [...] argument list too long
-    # when building with java 10
-    ulimit -s unlimited
-
-    cd "${pkgname}-${pkgver}"
-    HDFLIBS=/opt/hdf4 HDF5LIBS=/usr ant package
+  cd "${pkgname}-${pkgver}"
+  ant package
 }
 
 package() {