summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorwillemw122021-06-25 09:51:31 +0200
committerwillemw122021-06-25 09:51:31 +0200
commit2632b8fa7becc3d6b46a00cfb4056b9c71fa48a3 (patch)
tree290669761f963b98e1482d5265c8ba49faf5810b
parentf2413f59ea9db51f8820587a42403ad70dea234e (diff)
downloadaur-2632b8fa7becc3d6b46a00cfb4056b9c71fa48a3.tar.gz
Update cmake build
Change prepare()
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD17
2 files changed, 6 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 68dffc713199..dcaf0ddcbf83 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -19,6 +19,6 @@ pkgbase = vocal-git
provides = vocal
conflicts = vocal
source = vocal-git::git+https://github.com/needle-and-thread/vocal.git
- md5sums = SKIP
+ sha256sums = SKIP
pkgname = vocal-git
diff --git a/PKGBUILD b/PKGBUILD
index 05fa50f95678..fa870710ee4e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ makedepends=('cmake' 'git' 'vala')
provides=("${pkgname%-git}")
conflicts=("${pkgname%-git}")
source=($pkgname::git+https://github.com/needle-and-thread/vocal.git)
-md5sums=('SKIP')
+sha256sums=('SKIP')
pkgver() {
cd $pkgname
@@ -24,23 +24,16 @@ pkgver() {
}
prepare() {
- cd $pkgname
-
- rm -rf build
- mkdir build
-
# Patch: fix build with granite 6 by disabling the About dialog (https://github.com/needle-and-thread/vocal/issues/483)
- sed -i 's/controller.app.show_about (this);//' src/MainWindow.vala
+ sed -i 's/controller.app.show_about (this);//' $pkgname/src/MainWindow.vala
}
build() {
- cd $pkgname/build
- cmake .. -DCMAKE_INSTALL_PREFIX=/usr # -DGSETTINGS_COMPILE=0 -DGSETTINGS_LOCALINSTALL=1
- make
+ cmake -B build -S $pkgname -DCMAKE_BUILD_TYPE=None -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev # -DGSETTINGS_COMPILE=0 -DGSETTINGS_LOCALINSTALL=1
+ make -C build
}
package() {
- cd $pkgname/build
- make DESTDIR="$pkgdir/" install
+ make -C build DESTDIR="$pkgdir/" install
}