summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Whitfield2017-08-07 12:17:31 -0400
committerRoss Whitfield2017-08-07 12:17:31 -0400
commit7bebaf3082c5001eae9541bd019fc6fc84dea3ae (patch)
tree387bf468980e7b83e6a028d55196086d96742bcd
parentbbf144ac06d147b0a6afba83cef3d4ce5921dd90 (diff)
downloadaur-7bebaf3082c5001eae9541bd019fc6fc84dea3ae.tar.gz
Update to v3.10.1
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD22
2 files changed, 17 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ef596f6a884a..8662d4f56250 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Mon Jul 25 14:18:32 UTC 2016
pkgbase = mantid
pkgdesc = Data analysis toolkit for neutron based instrument data
- pkgver = 3.7.1
+ pkgver = 3.10.1
pkgrel = 1
url = http://www.mantidproject.org/
arch = x86_64
@@ -25,10 +23,12 @@ pkgbase = mantid
depends = python2-pyzmq
depends = python2-scipy
depends = python2-sip
- depends = hdf5-cpp-fortran
+ depends = hdf5
depends = gsl
- source = mantid::git://github.com/mantidproject/mantid.git#tag=v3.7.1
+ source = mantid::git+https://github.com/mantidproject/mantid.git#tag=v3.10.1
+ source = https://github.com/mantidproject/mantid/pull/19889.patch
sha1sums = SKIP
+ sha1sums = cf774c353e3487a9770eeb7652dc87abb66c56f4
pkgname = mantid
diff --git a/PKGBUILD b/PKGBUILD
index bab09b817c79..4eb5f09ecfee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
-# Maintainer: Harry Jeffery <harry|@|exec64|.|co|.|uk>
+# Maintainer: Ross Whitfield <whitfieldre@ornl.gov>
+# Contributor: Harry Jeffery <harry|@|exec64|.|co|.|uk>
pkgname=mantid
-pkgver=3.7.1
+pkgver=3.10.1
pkgrel=1
pkgdesc="Data analysis toolkit for neutron based instrument data"
url="http://www.mantidproject.org/"
@@ -24,19 +25,22 @@ depends=(
'python2-pyzmq'
'python2-scipy'
'python2-sip'
- 'hdf5-cpp-fortran'
+ 'hdf5'
'gsl'
)
makedepends=('cmake')
-source=("$pkgname::git://github.com/mantidproject/mantid.git#tag=v${pkgver}")
-sha1sums=('SKIP')
+source=("$pkgname::git+https://github.com/mantidproject/mantid.git#tag=v${pkgver}"
+ "https://github.com/mantidproject/mantid/pull/19889.patch")
+sha1sums=('SKIP'
+ 'cf774c353e3487a9770eeb7652dc87abb66c56f4')
build() {
+ cd "${srcdir}/mantid"
+ patch -p1 -i "${srcdir}/19889.patch"
mkdir -p "${srcdir}/build"
cd "${srcdir}/build"
- cmake -DENABLE_OPENCASCADE=OFF \
- -DPYTHON_EXECUTABLE=/usr/bin/python2 \
- -DPYQT4_SIP_DIR=/usr/share/sip/PyQt4 \
+ cmake -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+ -DCMAKE_CXX_VISIBILITY_PRESET=default \
"${srcdir}/mantid"
make
}
@@ -45,5 +49,3 @@ package() {
cd "${srcdir}/build"
make DESTDIR="${pkgdir}" install
}
-
-# vim:set ts=2 sw=2 et: