summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorgios Eleftheriou2018-10-04 02:48:23 +0200
committerGeorgios Eleftheriou2018-10-04 02:48:23 +0200
commitf1231c77db78fb4d29ded1daad975ef0074f542e (patch)
treed54cf640f81a8b01c0f1be44e1de3874b96ffec6
parent4834461fbf02db849ee9ccc3a1f3c3a736865e4e (diff)
downloadaur-f1231c77db78fb4d29ded1daad975ef0074f542e.tar.gz
upgraded to 3.0
-rw-r--r--.SRCINFO29
-rwxr-xr-xHDFView36
-rw-r--r--HDFView.desktop2
-rw-r--r--PKGBUILD62
4 files changed, 46 insertions, 83 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ccdb76601ab..93232cc3ace 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,25 @@
pkgbase = hdfview
- pkgdesc = a GUI browser for reading hdf5 files (created with versions up to 1.8)
- pkgver = 2.14.0
- pkgrel = 7
- url = https://support.hdfgroup.org/products/java/
+ pkgdesc = a GUI browser for reading hdf5 files
+ pkgver = 3.0
+ pkgrel = 1
+ url = https://portal.hdfgroup.org/display/support/HDFView%203.0
arch = x86_64
license = custom
- makedepends = apache-ant
+ makedepends = ant
makedepends = java-environment
- depends = hdf-java
+ depends = hdf5-openmpi-java
+ depends = hdf4
+ conflicts = hdfview-beta
+ replaces = hdfview-beta
options = !strip
- source = https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/hdfview-2.14.tar.gz
- source = HDFView
+ source = https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdfview-3.0/src/hdfview-3.0.tar.gz
+ source = license
source = HDFView.desktop
source = HDFView.ico
- source = license
- sha256sums = 97a08300bba3f8b799a16d1d08ff9a1b2dd94757717dcf2a09d7c2539d6c6953
- sha256sums = ffcd06e84214ebdb67ff46140708c6282558134e4f33146d53f10d67ea0b42bd
- sha256sums = ceb3c33a6bf7462722328153903124eb743338e3bedc9255ac1b1251907ced9c
- sha256sums = 8d3e8e2c070e538f0a8de0d309afa2e11afb49c0889841044294cb2b72cda25b
- sha256sums = 78aac8e0c7fb92f8ea188dfa101e02c0df5ccaaaace6a52ff411be29c9b2d905
+ sha512sums = 8d1c0e4c063153fa4bfac80c6f85e9a6f0e879e706d77ba31db20eca105bc7c72852edd2aa1ada38446b2bd44581291faa0d93c3cc3a4086f153a35dcd619061
+ sha512sums = d831e3211c67480728488e1e2df2596d41381c5ba7b8451ea0f5174d9a34f224133d9cbaa81728cb68560328054663e8940de86db4777de8b46b65f080de9674
+ sha512sums = ee90f96c171a21063418fad3741cc888305c052284bdc0083737060c0682bc92ad55b3e521b8e0a574b69f1a37966dd917c0537879519c33291f6f02b2e9d76d
+ sha512sums = bc2bb9ffa22140c1b6b5448ed310a8dbb839ddcf802ec327f32f904f0e77e0034bb26fabeb5d9e4e8ce8d334333327a2bd08b8e07f0313e85ef50afe0be41cfe
pkgname = hdfview
diff --git a/HDFView b/HDFView
deleted file mode 100755
index d23d7d6e903..00000000000
--- a/HDFView
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-##############################################################################
-# HDF Viewer Wrapper
-##############################################################################
-
-# Configure appropriate fallback values:
-HDFVIEW_APPLICATION="${HDFVIEW_APPLICATION:-/usr/bin/hdfview.sh}"
-HDFVIEW_FONT_PATH="${HDFVIEW_FONT_PATH:-/usr/share/fonts/truetype}"
-HDFVIEW_FONT_TYPE="${HDFVIEW_FONT_TYPE:-$(fc-match --format '%{family}' sans)}"
-HDFVIEW_FONT_SIZE="${HDFVIEW_FONT_SIZE:-12}"
-HDFVIEW_ANTIALIAS="${HDFVIEW_ANTIALIAS:-on}"
-HDFVIEW_LOOK_FEEL="${HDFVIEW_LOOK_FEEL:-com.sun.java.swing.plaf.gtk.GTKLookAndFeel}"
-
-# Glob for configuration files:
-HDFVIEW_CFG_FILES=$(echo ~/.hdfview[0-9]*.[0-9]*)
-
-# Attempt to fix fonts:
-sed -i -r "s|^(font\.size)=.*\$|\\1=${HDFVIEW_FONT_SIZE}|" ${HDFVIEW_CFG_FILES}
-sed -i -r "s|^(font\.type)=.*\$|\\1=${HDFVIEW_FONT_TYPE}|" ${HDFVIEW_CFG_FILES}
-export JAVA_FONTS="${FONT_PATH}"
-
-# Attempt to fix look and feel:
-JAVA_OPTIONS=(
- "-Dawt.useSystemAAFontSettings=${HDFVIEW_ANTIALIAS}"
- "-Dswing.defaultlaf=${HDFVIEW_LOOK_FEEL}"
- "-Dswing.crossplatformlaf=${HDFVIEW_LOOK_FEEL}"
-)
-JAVA_OPTIONS=$(printf ' %s' "${JAVA_OPTIONS[@]}")
-JAVA_OPTIONS=${JAVA_OPTIONS:1}
-export _JAVA_OPTIONS=${JAVA_OPTIONS}
-
-# Launch the viewer:
-exec ${HDFVIEW_APPLICATION} "${@}"
-
-##############################################################################
-# vim:et:ft=sh:nowrap:sts=4:sw=4:ts=4
diff --git a/HDFView.desktop b/HDFView.desktop
index b61b605a138..51ba9ab4412 100644
--- a/HDFView.desktop
+++ b/HDFView.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=HDFView
Comment=HDFView is a GUI tool for browsing and editing HDF4 and HDF5 files.
-Exec=/usr/bin/HDFView %F
+Exec=/usr/bin/hdfview.sh %F
Icon=/usr/share/pixmaps/HDFView.ico
Terminal=false
Type=Application
diff --git a/PKGBUILD b/PKGBUILD
index 43e693a7583..ffadf04b89d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,57 +5,55 @@
pkgname=hdfview
_pkgname=HDFView
-pkgver=2.14.0
-_pkgver=${pkgver%.0}
-pkgrel=7
-pkgdesc="a GUI browser for reading hdf5 files (created with versions up to 1.8)"
+pkgver=3.0
+_pkgver=${pkgver}.0
+pkgrel=1
+pkgdesc="a GUI browser for reading hdf5 files"
arch=('x86_64')
-url="https://support.hdfgroup.org/products/java/"
+url="https://portal.hdfgroup.org/display/support/HDFView%203.0"
license=('custom')
-depends=('hdf-java')
-makedepends=('apache-ant' 'java-environment')
+depends=('hdf5-openmpi-java' 'hdf4')
+replaces=('hdfview-beta')
+conflicts=('hdfview-beta')
+makedepends=('ant' 'java-environment')
options=(!strip)
-source=("https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${pkgname}-${_pkgver}.tar.gz"
- "${_pkgname}"
- "${_pkgname}.desktop"
- "${_pkgname}.ico"
- license)
-sha256sums=('97a08300bba3f8b799a16d1d08ff9a1b2dd94757717dcf2a09d7c2539d6c6953'
- 'ffcd06e84214ebdb67ff46140708c6282558134e4f33146d53f10d67ea0b42bd'
- 'ceb3c33a6bf7462722328153903124eb743338e3bedc9255ac1b1251907ced9c'
- '8d3e8e2c070e538f0a8de0d309afa2e11afb49c0889841044294cb2b72cda25b'
- '78aac8e0c7fb92f8ea188dfa101e02c0df5ccaaaace6a52ff411be29c9b2d905')
+source=("https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/${pkgname}-${pkgver}/src/${pkgname}-${pkgver}.tar.gz"
+ license
+ ${_pkgname}.desktop
+ ${_pkgname}.ico)
+sha512sums=(
+ '8d1c0e4c063153fa4bfac80c6f85e9a6f0e879e706d77ba31db20eca105bc7c72852edd2aa1ada38446b2bd44581291faa0d93c3cc3a4086f153a35dcd619061'
+ 'd831e3211c67480728488e1e2df2596d41381c5ba7b8451ea0f5174d9a34f224133d9cbaa81728cb68560328054663e8940de86db4777de8b46b65f080de9674'
+ 'ee90f96c171a21063418fad3741cc888305c052284bdc0083737060c0682bc92ad55b3e521b8e0a574b69f1a37966dd917c0537879519c33291f6f02b2e9d76d'
+ 'bc2bb9ffa22140c1b6b5448ed310a8dbb839ddcf802ec327f32f904f0e77e0034bb26fabeb5d9e4e8ce8d334333327a2bd08b8e07f0313e85ef50afe0be41cfe')
prepare() {
- cd "${pkgname}-${_pkgver}"
- sed -i '731s;<chmod perm="ugo+rx">;<chmod perm="ugo+rx" maxparallel="10">;' build.xml
+ cd "${pkgname}-${pkgver}"
}
build() {
- cd "${pkgname}-${_pkgver}"
- HDFLIBS=/opt/hdfjava-3.3.2 ant package
+ cd "${pkgname}-${pkgver}"
+ HDFLIBS=/opt/hdf4 HDF5LIBS=/usr ant package
}
package() {
- cd "${pkgname}-${_pkgver}"
+ cd "${pkgname}-${pkgver}"
mkdir "${pkgdir}/opt"
- cp -a "build/dist/${_pkgname}-${pkgver}-Linux.sh" "${pkgdir}/opt"
+ cp -a "build/dist/${_pkgname}-${_pkgver}-Linux.sh" "${pkgdir}/opt"
cd "${pkgdir}/opt"
# Make extraction non interactive
- sed -i 's/interactive=TRUE/interactive=FALSE/' ${_pkgname}-${pkgver}-Linux.sh
- sed -i 's/cpack_skip_license=FALSE/cpack_skip_license=TRUE/' ${_pkgname}-${pkgver}-Linux.sh
+ sed -i 's/interactive=TRUE/interactive=FALSE/' ${_pkgname}-${_pkgver}-Linux.sh
+ sed -i 's/cpack_skip_license=FALSE/cpack_skip_license=TRUE/' ${_pkgname}-${_pkgver}-Linux.sh
- ./${_pkgname}-${pkgver}-Linux.sh
- rm "${_pkgname}-${pkgver}-Linux.sh"
+ ./${_pkgname}-${_pkgver}-Linux.sh
+ rm "${_pkgname}-${_pkgver}-Linux.sh"
mkdir -p "${pkgdir}/usr/bin"
- sed -i "s:JAVABIN=${pkgdir}/opt/${_pkgname}/${pkgver}/jre/bin:JAVABIN=/opt/${_pkgname}/${pkgver}/jre/bin:" "${_pkgname}/${pkgver}/${pkgname}.sh"
- sed -i "s:INSTALLDIR=${pkgdir}/opt/${_pkgname}/${pkgver}:INSTALLDIR=/opt/${_pkgname}/${pkgver}:" "${_pkgname}/${pkgver}/${pkgname}.sh"
- cp -a "${_pkgname}/${pkgver}/${pkgname}.sh" "${pkgdir}/usr/bin"
-
# Desktop files, icons, wrappers and license
- install -D -m 755 "${srcdir}/${_pkgname}" "${pkgdir}/usr/bin/HDFView"
+ echo "#!/usr/bin/env bash" > "${pkgdir}/usr/bin/hdfview.sh"
+ echo "/opt/HDFView/${_pkgver}/hdfview.sh "'$@' >> "${pkgdir}/usr/bin/hdfview.sh"
+ chmod 755 "${pkgdir}/usr/bin/hdfview.sh"
install -D -m 644 "${srcdir}/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
install -D -m 644 "${srcdir}/${_pkgname}.ico" "${pkgdir}/usr/share/pixmaps/${_pkgname}.ico"
install -D -m 644 "${srcdir}/license" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"