summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Berquist2020-09-05 20:37:00 -0400
committerEric Berquist2020-09-05 20:37:00 -0400
commit41a4ff896043f15a68fdd59eb3126d21309946a3 (patch)
tree2029cd3d16acbd973344f33c5b61213446c3504d
parentbb61c1c28fa91f1d5a3d81af8b29eddba37b5dce (diff)
downloadaur-41a4ff896043f15a68fdd59eb3126d21309946a3.tar.gz
HDF5 support follows the 1.10.x API
-rw-r--r--.SRCINFO4
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD11
-rw-r--r--hdf5_110.patch13
4 files changed, 25 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 027adf77cfb3..29fe4f7a4bba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = avogadrolibs-git
pkgdesc = Avogadro 2: libraries
- pkgver = 1.93.0.r1846.cdfdf9bd
+ pkgver = 1.93.0.r1889.e169315d
pkgrel = 1
url = http://openchemistry.org/projects/avogadro2
arch = x86_64
@@ -27,7 +27,9 @@ pkgbase = avogadrolibs-git
provides = avogadrolibs
conflicts = avogadrolibs
source = git://github.com/OpenChemistry/avogadrolibs.git
+ source = hdf5_110.patch
sha256sums = SKIP
+ sha256sums = 9af8f4b74367debe1ebe4e6bac4434d901958fdcf2375462e9c932d826603266
pkgname = avogadrolibs-git
diff --git a/.gitignore b/.gitignore
index ca8dcac5921b..c760b3e8a872 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ pkg/
src/
*.log
*.xz
+*.zst
# source files
avogadrolibs
diff --git a/PKGBUILD b/PKGBUILD
index d60ee062ad68..5628c24e47b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
_pkgname=avogadrolibs
pkgname="${_pkgname}-git"
-pkgver=1.93.0.r1846.cdfdf9bd
+pkgver=1.93.0.r1889.e169315d
pkgrel=1
pkgdesc="Avogadro 2: libraries"
url="http://openchemistry.org/projects/avogadro2"
@@ -14,8 +14,10 @@ depends=("libarchive" "glew" "hdf5" "vtk" "libmsym" "spglib" "libmmtf" "qt5-webv
makedepends=("git" "cmake" "eigen" "gtest" "gdal" "openmpi" "msgpack-c")
conflicts=("${_pkgname}")
provides=("${_pkgname}")
-source=("git://github.com/OpenChemistry/${_pkgname}.git")
-sha256sums=("SKIP")
+source=("git://github.com/OpenChemistry/${_pkgname}.git"
+ "hdf5_110.patch")
+sha256sums=("SKIP"
+ "9af8f4b74367debe1ebe4e6bac4434d901958fdcf2375462e9c932d826603266")
pkgver() {
cd "${srcdir}/${_pkgname}"
@@ -26,6 +28,9 @@ pkgver() {
}
prepare() {
+ cd "${srcdir}/${_pkgname}"
+ patch -p1 -i "${srcdir}"/hdf5_110.patch
+
mkdir -p "${srcdir}"/build
}
diff --git a/hdf5_110.patch b/hdf5_110.patch
new file mode 100644
index 000000000000..f581221f7e26
--- /dev/null
+++ b/hdf5_110.patch
@@ -0,0 +1,13 @@
+diff --git a/avogadro/io/CMakeLists.txt b/avogadro/io/CMakeLists.txt
+index dec9b7b9..b5d20227 100644
+--- a/avogadro/io/CMakeLists.txt
++++ b/avogadro/io/CMakeLists.txt
+@@ -14,7 +14,7 @@ if(USE_HDF5)
+ set(HDF5_LIBRARIES "hdf5")
+ endif()
+ include_directories(SYSTEM "${HDF5_INCLUDE_DIRS}")
+- add_definitions(-DAVO_USE_HDF5)
++ add_definitions(-DAVO_USE_HDF5 -DH5_USE_110_API)
+ endif()
+
+ # Add as "system headers" to avoid warnings generated by them with