From ed5c897462a687dc046b4cdcda69f8d108e1b28c Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 31 Dec 2019 18:01:07 +0000
Subject: user/[KDE Education]: Bump to 19.12.0

Excludes user/rocs since it requires Qt WebKit.
---
 user/artikulate/APKBUILD               | 11 ++++-------
 user/artikulate/inappropriate-qt.patch | 22 ----------------------
 2 files changed, 4 insertions(+), 29 deletions(-)
 delete mode 100644 user/artikulate/inappropriate-qt.patch

(limited to 'user/artikulate')

diff --git a/user/artikulate/APKBUILD b/user/artikulate/APKBUILD
index f114f16bb..6650211cf 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.08.2
+pkgver=19.12.0
 pkgrel=0
 pkgdesc="Pronunciation trainer for languages"
 url="https://www.kde.org/applications/education/artikulate/"
@@ -12,9 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtxmlpatterns-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
-	inappropriate-qt.patch
-	"
+source="https://download.kde.org/stable/release-service/$pkgver/src/artikulate-$pkgver.tar.xz"
 
 build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
@@ -28,7 +26,7 @@ build() {
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
 		-DBUILD_TESTING=OFF \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
@@ -41,5 +39,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="72e4d0bfaa88b4133964f07fe2e20d9f2cc0bee718388fe56f1f1518f75acf31b4068fa87e652c370e18e6b53addce3414430ee43c9118782925c55bb2536dc6  artikulate-19.08.2.tar.xz
-dd9a912f7499fee5a7d737f987ba97856e373d48d944d45fb2cfaf192bc5c79f05dc530f0ca62d5982ef86dcf1479211186657ecef0450c07a43527bd66eb7c8  inappropriate-qt.patch"
+sha512sums="3c06b2764812cf4f816a75b47f30e45a81b65df82a554a9b52c1116dd3e6e8713e16dd03cc3ac843d1419c55300c8f21c985ce05b27d76a6d2dd49d06080e802  artikulate-19.12.0.tar.xz"
diff --git a/user/artikulate/inappropriate-qt.patch b/user/artikulate/inappropriate-qt.patch
deleted file mode 100644
index fe88499bd..000000000
--- a/user/artikulate/inappropriate-qt.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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-70-g09d2