diff options
| author | Eric Berquist | 2018-03-27 15:14:05 -0400 |
|---|---|---|
| committer | Eric Berquist | 2018-03-31 12:20:15 -0400 |
| commit | 408d8f58982dcc829077aabc00bea1da72c48e7d (patch) | |
| tree | dc9e7daab5d648b2e8a0d51ad5d72ebac363bae6 | |
| parent | 974fdbd7ffbb98f770fa532cdddbfcb9e0d0ba6c (diff) | |
| download | aur-408d8f58982dcc829077aabc00bea1da72c48e7d.tar.gz | |
COPYING -> LICENSE, fix versioning, require VTK
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 38 |
3 files changed, 33 insertions, 24 deletions
@@ -1,23 +1,27 @@ # Generated by mksrcinfo v8 -# Sat Jan 21 19:34:40 UTC 2017 +# Sat Mar 31 16:20:09 UTC 2018 pkgbase = avogadrolibs-git pkgdesc = Avogadro 2: libraries - pkgver = 1.90.0.r1254.1f3c3bf - pkgrel = 5 + pkgver = 1.90.0.r1421.7e5b184 + pkgrel = 6 url = http://openchemistry.org/projects/avogadro2 arch = i686 arch = x86_64 license = Kitware makedepends = git makedepends = cmake - makedepends = eigen3 - depends = molequeue + makedepends = gtest + makedepends = gdal + depends = libarchive + depends = eigen3 depends = glew depends = hdf5 - depends = python - depends = boost + depends = vtk depends = spglib depends = qt5-webview + depends = molequeue + depends = python + depends = pybind11 provides = avogadrolibs conflicts = avogadrolibs source = git://github.com/OpenChemistry/avogadrolibs.git diff --git a/.gitignore b/.gitignore index 02aff0e7a424..ca8dcac5921b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # makepkg files pkg/ src/ +*.log *.xz # source files @@ -2,14 +2,15 @@ _pkgname=avogadrolibs pkgname="${_pkgname}-git" -pkgver=1.90.0.r1254.1f3c3bf -pkgrel=5 +pkgver=1.90.0.r1421.7e5b184 +pkgrel=6 pkgdesc="Avogadro 2: libraries" url="http://openchemistry.org/projects/avogadro2" arch=("i686" "x86_64") license=("Kitware") -depends=("molequeue" "glew" "hdf5" "python" "boost" "spglib" "qt5-webview") -makedepends=("git" "cmake" "eigen3") +depends=("libarchive" "eigen3" "glew" "hdf5" "vtk" "spglib" "qt5-webview" "molequeue" "python" "pybind11") +# gdal is for proj, which is optional for VTK but required here? +makedepends=("git" "cmake" "gtest" "gdal") conflicts=("${_pkgname}") provides=("${_pkgname}") source=("git://github.com/OpenChemistry/${_pkgname}.git") @@ -17,40 +18,43 @@ sha256sums=("SKIP") pkgver() { cd "${srcdir}/${_pkgname}" - _parent_ver=$(git log --tags --simplify-by-decoration --pretty="format:%d" | head -n 1 | cut -d " " -f 3 | tr -d ")") printf "%s.r%s.%s" \ - "${_parent_ver}" \ + "$(git describe --tags --abbrev=0)" \ "$(git rev-list --count HEAD)" \ "$(git rev-parse --short HEAD)" } -prepare() { - cd "${srcdir}/${_pkgname}" - - # Find spglib - sed -i 's|NAMES spglib)|NAMES spglib symspg)|' cmake/FindSpglib.cmake -} - build() { cd "${srcdir}/${_pkgname}" cmake \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ -DCMAKE_INSTALL_LIBDIR:PATH=lib \ - -DENABLE_TESTING:BOOL=OFF \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DENABLE_TESTING:BOOL=ON \ + -DUSE_OPENGL:BOOL=ON \ -DUSE_HDF5:BOOL=ON \ - -DUSE_VTK:BOOL=OFF \ + -DUSE_QT:BOOL=ON \ + -DUSE_VTK:BOOL=ON \ + -DUSE_LIBMSYM:BOOL=OFF \ + -DUSE_LIBSPG:BOOL=ON \ + -DUSE_PROTOCALL:BOOL=OFF \ + -DUSE_MOLEQUEUE:BOOL=ON \ + -DUSE_PYTHON:BOOL=ON \ -DPYTHON_EXECUTABLE:PATH=/usr/bin/python \ - -DUSE_BOOST_PYTHON:BOOL=ON \ . make } +check() { + cd "${srcdir}/${_pkgname}" + make test +} + package() { cd "${srcdir}/${_pkgname}" make DESTDIR="${pkgdir}" install - install -D -m 644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" + install -D -m 644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" # Don't install bundled jsoncpp rm "${pkgdir}/usr/lib/libjsoncpp.a" } |