summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Berquist2018-05-11 19:43:56 -0400
committerEric Berquist2018-05-11 19:43:56 -0400
commitb9466a34f0077f047965e98b43f9584372eafccf (patch)
tree03df9983ba6cc910d4fb067743853e038c168814
parentf159465c09e1c7be69bc8c94a8232f53e6d7c197 (diff)
downloadaur-b9466a34f0077f047965e98b43f9584372eafccf.tar.gz
CMake naming patch no longer necessary
-rw-r--r--.SRCINFO8
-rw-r--r--CMakeLists.patch13
-rw-r--r--PKGBUILD15
3 files changed, 7 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 871ba2f3bbde..799501cad5b2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Thu Apr 5 23:50:42 UTC 2018
+# Fri May 11 23:42:58 UTC 2018
pkgbase = avogadrolibs-git
pkgdesc = Avogadro 2: libraries
- pkgver = 1.90.0.r1435.c23bc81
- pkgrel = 8
+ pkgver = 1.90.0.r1455.65b22f8
+ pkgrel = 1
url = http://openchemistry.org/projects/avogadro2
arch = i686
arch = x86_64
@@ -28,9 +28,7 @@ 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
deleted file mode 100644
index 6782e916ae71..000000000000
--- a/CMakeLists.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 9db4cece4149..f6f64803531c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
_pkgname=avogadrolibs
pkgname="${_pkgname}-git"
-pkgver=1.90.0.r1435.c23bc81
-pkgrel=8
+pkgver=1.90.0.r1455.65b22f8
+pkgrel=1
pkgdesc="Avogadro 2: libraries"
url="http://openchemistry.org/projects/avogadro2"
arch=("i686" "x86_64")
@@ -13,10 +13,8 @@ depends=("libarchive" "glew" "hdf5" "vtk" "libmsym" "spglib" "qt5-webview" "qt5-
makedepends=("git" "cmake" "eigen" "gtest" "gdal" "openmpi")
conflicts=("${_pkgname}")
provides=("${_pkgname}")
-source=("git://github.com/OpenChemistry/${_pkgname}.git"
- "CMakeLists.patch")
-sha256sums=("SKIP"
- "0717b0aead3c913620207b41bcfe867cd947491a495906ba9c3632744ac60a05")
+source=("git://github.com/OpenChemistry/${_pkgname}.git")
+sha256sums=("SKIP")
pkgver() {
cd "${srcdir}/${_pkgname}"
@@ -26,11 +24,6 @@ pkgver() {
"$(git rev-parse --short HEAD)"
}
-prepare() {
- cd "${srcdir}/${_pkgname}"
- patch -p1 -i "${srcdir}"/CMakeLists.patch
-}
-
build() {
cd "${srcdir}/${_pkgname}"
cmake \