diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | hdf5_110.patch | 13 |
3 files changed, 4 insertions, 28 deletions
@@ -1,6 +1,6 @@ pkgbase = avogadrolibs-git pkgdesc = Avogadro 2: libraries - pkgver = 1.93.0.r1889.e169315d + pkgver = 1.93.0.r1935.926573b1 pkgrel = 1 url = http://openchemistry.org/projects/avogadro2 arch = x86_64 @@ -27,9 +27,7 @@ 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 @@ -2,7 +2,7 @@ _pkgname=avogadrolibs pkgname="${_pkgname}-git" -pkgver=1.93.0.r1889.e169315d +pkgver=1.93.0.r1935.926573b1 pkgrel=1 pkgdesc="Avogadro 2: libraries" url="http://openchemistry.org/projects/avogadro2" @@ -14,10 +14,8 @@ 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" - "hdf5_110.patch") -sha256sums=("SKIP" - "9af8f4b74367debe1ebe4e6bac4434d901958fdcf2375462e9c932d826603266") +source=("git://github.com/OpenChemistry/${_pkgname}.git") +sha256sums=("SKIP") pkgver() { cd "${srcdir}/${_pkgname}" @@ -27,13 +25,6 @@ pkgver() { "$(git rev-parse --short HEAD)" } -prepare() { - cd "${srcdir}/${_pkgname}" - patch -p1 -i "${srcdir}"/hdf5_110.patch - - mkdir -p "${srcdir}"/build -} - build() { cd "${srcdir}"/build cmake \ diff --git a/hdf5_110.patch b/hdf5_110.patch deleted file mode 100644 index f581221f7e26..000000000000 --- a/hdf5_110.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 |