summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Berquist2022-03-25 22:32:07 -0400
committerEric Berquist2022-03-25 22:32:07 -0400
commit6091e405d7addf55ca05bfbe519c0c232f997b46 (patch)
treed3b79d0fb6faca38701a4aa7b296230d656739ec
parent039733245a24b4f9aad4ca0f8c8ce52f185b94b4 (diff)
downloadaur-6091e405d7addf55ca05bfbe519c0c232f997b46.tar.gz
fix Git URL, remove VTK, fix dependency lists
-rw-r--r--.SRCINFO17
-rw-r--r--PKGBUILD19
2 files changed, 17 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b4079556047b..c762bb05c8c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,17 @@
pkgbase = avogadrolibs-git
pkgdesc = Avogadro 2: libraries
- pkgver = 1.93.0.r1935.926573b1
- pkgrel = 2
+ pkgver = 1.95.1.r2510.eb54b42c
+ pkgrel = 1
url = http://openchemistry.org/projects/avogadro2
arch = x86_64
license = Kitware
+ checkdepends = gtest
makedepends = git
makedepends = cmake
makedepends = eigen
- makedepends = gtest
- makedepends = gdal
- makedepends = openmpi
- makedepends = msgpack-c
depends = libarchive
depends = glew
depends = hdf5
- depends = vtk
depends = libmsym
depends = spglib
depends = libmmtf
@@ -25,9 +21,12 @@ pkgbase = avogadrolibs-git
depends = pybind11
depends = python-cclib
provides = avogadrolibs
+ provides = avogadro-crystals
+ provides = avogadro-molecules
conflicts = avogadrolibs
- source = git://github.com/OpenChemistry/avogadrolibs.git
+ conflicts = avogadro-crystals
+ conflicts = avogadro-molecules
+ source = git+https://github.com/OpenChemistry/avogadrolibs.git
sha256sums = SKIP
pkgname = avogadrolibs-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 13cfe2ac8a29..45821886b031 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,19 +2,18 @@
_pkgname=avogadrolibs
pkgname="${_pkgname}-git"
-pkgver=1.93.0.r1935.926573b1
-pkgrel=2
+pkgver=1.95.1.r2510.eb54b42c
+pkgrel=1
pkgdesc="Avogadro 2: libraries"
url="http://openchemistry.org/projects/avogadro2"
arch=("x86_64")
license=("Kitware")
-depends=("libarchive" "glew" "hdf5" "vtk" "libmsym" "spglib" "libmmtf" "qt5-webview" "qt5-x11extras" "molequeue" "pybind11" "python-cclib")
-# gdal is for proj, which is optional for VTK but required here? same for openmpi
-# `msgpack-c` is a workaround for the broken libmmtf PKGBUILD
-makedepends=("git" "cmake" "eigen" "gtest" "gdal" "openmpi" "msgpack-c")
-conflicts=("${_pkgname}")
-provides=("${_pkgname}")
-source=("git://github.com/OpenChemistry/${_pkgname}.git")
+depends=("libarchive" "glew" "hdf5" "libmsym" "spglib" "libmmtf" "qt5-webview" "qt5-x11extras" "molequeue" "pybind11" "python-cclib")
+makedepends=("git" "cmake" "eigen")
+checkdepends=("gtest")
+conflicts=("${_pkgname}" avogadro-crystals avogadro-molecules)
+provides=("${_pkgname}" avogadro-crystals avogadro-molecules)
+source=("git+https://github.com/OpenChemistry/${_pkgname}.git")
sha256sums=("SKIP")
pkgver() {
@@ -35,7 +34,7 @@ build() {
-DBUILD_SHARED_LIBS=ON \
-DENABLE_TESTING=ON \
-DUSE_HDF5=ON \
- -DUSE_VTK=ON \
+ -DUSE_VTK=OFF \
-DUSE_MMTF=ON \
-DUSE_PYTHON=ON \
-DPYTHON_EXECUTABLE=/usr/bin/python \