From 2ceb6f3abca081464614cf99a42ae76c396c8f26 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 15 Aug 2019 16:05:09 +0000
Subject: user/[KDE Applications]: Bump to 19.08.0

---
 user/artikulate/APKBUILD               | 17 +++++++++--------
 user/artikulate/inappropriate-qt.patch | 22 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 user/artikulate/inappropriate-qt.patch

(limited to 'user/artikulate')

diff --git a/user/artikulate/APKBUILD b/user/artikulate/APKBUILD
index be64c9b58..9e99cafe4 100644
--- a/user/artikulate/APKBUILD
+++ b/user/artikulate/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=artikulate
-pkgver=19.04.3
+pkgver=19.08.0
 pkgrel=0
 pkgdesc="Pronunciation trainer for languages"
 url="https://www.kde.org/applications/education/artikulate/"
@@ -9,13 +9,14 @@ arch="all"
 license="GPL-2.0-only"
 depends=""
 makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtxmlpatterns-dev
-	kdoctools-dev ki18n-dev kconfig-dev kcrash-dev knewstuff-dev
-	kxmlgui-dev karchive-dev qt5-qtmultimedia-dev"
+	karchive-dev kconfig-dev kcrash-dev kdoctools-dev ki18n-dev
+	kirigami2-dev knewstuff-dev kxmlgui-dev qt5-qtmultimedia-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/artikulate-$pkgver.tar.xz"
+source="https://download.kde.org/stable/applications/$pkgver/src/artikulate-$pkgver.tar.xz
+	inappropriate-qt.patch
+	"
 
 build() {
-	cd "$builddir"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
@@ -26,19 +27,19 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
+		-DBUILD_TESTING=OFF \
 		${CMAKE_CROSSOPTS}
 	make
 }
 
 check() {
-	cd "$builddir"
 	# TestCourseFiles needs X11
 	CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E TestCourseFiles
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="b61cb3514839c9d6af09f8be950528ff08cab827c27e338cf92972aee7f8811032113f0fc8fe1b5cabe11b4ba689c7d10870a90fdb830c32fc565c879adfc939  artikulate-19.04.3.tar.xz"
+sha512sums="dbd4cd9069c81e51053b6b90b6fbd089ee9594d5d9ba1ff4c87aee5f0f1f4931847438b7546eea54293fce1746d6c1bf69080c8519a76b83ce3c7149c5c79393  artikulate-19.08.0.tar.xz
+dd9a912f7499fee5a7d737f987ba97856e373d48d944d45fb2cfaf192bc5c79f05dc530f0ca62d5982ef86dcf1479211186657ecef0450c07a43527bd66eb7c8  inappropriate-qt.patch"
diff --git a/user/artikulate/inappropriate-qt.patch b/user/artikulate/inappropriate-qt.patch
new file mode 100644
index 000000000..fe88499bd
--- /dev/null
+++ b/user/artikulate/inappropriate-qt.patch
@@ -0,0 +1,22 @@
+--- artikulate-19.08.0/CMakeLists.txt.old	2019-08-09 00:13:40.000000000 +0000
++++ artikulate-19.08.0/CMakeLists.txt	2019-08-15 12:16:43.965261084 +0000
+@@ -42,7 +42,7 @@
+ include(FeatureSummary)
+ include(GenerateExportHeader)
+ 
+-find_package(Qt5 5.10 REQUIRED COMPONENTS
++find_package(Qt5 5.9.7 REQUIRED COMPONENTS
+     Widgets
+     Sql
+     XmlPatterns
+--- artikulate-19.08.0/CMakeLists.txt.old	2019-08-15 12:17:13.502105634 +0000
++++ artikulate-19.08.0/CMakeLists.txt	2019-08-15 12:17:51.957997353 +0000
+@@ -51,7 +51,7 @@
+     QuickWidgets
+     Test
+ )
+-find_package(KF5 5.57 REQUIRED COMPONENTS
++find_package(KF5 5.54 REQUIRED COMPONENTS
+     Archive
+     Config
+     Crash
-- 
cgit v1.2.3-60-g2f50