summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Wilson2019-03-21 20:18:31 +0000
committerMartin Wilson2019-03-21 20:18:31 +0000
commitfbc2ac24c7df64bfed33e04908001dba323fc312 (patch)
treef58ef9d20c7baa8a3faecbd8e5a9623f89d55f72
parent0c5fc35aec02a5f57deedd8f20126e3cfb7807e1 (diff)
downloadaur-fbc2ac24c7df64bfed33e04908001dba323fc312.tar.gz
improvements
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD17
2 files changed, 13 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e75d5ec1076a..0a7692e83939 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,8 +13,10 @@ pkgbase = tarquin
depends = fftw
depends = gnuplot
depends = qwt5
- source = https://github.com/martin3141/tarquin/archive/v4.3.12.tar.gz
+ source = tarquin-4.3.12.tar.gz::https://github.com/martin3141/tarquin/archive/v4.3.12.tar.gz
+ source = CMakeListsPatch.txt
md5sums = 9886ccd6eaaa35b7b60a26fd56cafecd
+ md5sums = 37e29d28404757eee761507121543609
pkgname = tarquin
diff --git a/PKGBUILD b/PKGBUILD
index 2ca15eb56853..9eee18bf11cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,16 +9,21 @@ url="http://tarquin.sourceforge.net/"
license=("GPL")
depends=("lapack" "protobuf" "fftw" "gnuplot" "qwt5")
makedepends=("cmake" "gcc-fortran" "boost")
-source=("https://github.com/martin3141/tarquin/archive/v$pkgver.tar.gz")
-md5sums=("9886ccd6eaaa35b7b60a26fd56cafecd")
+source=("$pkgname-$pkgver.tar.gz::https://github.com/martin3141/tarquin/archive/v$pkgver.tar.gz" "CMakeListsPatch.txt")
+md5sums=("9886ccd6eaaa35b7b60a26fd56cafecd" "37e29d28404757eee761507121543609")
prepare() {
# patch master CMakeLists.txt
cd "$srcdir"/$pkgname-$pkgver/src
- patch -Np0 -i ../../../CMakeListsPatch.txt
+ patch -Np0 -i "$srcdir"/CMakeListsPatch.txt
+
# update protobuf files
cd "$srcdir"/$pkgname-$pkgver/src/common
- ./gen_proto.sh
+ protoc tarquin.proto --cpp_out=./
+ sed 's/tarquin.pb.h/tarquin_pb.hpp/g' tarquin.pb.cc > tarquin_pb.cpp
+ rm tarquin.pb.cc
+ mv tarquin.pb.h tarquin_pb.hpp
+
# make the build directory
cd "$srcdir"/$pkgname-$pkgver/src
mkdir -p build
@@ -31,7 +36,5 @@ build() {
}
package() {
- mkdir -p "$pkgdir"/usr/bin
- cp "$srcdir"/$pkgname-$pkgver/src/build/redist/tarquin "$pkgdir"/usr/bin
- cp "$srcdir"/$pkgname-$pkgver/src/build/redist/tarquingui "$pkgdir"/usr/bin
+ install -Dm755 "$srcdir/$pkgname-$pkgver/src/build/redist/"tarquin{,gui} -t "$pkgdir"/usr/bin
}