upgrade to 3.1.0

7 files changed, 208 insertions, 134 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9c54c64b309f..bc8d902cdfee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = hdfview
 	pkgdesc = a GUI browser for reading hdf5 files
-	pkgver = 3.0
-	pkgrel = 4
+	pkgver = 3.1.0
+	pkgrel = 1
 	url = https://www.hdfgroup.org/downloads/hdfview/
 	arch = x86_64
 	license = custom
@@ -12,14 +12,14 @@ pkgbase = hdfview
 	conflicts = hdfview-beta
 	replaces = hdfview-beta
 	options = !strip
-	source = https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdfview-3.0/src/hdfview-3.0.tar.gz
-	source = license
+	source = https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdfview-3.1/src/hdfview-3.1.0.tar.gz
+	source = build.patch
 	source = HDFView.desktop
-	source = HDFView.ico
-	sha512sums = 8d1c0e4c063153fa4bfac80c6f85e9a6f0e879e706d77ba31db20eca105bc7c72852edd2aa1ada38446b2bd44581291faa0d93c3cc3a4086f153a35dcd619061
-	sha512sums = d831e3211c67480728488e1e2df2596d41381c5ba7b8451ea0f5174d9a34f224133d9cbaa81728cb68560328054663e8940de86db4777de8b46b65f080de9674
-	sha512sums = 42cbf32c91c4bfd3984d2ef130d8357c28269660117ad210039d9599904688853674f6626a7663c17cf0927895e5cbbede719b6766ff19ace43a5447421a4709
-	sha512sums = bc2bb9ffa22140c1b6b5448ed310a8dbb839ddcf802ec327f32f904f0e77e0034bb26fabeb5d9e4e8ce8d334333327a2bd08b8e07f0313e85ef50afe0be41cfe
+	source = HDF_logo.svg
+	sha512sums = ae9b180c0da2b4b9a39189a7e42068435e29802469488b5880c4eea6e9cc4a63ad19b5c90529e55cbd62e4085379259782d404105b85ec52b837196fd43701a0
+	sha512sums = 18a20af53ea2c075a26e22dbab6d7cecb67bead97db49569963e60d589c59f183ad97e796f0a2b67b59cdd311ff2831a134d69ee560a50c2ff8e821472ac82cb
+	sha512sums = c92d8cd4818feabb996b43c81e4e554e16f8120c80c73a5b7cc8bb2c4c4a59bdd47d42b19ec7a3454f855155ba17b65631e7016f891f29ef4ee8fd4ee45caf90
+	sha512sums = 649eb81f33a3b38a7ae2ee9a7f286ffa489d0bd7a9f37a0face64fe7956863dcab2131be3792c45dc03b1a6955fda2b37d168698922e938b73c90d24fee7a8c4
 
 pkgname = hdfview
 
diff --git a/HDFView.desktop b/HDFView.desktop
index 51ba9ab4412d..205a05123f9a 100644
--- a/HDFView.desktop
+++ b/HDFView.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=HDFView
 Comment=HDFView is a GUI tool for browsing and editing HDF4 and HDF5 files.
