summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Berquist2018-04-06 14:41:46 -0400
committerEric Berquist2018-04-06 14:41:46 -0400
commitf159465c09e1c7be69bc8c94a8232f53e6d7c197 (patch)
treecd61e1af2fb870f9f9c896f6dffd0f9bdad23724
parente5403a12e7e2c2e67afc82c5bbca68e6a7598aaf (diff)
downloadaur-f159465c09e1c7be69bc8c94a8232f53e6d7c197.tar.gz
Enable usage of libmsym
-rw-r--r--.SRCINFO9
-rw-r--r--CMakeLists.patch13
-rw-r--r--PKGBUILD19
3 files changed, 32 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 94c79c173c63..871ba2f3bbde 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sat Mar 31 17:37:37 UTC 2018
+# Thu Apr 5 23:50:42 UTC 2018
pkgbase = avogadrolibs-git
pkgdesc = Avogadro 2: libraries
- pkgver = 1.90.0.r1421.7e5b184
- pkgrel = 7
+ pkgver = 1.90.0.r1435.c23bc81
+ pkgrel = 8
url = http://openchemistry.org/projects/avogadro2
arch = i686
arch = x86_64
@@ -18,6 +18,7 @@ pkgbase = avogadrolibs-git
depends = glew
depends = hdf5
depends = vtk
+ depends = libmsym
depends = spglib
depends = qt5-webview
depends = qt5-x11extras
@@ -27,7 +28,9 @@ pkgbase = avogadrolibs-git
provides = avogadrolibs
conflicts = avogadrolibs
source = git://github.com/OpenChemistry/avogadrolibs.git
+ source = CMakeLists.patch
sha256sums = SKIP
+ sha256sums = 0717b0aead3c913620207b41bcfe867cd947491a495906ba9c3632744ac60a05
pkgname = avogadrolibs-git
diff --git a/CMakeLists.patch b/CMakeLists.patch
new file mode 100644
index 000000000000..6782e916ae71
--- /dev/null
+++ b/CMakeLists.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c2b9393..7574fa0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -98,7 +98,7 @@ install(FILES
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindEigen3.cmake"
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindGLEW.cmake"
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindLibArchive.cmake"
+- "${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindLibmsym.cmake"
++ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Findlibmsym.cmake"
+ DESTINATION "${INSTALL_LIBRARY_DIR}/cmake/avogadrolibs")
+ install(EXPORT "AvogadroLibsTargets"
+ DESTINATION "${INSTALL_LIBRARY_DIR}/cmake/avogadrolibs")
diff --git a/PKGBUILD b/PKGBUILD
index 7db5bdbeab71..9db4cece4149 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,19 +2,21 @@
_pkgname=avogadrolibs
pkgname="${_pkgname}-git"
-pkgver=1.90.0.r1421.7e5b184
-pkgrel=7
+pkgver=1.90.0.r1435.c23bc81
+pkgrel=8
pkgdesc="Avogadro 2: libraries"
url="http://openchemistry.org/projects/avogadro2"
arch=("i686" "x86_64")
license=("Kitware")
-depends=("libarchive" "glew" "hdf5" "vtk" "spglib" "qt5-webview" "qt5-x11extras" "molequeue" "python" "pybind11")
+depends=("libarchive" "glew" "hdf5" "vtk" "libmsym" "spglib" "qt5-webview" "qt5-x11extras" "molequeue" "python" "pybind11")
# gdal is for proj, which is optional for VTK but required here? same for openmpi
makedepends=("git" "cmake" "eigen" "gtest" "gdal" "openmpi")
conflicts=("${_pkgname}")
provides=("${_pkgname}")
-source=("git://github.com/OpenChemistry/${_pkgname}.git")
-sha256sums=("SKIP")
+source=("git://github.com/OpenChemistry/${_pkgname}.git"
+ "CMakeLists.patch")
+sha256sums=("SKIP"
+ "0717b0aead3c913620207b41bcfe867cd947491a495906ba9c3632744ac60a05")
pkgver() {
cd "${srcdir}/${_pkgname}"
@@ -24,6 +26,11 @@ pkgver() {
"$(git rev-parse --short HEAD)"
}
+prepare() {
+ cd "${srcdir}/${_pkgname}"
+ patch -p1 -i "${srcdir}"/CMakeLists.patch
+}
+
build() {
cd "${srcdir}/${_pkgname}"
cmake \
@@ -36,7 +43,7 @@ build() {
-DUSE_HDF5:BOOL=ON \
-DUSE_QT:BOOL=ON \
-DUSE_VTK:BOOL=ON \
- -DUSE_LIBMSYM:BOOL=OFF \
+ -DUSE_LIBMSYM:BOOL=ON \
-DUSE_LIBSPG:BOOL=ON \
-DUSE_PROTOCALL:BOOL=OFF \
-DUSE_MOLEQUEUE:BOOL=ON \