From 0a62ec7b341def792c5dac01940280d75492ffc3 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Sat, 7 Sep 2019 23:43:42 +0200
Subject: [PATCH] kde/qmlkonsole: clean-up packaging (!601)

---
 kde/qmlkonsole/APKBUILD | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/kde/qmlkonsole/APKBUILD b/kde/qmlkonsole/APKBUILD
index c43ef202b..2146f8495 100644
--- a/kde/qmlkonsole/APKBUILD
+++ b/kde/qmlkonsole/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qmlkonsole
 pkgver=0_git20190224
-pkgrel=0
+pkgrel=1
 _commit="eac8318020e3881dac6d930fefd278b1f4a98617"
 pkgdesc="Terminal app for Plasma Mobile"
 arch="all"
@@ -10,28 +10,32 @@ url="https://invent.kde.org/jbbgameich/qmlkonsole"
 license="GPL-3.0-or-later"
 depends="qmltermwidget"
 makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtsvg-dev qt5-qtquickcontrols2-dev"
-source="https://invent.kde.org/jbbgameich/$pkgname/-/archive/$_commit/$pkgname-$_commit.tar.gz"
-builddir="$srcdir/$pkgname-$_commit/build"
+source="https://invent.kde.org/jbbgameich/qmlkonsole/-/archive/$_commit/qmlkonsole-$_commit.tar.gz"
+options="!check" # No tests
+builddir="$srcdir/$pkgname-$_commit"
 
 prepare() {
-	mkdir "$builddir"
+	default_prepare
+
+	mkdir "$builddir"/build
 }
 
 build() {
-	cd "$builddir"
-	cmake .. \
-		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-		-DCMAKE_INSTALL_PREFIX=/usr
+	cd "$builddir"/build
+	cmake "$builddir" \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib
 	make
 }
 
 check() {
-	cd "$builddir"
+	cd "$builddir"/build
 	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	cd "$builddir"
+	cd "$builddir"/build
 	DESTDIR="$pkgdir" make install
 }