-Exec=/usr/bin/hdfview.sh %F
-Icon=/usr/share/pixmaps/HDFView.ico
+Exec=/usr/bin/hdfview %F
+Icon=/usr/share/pixmaps/HDF_logo.svg
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Utility;
diff --git a/HDFView.ico b/HDFView.ico
deleted file mode 100644
index b691e2e7a671..000000000000
--- a/HDFView.ico
+++ /dev/null
diff --git a/HDF_logo.svg b/HDF_logo.svg
new file mode 100644
index 000000000000..9bcf6a15a4dc
--- /dev/null
+++ b/HDF_logo.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="500"
+   height="500"
+   version="1.1"
+   id="svg12"
+   sodipodi:docname="HDF_logo.svg"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14">
+  <metadata
+     id="metadata16">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1323"
+     inkscape:window-height="1046"
+     id="namedview14"
+     showgrid="false"
+     inkscape:zoom="0.772"
+     inkscape:cx="-268.13472"
+     inkscape:cy="141.29534"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg12" />
+  <defs
+     id="defs8">
+    <linearGradient
+       id="linearGradientStops">
+      <stop
+         offset="0"
+         style="stop-color:#0515fe"
+         id="stop2" />
+      <stop
+         offset="1"
+         style="stop-color:#2cab28"
+         id="stop4" />
+    </linearGradient>
+    <linearGradient
+       id="BlueGreen"
+       gradientUnits="userSpaceOnUse"
+       y1="20"
+       x1="0"
+       y2="180"
+       x2="0"
+       xlink:href="#linearGradientStops"
+       gradientTransform="translate(0,82)" />
+  </defs>
+  <path
+     style="fill:url(#BlueGreen)"
+     d="M 166.09991,86.26486 A 24.0024,24.0024 0 0 0 142.4612,110.6047 v 85.28517 H 52.943634 V 110.94064 A 24.0024,24.0024 0 0 0 28.582304,86.6008 24.0024,24.0024 0 0 0 4.9436344,110.94064 v 219.34767 a 24.0024,24.0024 0 1 0 47.9999996,0 V 243.88988 H 190.46121 V 135.69845 c 72.9063,6.88849 101.24551,48.69366 100.91011,86.69923 -0.3698,41.9162 -35.34671,87.66903 -126.28121,84.7481 a 24.0024,24.0024 0 1 0 -1.541,47.97463 c 66.7689,2.1447 117.38341,-21.4777 146.78121,-56.25003 v 33.39063 a 24.0024,24.0024 0 1 0 48,0 v -87.16803 h 79.9551 a 24.0024,24.0024 0 1 0 0,-47.99999 h -79.9551 V 134.6047 h 112.2852 a 24.0024,24.0024 0 1 0 0,-48 H 170.38501 a 24.0024,24.0024 0 0 0 -4.2851,-0.33984 z"
+     id="path10"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/PKGBUILD b/PKGBUILD
index 8f447af8c1e0..9a8211c50a57 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,15 @@
-# Maintainer  : George Eleftheriou <eleftg>
+# Maintainer  : Chris Billington <chrisjbillington>
+# Maintainer  : Martin Diehl <MartinDiehl>
+# Maintainer  : Georgios Eleftheriou <eleftg>
 # Contributor : Martin Wimpress <code@flexion.org>
 # Contributor : Nick Pope
 # Contributor : Bryce Nordgren <bnordgren at gmail dot com>
 
 pkgname=hdfview
 _pkgname=HDFView
-pkgver=3.0
-_pkgver=${pkgver}.0
-pkgrel=4
+pkgver=3.1.0
+_pkgver=${pkgver::-2}
+pkgrel=1
 pkgdesc="a GUI browser for reading hdf5 files"
 arch=('x86_64')
 url="https://www.hdfgroup.org/downloads/hdfview/"
