From 4c66fd861e536f7b7e2e68a78b748cfeb62026c4 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Wed, 1 Jan 2020 20:41:42 +0000
Subject: user/[KDE Graphics]: Bump to 19.12.0 (and Krita)

This bumps Krita to 4.2.8.2, the latest release.

Also removes the Qt 5.9 compat patch for Spectacle.
---
 user/libksane/APKBUILD         | 14 ++++----------
 user/libksane/frameworks.patch | 11 -----------
 2 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 user/libksane/frameworks.patch

(limited to 'user/libksane')

diff --git a/user/libksane/APKBUILD b/user/libksane/APKBUILD
index eae40d780..682c5b9e2 100644
--- a/user/libksane/APKBUILD
+++ b/user/libksane/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libksane
-pkgver=19.08.2
+pkgver=19.12.0
 pkgrel=0
 pkgdesc="KDE scanning library"
 url="https://www.kde.org"
@@ -12,12 +12,9 @@ depends_dev="sane-dev"
 makedepends="$depends_dev cmake extra-cmake-modules qt5-qtbase-dev ki18n-dev
 	ktextwidgets-dev kwallet-dev kwidgetsaddons-dev"
 subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/libksane-$pkgver.tar.xz
-	frameworks.patch
-	"
+source="https://download.kde.org/stable/release-service/$pkgver/src/libksane-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
@@ -28,19 +25,16 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
 check() {
-	cd "$builddir"
 	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="94418deb33f53e227b9269deb43974fb6add9658e5d894d277e5bd467b8c5b526a78419b0775a175ba28d058bf627d5b129f702c6829aa76c357817234956a99  libksane-19.08.2.tar.xz
-60e0e8b073499e932d626a65c5cc23f58d2701921da547733d2736b58c6d412c8d6e782884916390ff16e02183a53ad283712f0bcf2cdcf5a0eb0d7029bb1ba8  frameworks.patch"
+sha512sums="18733ead017660af4741967941df9ff9188b8ad2bee5d15a29b7f452cbd68a94f09ce20e4cc69e7ef993054689a975342b2739cdb49a5118a2078b7148ed5de8  libksane-19.12.0.tar.xz"
diff --git a/user/libksane/frameworks.patch b/user/libksane/frameworks.patch
deleted file mode 100644
index f44ad09db..000000000
--- a/user/libksane/frameworks.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libksane-19.04.0/CMakeLists.txt.old	2019-04-12 00:06:29.000000000 +0000
-+++ libksane-19.04.0/CMakeLists.txt	2019-04-18 22:42:00.675733179 +0000
-@@ -26,7 +26,7 @@
- include(KDECMakeSettings)
- include(GenerateExportHeader)
- 
--set(KF5_VERSION "5.55.0")
-+set(KF5_VERSION "5.54.0")
- 
- ecm_setup_version(
-   ${KF5_VERSION}
-- 
cgit v1.2.3-60-g2f50