user/[KDE Plasma]: Bump (most of) the rest to 5.12.9

* This also makes wayland required in kscreenlocker again - otherwise
  plasma-workspace FTBFS

7 files changed, 47 insertions, 18 deletions

diff --git a/user/kdeplasma-addons/APKBUILD b/user/kdeplasma-addons/APKBUILD
index 4bd1c3710..fe73e8d36 100644
--- a/user/kdeplasma-addons/APKBUILD
+++ b/user/kdeplasma-addons/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=kdeplasma-addons
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="Extra applets and toys for KDE Plasma"
 url="https://www.kde.org/"
@@ -14,7 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
 	kross-dev krunner-dev kservice-dev kunitconversion-dev
 	kdelibs4support-dev plasma-framework-dev plasma-workspace-dev"
 subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/kdeplasma-addons-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/$pkgver/kdeplasma-addons-$pkgver.tar.xz
+	headers.patch
+	"
 
 build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
@@ -41,4 +43,5 @@ package() {
 	make -C build DESTDIR="$pkgdir" install
 }
 
-sha512sums="3b0a92a90770c718de4065ad9e6f2e7937aa047ecea32ba7c28bf2324d9ad2cd2c825e6bc21a37d494b1d2e5409ba2b4efeaae2be811bee09c9ece2cc3a6941f  kdeplasma-addons-5.12.8.tar.xz"
+sha512sums="82293bb79e88c998b9b052142e2a00de5bdf155c690b61fccca70d9c0c893e123a2b047ed8064a3473877763a72bc9408bfc7df17b3797e99f60e99f1a546756  kdeplasma-addons-5.12.9.tar.xz
+3419d34fa752bf64433eadba37b223aae28272642f49cb97ae8df0b094be7cfb255c1383b467913285e96946fe7376dc8dec50cc7ff8da9465614faf7c2b0050  headers.patch"
diff --git a/user/kdeplasma-addons/headers.patch b/user/kdeplasma-addons/headers.patch
new file mode 100644
index 000000000..9b2fc7592
--- /dev/null
+++ b/user/kdeplasma-addons/headers.patch
@@ -0,0 +1,28 @@
+From 959443f85ec94d0748d536a07edfa5a68c7d254b Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Tue, 6 Aug 2019 14:11:34 -0600
+Subject: Fix build The QMutex include in AbstractRunner was removed in
+ https://cgit.kde.org/krunner.git/commit/?id=ac6814b1387bc0c790928ec5b62f43c1764994d6
+
+So now each runner needs to include it itself
+
+CCMAIL: montel@kde.org
+---
+ runners/spellchecker/spellcheck.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/runners/spellchecker/spellcheck.h b/runners/spellchecker/spellcheck.h
+index 609f7fd..9fcffee 100644
+--- a/runners/spellchecker/spellcheck.h
++++ b/runners/spellchecker/spellcheck.h
+@@ -22,6 +22,7 @@
+ #include <sonnet/speller.h>
+ 
+ #include <KRunner/AbstractRunner>
++#include <QMutex>
+ #include <QSharedPointer>
+ 
+ /**
+-- 
+cgit v1.1
+
diff --git a/user/khotkeys/APKBUILD b/user/khotkeys/APKBUILD
index 0d53161a8..fb88574bd 100644
--- a/user/khotkeys/APKBUILD
+++ b/user/khotkeys/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=khotkeys
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="Hot key mapping for KDE Plasma 5"
 url="https://www.KDE.org/"
@@ -28,7 +28,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
@@ -40,5 +40,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="df60c9d9be901cfeb6cc41e006015b98f373493362c10cf54bc479eb60a3d7ef33aca557497cdae32e351fd413a615620bbc04d53b42bd7ff7de458c36f8c170  khotkeys-5.12.8.tar.xz
+sha512sums="c2d047b0d7a461f5a1bfa3bdea7e93c40238251e6c1a3edec710f044de02c2f69287a8f2d6cf6f166d448e306d8f7be9199a710ab0e5d1c3d1e2af8a0c234398  khotkeys-5.12.9.tar.xz
 1c2558d8b142bc1de236e35b8f55a825f55d4c38c2b5cb2fbf02dcae1128325f45b15246f9c9d874d1afd2a4483df8501877121c6052b6d067892c5fbeca1dc5  cmake-fixes.patch"
diff --git a/user/kscreenlocker/APKBUILD b/user/kscreenlocker/APKBUILD
index fa03b3515..5362f2062 100644
--- a/user/kscreenlocker/APKBUILD
+++ b/user/kscreenlocker/APKBUILD
@@ -14,10 +14,9 @@ makedepends="$depends_dev cmake extra-cmake-modules python3 libx11-dev
 	libxcb-dev libxcursor-dev libxext-dev libxi-dev linux-pam-dev
 	qt5-qtdeclarative-dev kcmutils-dev kcrash-dev kdeclarative-dev
 	kglobalaccel-dev ki18n-dev kidletime-dev knotifications-dev
-	ktextwidgets-dev kwindowsystem-dev kxmlgui-dev solid-dev"
+	ktextwidgets-dev kwayland-dev kwindowsystem-dev kxmlgui-dev solid-dev"
 subpackages="$pkgname-dev $pkgname-lang"
 source="https://download.kde.org/stable/plasma/$pkgver/kscreenlocker-$pkgver.tar.xz
-	optional-wayland.patch
 	kde.pam
 	kde-np.pam
 	"
@@ -48,6 +47,5 @@ package() {
 }
 
 sha512sums="411df584f7579368beed02340de673b510acb56b5b63475c60f8acc1e1437ae19643a7cdf8fd6880aec49ddb7cff769ce588b850506c411c5d390a53fbc016c4  kscreenlocker-5.12.9.tar.xz
-dee5baa9ec7ace803e0685ca177120f449b7232ecfe04233a505d40ff7e5c421c70ef1df08b21fe4b61d2c663ae97ff81fdc4f9c77776d38b54ccab8baefaf78  optional-wayland.patch
 56e87d02d75c4a8cc4ed183faed416fb4972e7f223b8759959c0f5da32e11e657907a1df279d62a44a6a174f5aca8b2ac66a5f3325c5deb92011bcf71eed74c3  kde.pam
 565265485dd7466b77966d75a56766216b8bcc187c95a997e531e9481cf50ddbe576071eb0e334421202bcab19aa6de6b93e042447ca4797a24bf97e1d053ffd  kde-np.pam"
diff --git a/user/libkscreen/APKBUILD b/user/libkscreen/APKBUILD
index 20754ea80..47412df05 100644
--- a/user/libkscreen/APKBUILD
+++ b/user/libkscreen/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=libkscreen
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="KDE Plasma screen management software"
 url="https://www.kde.org/"
@@ -26,7 +26,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
@@ -52,4 +52,4 @@ wayland() {
 		"$subpkgdir"/usr/lib/qt5/plugins/kf5/kscreen/
 }
 
-sha512sums="773b6782cbe7da02b7bcbe889e98d613321d7e80aa3af7643dd0e21776e2a688f31f83c5429a17a956fb9715c788e90aae80f650a11bf80b667eae948169893a  libkscreen-5.12.8.tar.xz"
+sha512sums="9785ca62889bc0d60fa9fdf5872e64205ed1a8f6921a4ebeddb1c46bad486badb81d69fc30c0438faf412d547e05908d8225705af7176e036a1ba32c86dadea0  libkscreen-5.12.9.tar.xz"
diff --git a/user/plasma-workspace-wallpapers/APKBUILD b/user/plasma-workspace-wallpapers/APKBUILD
index e42251f11..d0e9ce146 100644
--- a/user/plasma-workspace-wallpapers/APKBUILD
+++ b/user/plasma-workspace-wallpapers/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=plasma-workspace-wallpapers
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="Default wallpapers from KDE"
 url="https://www.KDE.org/"
@@ -23,7 +23,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
@@ -35,4 +35,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="9ac764a16eead6cebbeb720548b15946eba619d5de1d2bb5f74f65f85fa14565e42a26c91a23a3473d4ad4b0c819c0a50a92891018b8ee29e5909229932f1622  plasma-workspace-wallpapers-5.12.8.tar.xz"
+sha512sums="10ea940f4a0ae0379bbba6fc5128acf8fbc961a6fd6f96b89f9b0f76e76828642627cebf6521e825f0b5b1925a71e6a2ec25f8d181d0eedeac64fbb53f65250c  plasma-workspace-wallpapers-5.12.9.tar.xz"
diff --git a/user/powerdevil/APKBUILD b/user/powerdevil/APKBUILD
index 16bb82b24..90eba4c2b 100644
--- a/user/powerdevil/APKBUILD
+++ b/user/powerdevil/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=powerdevil
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="KDE Plasma power management utilities"
 url="https://www.kde.org/"
@@ -26,7 +26,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
@@ -38,4 +38,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ad159287ababd4410d2277bc43c0f006209f457a1c08ba903db25f60c62be95fd3b114abd56d5c64ebaccbecb523338766bc28468dc54fa7fc072f6381b8e181  powerdevil-5.12.8.tar.xz"
+sha512sums="f92476160f0c66fbcab4008bee2d307f2f8dc25767eaf4b63ab1971bd230774df49dc5c8361e952a1efc7e2587c6f5cedfed8ef9d286d4d1f91c913f33f58e0b  powerdevil-5.12.9.tar.xz"