From 0c5b26444fd47efa86c29f8a0661ab601f6a8ddd Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Mon, 6 Jan 2020 00:11:58 +0000
Subject: user/*: Modernise / fix syntax / deps / mark no-check where
 applicable

---
 user/lxqt-session/APKBUILD | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'user/lxqt-session')

diff --git a/user/lxqt-session/APKBUILD b/user/lxqt-session/APKBUILD
index e3a44a552..d6cc987a0 100644
--- a/user/lxqt-session/APKBUILD
+++ b/user/lxqt-session/APKBUILD
@@ -6,6 +6,7 @@ pkgrel=0
 pkgdesc="Session management utilities for LXQt"
 url="https://lxqt.org"
 arch="all"
+options="!check"  # No test suite.
 license="LGPL-2.1+"
 depends="xdg-user-dirs"
 makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 eudev-dev
@@ -14,11 +15,9 @@ subpackages="$pkgname-doc"
 source="https://github.com/lxde/lxqt-session/releases/download/$pkgver/lxqt-session-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
-	mkdir -p build && cd build
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
@@ -26,18 +25,16 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS} ..
-	make
+		${CMAKE_CROSSOPTS} -Bbuild
+	make -C build
 }
 
 check() {
-	cd "$builddir"/build
-	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+	CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
 }
 
 package() {
-	cd "$builddir"/build
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C build install
 	rm "$pkgdir"/usr/bin/startlxqt
 	rm "$pkgdir"/usr/share/man/man1/start*
 }
-- 
cgit v1.2.3-70-g09d2