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-panel/APKBUILD | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'user/lxqt-panel')

diff --git a/user/lxqt-panel/APKBUILD b/user/lxqt-panel/APKBUILD
index 934554989..8f8a38643 100644
--- a/user/lxqt-panel/APKBUILD
+++ b/user/lxqt-panel/APKBUILD
@@ -6,6 +6,7 @@ pkgrel=0
 pkgdesc="Panel for LXQt desktop"
 url="https://lxqt.org"
 arch="all"
+options="!check"  # No test suite.
 license="LGPL-2.1+"
 depends=""
 makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 kguiaddons-dev
@@ -17,11 +18,9 @@ subpackages="$pkgname-doc"
 source="https://github.com/lxqt/lxqt-panel/releases/download/$pkgver/lxqt-panel-$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 \
@@ -29,18 +28,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
 }
 
 sha512sums="e7cb361a13ac480cda50bc0549d5501f0d4f5bb6c8e257febf81550aaa88c0c55b615762aedb1f03fd654f79efe5aa2590b1dd592f6ae8c7e5a8d08086e0a687  lxqt-panel-0.14.1.tar.xz"
-- 
cgit v1.2.3-60-g2f50