@@ -17,49 +19,55 @@ 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"
-        license
+source=("https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/${pkgname}-${_pkgver}/src/${pkgname}-${pkgver}.tar.gz"
+        build.patch
         ${_pkgname}.desktop
-        ${_pkgname}.ico)
+        HDF_logo.svg)
 sha512sums=(
-    '8d1c0e4c063153fa4bfac80c6f85e9a6f0e879e706d77ba31db20eca105bc7c72852edd2aa1ada38446b2bd44581291faa0d93c3cc3a4086f153a35dcd619061'
-    'd831e3211c67480728488e1e2df2596d41381c5ba7b8451ea0f5174d9a34f224133d9cbaa81728cb68560328054663e8940de86db4777de8b46b65f080de9674'
-    '42cbf32c91c4bfd3984d2ef130d8357c28269660117ad210039d9599904688853674f6626a7663c17cf0927895e5cbbede719b6766ff19ace43a5447421a4709'
-    'bc2bb9ffa22140c1b6b5448ed310a8dbb839ddcf802ec327f32f904f0e77e0034bb26fabeb5d9e4e8ce8d334333327a2bd08b8e07f0313e85ef50afe0be41cfe')
+    'ae9b180c0da2b4b9a39189a7e42068435e29802469488b5880c4eea6e9cc4a63ad19b5c90529e55cbd62e4085379259782d404105b85ec52b837196fd43701a0'
+    '18a20af53ea2c075a26e22dbab6d7cecb67bead97db49569963e60d589c59f183ad97e796f0a2b67b59cdd311ff2831a134d69ee560a50c2ff8e821472ac82cb'
+    'c92d8cd4818feabb996b43c81e4e554e16f8120c80c73a5b7cc8bb2c4c4a59bdd47d42b19ec7a3454f855155ba17b65631e7016f891f29ef4ee8fd4ee45caf90'
+    '649eb81f33a3b38a7ae2ee9a7f286ffa489d0bd7a9f37a0face64fe7956863dcab2131be3792c45dc03b1a6955fda2b37d168698922e938b73c90d24fee7a8c4')
 
 prepare() {
     cd "${pkgname}-${pkgver}"
+    patch --forward --strip=1 --input="${srcdir}/build.patch"
 }
 
 build() {
-  # workaround for java exception thrown @ build.xml:838
-  # [...] error=7 chmod  [...] argument list too long
-  # when building with java 10
-  ulimit -s unlimited
+    # 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}"
+    HDFLIBS=/opt/hdf4 HDF5LIBS=/usr ant package
 }
 
 package() {
-  cd "${pkgname}-${pkgver}"
-  mkdir "${pkgdir}/opt"
-  cp -a "build/dist/${_pkgname}-${_pkgver}-Linux.sh" "${pkgdir}/opt"
-  cd "${pkgdir}/opt"
+    cd "${pkgname}-${pkgver}"
+    mkdir "${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
+
+    ./${_pkgname}-${pkgver}-Linux.sh
+    rm "${_pkgname}-${pkgver}-Linux.sh"
 
-  # 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
+    # use default java
+    rm -rf ${pkgdir}/opt/${_pkgname}/${pkgver}/jre
+    sed -i 's:export JAVABIN=$INSTALLDIR/jre/bin:export JAVABIN=/usr/lib/jvm/default-runtime/bin:' ${pkgdir}/opt/${_pkgname}/${pkgver}/hdfview.sh
 
-  ./${_pkgname}-${_pkgver}-Linux.sh
-  rm "${_pkgname}-${_pkgver}-Linux.sh"
-  mkdir -p "${pkgdir}/usr/bin"
+    mkdir -p "${pkgdir}/usr/bin"
 
-  # Desktop files, icons, wrappers and license
-  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"
+    # Desktop files, icons, wrappers and license
+    echo "#!/usr/bin/env bash" > "${pkgdir}/usr/bin/hdfview"
+    echo "/opt/HDFView/${pkgver}/hdfview.sh "'-root $PWD "$@"' >> "${pkgdir}/usr/bin/hdfview"
+    chmod 755 "${pkgdir}/usr/bin/hdfview"
+    install -D -m 644 "${srcdir}/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
+    install -D -m 644 "${srcdir}/HDF_logo.svg" "${pkgdir}/usr/share/pixmaps/HDF_logo.svg"
+    install -D -m 644 "${srcdir}/${pkgname}-${pkgver}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/build.patch b/build.patch
new file mode 100644
index 000000000000..1ca99019a830
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,78 @@
+--- hdfview-3.1.0.orig/build.xml	2019-10-26 14:54:03.332040154 -0400
++++ hdfview-3.1.0.new/build.xml	2019-10-26 14:53:49.502003310 -0400
+ 
+@@ -1077,28 +1078,6 @@
+         <mkdir dir="${release.dir}/share/samples" />
+         <mkdir dir="${release.dir}/share/doc" />
+ 
+-        <symlink action="record" linkfilename="dir.hdf.links">
+-            <fileset dir="${hdf.lib.dir}">
+-                <!-- HDF4 bug in lib naming -->
+-                <include name="libdf.so*" />
+-
+-                <include name="libhdf.so*" />
+-                <include name="libhdf_java.so*" />
+-                <include name="libmfhdf.so*" />
+-                <include name="libjpeg.so*" />
+-                <include name="libszip.so*" />
+-                <include name="libz.so*" />
+-            </fileset>
+-        </symlink>
+-        <symlink action="record" linkfilename="dir.hdf5.links">
+-            <fileset dir="${hdf5.lib.dir}">
+-                <include name="libhdf5.so*" />
+-                <include name="libhdf5_java.so*" />
+-                <include name="libszip.so*" />
+-                <include name="libz.so*" />
+-            </fileset>
+-        </symlink>
+-
+         <!-- Copy the application and dependencies -->
+         <copy todir="${release.dir}/lib">
+             <fileset dir="${jar.dir}" includes="${ant.project.name}.jar" />
+@@ -1139,34 +1118,6 @@
+             <fileset dir="${lib.dir}/extra" includes="slf4j-nop${version.slf4j}.jar" excludes="*sources.jar" />
+         </copy>
+ 
+-        <copy file="${hdf.lib.dir}/dir.hdf.links" tofile="${release.dir}/lib/dir.hdf.links" failonerror="false">
+-          <filterchain>
+-            <tokenfilter>
+-              <replaceregex pattern="${hdf.lib.dir}" replace="${basedir}/${release.dir}/lib/" flags="gi"/>
+-            </tokenfilter>
+-          </filterchain>
+-        </copy>
+-        <copy file="${hdf5.lib.dir}/dir.hdf5.links" tofile="${release.dir}/lib/dir.hdf5.links">
+-          <filterchain>
+-            <tokenfilter>
+-              <replaceregex pattern="${hdf5.lib.dir}" replace="${basedir}/${release.dir}/lib/" flags="gi"/>
+-            </tokenfilter>
+-          </filterchain>
+-        </copy>
+-        <symlink action="recreate" failonerror="false">
+-            <fileset dir="${basedir}/${release.dir}/lib" includes="dir.hdf.links" />
+-        </symlink>
+-        <symlink action="recreate">
+-            <fileset dir="${basedir}/${release.dir}/lib" includes="dir.hdf5.links" />
+-        </symlink>
+-
+-        <delete file="${basedir}/${release.dir}/lib/dir.hdf.links" failonerror="false"/>
+-        <delete file="${basedir}/${release.dir}/lib/dir.hdf5.links"/>
+-
+-        <!-- Bundle jre -->
+-        <echo>Bundling JRE with jdeps and jlink...</echo>
+-        <jlink java.bindir="${java.home}/bin" />
+-
+         <!-- Create the .sh run script -->
+         <copy file="${packagefiles.dir}/hdfview.sh.in" tofile="${release.dir}/hdfview.sh" />
+ 
+@@ -1611,10 +1562,6 @@
+ 
+             <tarfileset dir="${release.dir}/share" prefix="${ant.project.name}/${app.version}/share" filemode="666" />
+ 
+-            <tarfileset dir="${release.dir}/jre" prefix="${ant.project.name}/${app.version}/jre" filemode="755">
+-                <include name="**" />
+-            </tarfileset>
+-
+             <tarfileset dir="${release.dir}" prefix="${ant.project.name}/${app.version}" filemode="755">
+                 <include name="*.sh" />
+             </tarfileset>
diff --git a/license b/license
deleted file mode 100644
index 056c8f762de9..000000000000
--- a/license
+++ /dev/null
@@ -1,89 +0,0 @@
-Copyright Notice and License Terms for 
-HDF Java Products
------------------------------------------------------------------------------
-
-HDF Java Products
-Copyright 2006-2011 by The HDF Group.
-
-NCSA HDF Java Products
-Copyright 1988-2006 by the Board of Trustees of the University of Illinois.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted for any purpose (including commercial purposes)
-provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions, and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions, and the following disclaimer in the documentation
-   and/or materials provided with the distribution.
-
-3. In addition, redistributions of modified forms of the source or binary
-   code must carry prominent notices stating that the original code was
-   changed and the date of the change.
-
-4. All publications or advertising materials mentioning features or use of 
-   this software are asked, but not required, to acknowledge that it was 
-   developed by The HDF Group and by the National Center for Supercomputing 
-   Applications at the University of Illinois at Urbana-Champaign and 
-   credit the contributors.
-
-5. Neither the name of The HDF Group, the name of the University, nor the 
-   name of any Contributor may be used to endorse or promote products derived 
-   from this software without specific prior written permission from The HDF 
-   Group, the University, or the Contributor, respectively.
-
-DISCLAIMER: 
-THIS SOFTWARE IS PROVIDED BY THE HDF GROUP AND THE CONTRIBUTORS "AS IS" 
-WITH NO WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED.  In no event 
-shall The HDF Group or the Contributors be liable for any damages suffered 
-by the users arising out of the use of this software, even if advised of 
-the possibility of such damage. 
-
---------------------------------------------------------------------------
---------------------------------------------------------------------------
-
-Contributors: National Center for Supercomputing Applications (NCSA) at 
-the University of Illinois, Lawrence Livermore National Laboratory (LLNL), 
-Sandia National Laboratories (SNL), Los Alamos National Laboratory (LANL), 
-Fortner Software, Unidata Program Center (netCDF), The Independent JPEG 
-Group (JPEG), Jean-loup Gailly and Mark Adler (gzip), and Digital Equipment 
-Corporation (DEC). 
-
---------------------------------------------------------------------------
-
-Portions of the HDF Java Products were developed with support from the 
-University of California, Lawrence Livermore National Laboratory (UC LLNL).
-The following statement applies to those portions of the product
-and must be retained in any redistribution of source code, binaries,
-documentation, and/or accompanying materials:
-
-    This work was partially produced at the University of California,
-    Lawrence Livermore National Laboratory (UC LLNL) under contract no.
-    W-7405-ENG-48 (Contract 48) between the U.S. Department of Energy 
-    (DOE) and The Regents of the University of California (University) 
-    for the operation of UC LLNL.
-
-    DISCLAIMER:
-    This work was prepared as an account of work sponsored by an agency 
-    of the United States Government.  Neither the United States 
-    Government nor the University of California nor any of their 
-    employees, makes any warranty, express or implied, or assumes any 
-    liability or responsibility for the accuracy, completeness, or 
-    usefulness of any information, apparatus, product, or process 
-    disclosed, or represents that its use would not infringe privately-
-    owned rights.  Reference herein to any specific commercial products, 
-    process, or service by trade name, trademark, manufacturer, or 
-    otherwise, does not necessarily constitute or imply its endorsement, 
-    recommendation, or favoring by the United States Government or the 
-    University of California.  The views and opinions of authors 
-    expressed herein do not necessarily state or reflect those of the 
-    United States Government or the University of California, and shall 
-    not be used for advertising or product endorsement purposes.
-
---------------------------------------------------------------------------
-
-