user/[KDE Plasma]: Bump non-WL components to 5.12.9

* Makes KScreenLocker's Wayland dep optional.

19 files changed, 507 insertions, 86 deletions

diff --git a/user/breeze-gtk/APKBUILD b/user/breeze-gtk/APKBUILD
index 431553cb6..051d2d187 100644
--- a/user/breeze-gtk/APKBUILD
+++ b/user/breeze-gtk/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=breeze-gtk
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="GTK+ style that matches KDE Breeze"
 url="https://www.kde.org/"
@@ -24,7 +24,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
@@ -36,4 +36,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="7c9602161cf77e263a84e7fd5f5780a8bc84b4b747356eace7c05768c9cb6a7a39691ba800db654ea1a058209906b1ed762f211a063f8d05596d32fd1dbc867f  breeze-gtk-5.12.8.tar.xz"
+sha512sums="5937f564c2c82274740f8df6447d57ca43243dfbd492fb620430d2b8dc2bf216c1c3c51e78bd616fa224363d4b1b53ccbbb94e72a1908865fe5d8269ce46130e  breeze-gtk-5.12.9.tar.xz"
diff --git a/user/breeze/APKBUILD b/user/breeze/APKBUILD
index e040ec01e..e286aeada 100644
--- a/user/breeze/APKBUILD
+++ b/user/breeze/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=breeze
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="Default KDE Plasma 5 style"
 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="135c431c979cfb82833c6525f72167e0e334519b8c10c57e97e96f8a15a8b2b141c4b94c37985a5a53f1ccc19ab3be9121e55bfe3412fad06122b2927e9e3cbc  breeze-5.12.8.tar.xz"
+sha512sums="48c2bb00512114218df6331617043bf3d457b52d53339031835315ef1c33ea9154967689f4e65990dab59cf40d2094db064451fc6c05e4d028dc5f01e04bbf18  breeze-5.12.9.tar.xz"
diff --git a/user/kde-cli-tools/APKBUILD b/user/kde-cli-tools/APKBUILD
index 229cb371e..7878b7dea 100644
--- a/user/kde-cli-tools/APKBUILD
+++ b/user/kde-cli-tools/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=kde-cli-tools
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="KDE command-like utilities"
 url="https://www.kde.org/"
@@ -9,6 +9,7 @@ arch="all"
 options="!check"  # MIME types for some reason think .doc == .txt
 license="(GPL-2.0-only OR GPL-3.0-only) AND GPL-2.0+ AND GPL-2.0-only AND LGPL-2.1-only"
 depends=""
+checkdepends="shared-mime-info"
 makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev
 	qt5-qtx11extras-dev kactivities-dev kcmutils-dev kconfig-dev
 	kdelibs4support-dev kdesu-dev kdoctools-dev ki18n-dev kiconthemes-dev
@@ -27,7 +28,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
@@ -39,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="54bed8cd64fb59abdfcea0a346e76cbc79f35b4d7c23e8a072e30b2489d636d47f119c8dc9f254c15b26c3bb69098a864589088ab4e2a1c2669375d1810276c3  kde-cli-tools-5.12.8.tar.xz"
+sha512sums="09c0e62421273d72fb51e1db476b3625f8db79f4046003a6fca2698e3462da03c48259347eb14360fb7a8cd2d70b981a5c7e975c4ff86e9697be9c8a0e3ecfba  kde-cli-tools-5.12.9.tar.xz"
diff --git a/user/kde-gtk-config/APKBUILD b/user/kde-gtk-config/APKBUILD
index 4890f6185..bbbe3a78b 100644
--- a/user/kde-gtk-config/APKBUILD
+++ b/user/kde-gtk-config/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=kde-gtk-config
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="KDE System Settings panel for configuring GTK+ application styles"
 url="https://www.kde.org/"
@@ -25,7 +25,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
@@ -37,4 +37,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="6ed8dd86ed2f0e5e3ac7ee6010b8ef4441380eab5425e2e98fbdfbf6f756c295956f9fbff61524d55961edd66e212a0f2004aed70be2f97a04634751e3553ebd  kde-gtk-config-5.12.8.tar.xz"
+sha512sums="ffe0fb1509c4c5f6a1b385f6523661bf7171b4e127c8719296a008fb0af33ee41bc2aaf55243be062065c194fc291c29729a64f226c6d200e8d38b4fc9df9d45  kde-gtk-config-5.12.9.tar.xz"
diff --git a/user/kdecoration/APKBUILD b/user/kdecoration/APKBUILD
index 596214fbf..e25617ecd 100644
--- a/user/kdecoration/APKBUILD
+++ b/user/kdecoration/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=kdecoration
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="Window decoration plugin library"
 url="https://www.kde.org/"
@@ -25,7 +25,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
@@ -37,4 +37,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ee93718d25ebf51a61fd8fab8be7138b3bddcbc87422e88e9500c40b72a0211abfa3df168277e7d1cee759bb995ea993d618024979a4d4127729a40b3e910f61  kdecoration-5.12.8.tar.xz"
+sha512sums="f4c97bc64707d8c3863e519bb9efc6b324e818ec0e73f184191824a80c9d7140e5d102a0e4557246ec93726456c235d062a219da749ceb6aa186197e1e5f2618  kdecoration-5.12.9.tar.xz"
diff --git a/user/kgamma5/APKBUILD b/user/kgamma5/APKBUILD
index bd2d6cbb9..61c34979d 100644
--- a/user/kgamma5/APKBUILD
+++ b/user/kgamma5/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=kgamma5
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="Control monitor gamma from KDE 5"
 url="https://www.KDE.org/"
@@ -24,7 +24,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
@@ -36,4 +36,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="fdb359cb5b4b48df023657ffbd919421f45f938a7b430f20d0fad6b27d060b9aeaf886cab411d143b8698f041ffa273bc2a5ce4ab468e5e0b3d46bdbe7f6a65d  kgamma5-5.12.8.tar.xz"
+sha512sums="5aae045849a8a223d4f54d88c86d9e87ff094d48ebf1f9de31179cb105206e3b251f057aab7217c14b7c31c5fa35fea04c435a3aa263268b856bc2e35ef484d1  kgamma5-5.12.9.tar.xz"
diff --git a/user/kinfocenter/APKBUILD b/user/kinfocenter/APKBUILD
index b757698dd..03bc42992 100644
--- a/user/kinfocenter/APKBUILD
+++ b/user/kinfocenter/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=kinfocenter
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="Information about the running computer"
 url="https://www.kde.org/applications/system/kinfocenter/"
@@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcompletion-dev ki18n-dev
 	kconfig-dev kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev kio-dev
 	kdoctools-dev kiconthemes-dev kcmutils-dev kdelibs4support-dev glu-dev
 	kservice-dev solid-dev kwidgetsaddons-dev kxmlgui-dev kdeclarative-dev
-	kpackage-dev libraw1394-dev pciutils-dev kwayland-dev"
+	kpackage-dev libraw1394-dev pciutils-dev"
 subpackages="$pkgname-doc $pkgname-lang"
 source="https://download.kde.org/stable/plasma/$pkgver/kinfocenter-$pkgver.tar.xz"
 
@@ -27,7 +27,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
@@ -39,4 +39,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="3c473afa486b80a679d6f78c8000b115b65465b7fc5a6c95af35899f6cb50971422203fc28149b534ad6107e1a78b646b96e60fa5be0182fa5cd0b92a2c6da71  kinfocenter-5.12.8.tar.xz"
+sha512sums="e1e963af00d5d0dea5d1e5612fd3174c119f2ee9dd3661455fb935c8955046ea5b013c604dee2fbc03a39eebaccd592eeb6fb983595a6a231aaa66c282c00f31  kinfocenter-5.12.9.tar.xz"
diff --git a/user/kmenuedit/APKBUILD b/user/kmenuedit/APKBUILD
index f28736562..370e6ab73 100644
--- a/user/kmenuedit/APKBUILD
+++ b/user/kmenuedit/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=kmenuedit
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="Menu editor for Plasma 5"
 url="https://www.KDE.org/"
@@ -24,7 +24,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
@@ -36,4 +36,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="1de4301df485237c0c0c855e7d2f8a4774fb3054ee5c458ea2d58acd2899965cf960a1020e157f394c9a0786e47efb9f0dfa1201718d5ccfbedaeca041974ea2  kmenuedit-5.12.8.tar.xz"
+sha512sums="9d9ab72b270f517bc797926c54d38c0f96d88d6b535055d52d800a06384b65edd086dc064801381e18697e4a79d04b27c7213a0c397084ab157f5a98d8a66427  kmenuedit-5.12.9.tar.xz"
diff --git a/user/kscreenlocker/APKBUILD b/user/kscreenlocker/APKBUILD
index e566e197e..fa03b3515 100644
--- a/user/kscreenlocker/APKBUILD
+++ b/user/kscreenlocker/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=kscreenlocker
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="Secure X11 screen locker"
 url="https://www.kde.org/"
@@ -14,11 +14,13 @@ 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 kwayland-dev kwindowsystem-dev kxmlgui-dev solid-dev"
+	ktextwidgets-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"
+	kde-np.pam
+	"
 
 build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
@@ -31,7 +33,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
@@ -45,6 +47,7 @@ package() {
 	install -m644 "$srcdir"/kde-np.pam "$pkgdir"/etc/pam.d/kde-np
 }
 
-sha512sums="d389991d1af70c588c6918305649c6a5616a617fb7f010d7d5b3dfb5b97ec878069deef69676dbd8ac97a4f46b97c1a78b8b32980cafb49294e83021acd4c8f7  kscreenlocker-5.12.8.tar.xz
+sha512sums="411df584f7579368beed02340de673b510acb56b5b63475c60f8acc1e1437ae19643a7cdf8fd6880aec49ddb7cff769ce588b850506c411c5d390a53fbc016c4  kscreenlocker-5.12.9.tar.xz
+dee5baa9ec7ace803e0685ca177120f449b7232ecfe04233a505d40ff7e5c421c70ef1df08b21fe4b61d2c663ae97ff81fdc4f9c77776d38b54ccab8baefaf78  optional-wayland.patch
 56e87d02d75c4a8cc4ed183faed416fb4972e7f223b8759959c0f5da32e11e657907a1df279d62a44a6a174f5aca8b2ac66a5f3325c5deb92011bcf71eed74c3  kde.pam
 565265485dd7466b77966d75a56766216b8bcc187c95a997e531e9481cf50ddbe576071eb0e334421202bcab19aa6de6b93e042447ca4797a24bf97e1d053ffd  kde-np.pam"
diff --git a/user/kscreenlocker/optional-wayland.patch b/user/kscreenlocker/optional-wayland.patch
new file mode 100644
index 000000000..eee3cb10e
--- /dev/null
+++ b/user/kscreenlocker/optional-wayland.patch
@@ -0,0 +1,448 @@
+--- kscreenlocker-5.12.9/CMakeLists.txt.old	2019-09-10 10:30:52.000000000 +0000
++++ kscreenlocker-5.12.9/CMakeLists.txt	2019-12-29 16:39:31.945860585 +0000
+@@ -73,16 +73,16 @@
+ 
+ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras)
+ 
+-find_package(KF5Wayland CONFIG REQUIRED)
++find_package(KF5Wayland)
+ set_package_properties(KF5Wayland PROPERTIES
+-                       TYPE REQUIRED
+-                       PURPOSE "Required for building screenlocker")
++                       TYPE OPTIONAL
++                       PURPOSE "Required for building Wayland screenlocker")
+ find_package(WaylandScanner)
+ find_package(Wayland 1.3 COMPONENTS Client Server)
+ 
+ set_package_properties(Wayland PROPERTIES
+-                       TYPE REQUIRED
+-                       PURPOSE "Required for building screenlocker")
++                       TYPE OPTIONAL
++                       PURPOSE "Required for building Wayland screenlocker")
+ 
+ find_package(loginctl)
+ set_package_properties(loginctl PROPERTIES
+@@ -138,9 +138,7 @@
+    interface.cpp
+    globalaccel.cpp
+    x11locker.cpp
+-   waylandlocker.cpp
+    logind.cpp
+-   waylandserver.cpp
+    powermanagement.cpp
+    powermanagement_inhibition.cpp
+ )
+@@ -149,10 +147,20 @@
+ kconfig_add_kcfg_files(ksld_SRCS kcfg/kscreensaversettings.kcfgc)
+ qt5_add_dbus_interface(ksld_SRCS ${powerdevilpolicyagent_xml} powerdevilpolicyagent)
+ 
++if(KF5Wayland_FOUND)
++list(APPEND ksld_SRCS
++   waylandlocker.cpp
++   waylandserver.cpp
++)
+ ecm_add_wayland_server_protocol(ksld_SRCS
+     PROTOCOL protocols/ksld.xml
+     BASENAME ksld
+ )
++set(OPT_WL_LIBRARIES
++   KF5::WaylandServer
++   Wayland::Server
++)
++endif(KF5Wayland_FOUND)
+ 
+ add_library(KScreenLocker SHARED ${ksld_SRCS})
+ 
+@@ -171,8 +179,7 @@
+    ${X11_LIBRARIES}
+    XCB::XCB
+    XCB::KEYSYMS
+-   KF5::WaylandServer
+-   Wayland::Server
++   ${OPT_WL_LIBRARIES}
+ )
+ 
+ if (X11_Xinput_FOUND)
+--- kscreenlocker-5.12.9/ksldapp.cpp.old	2019-09-10 10:30:16.000000000 +0000
++++ kscreenlocker-5.12.9/ksldapp.cpp	2019-12-29 17:00:37.930322855 +0000
+@@ -38,9 +38,11 @@
+ #include <KNotification>
+ #include <KGlobalAccel>
+ 
++#ifdef WAYLAND_FOUND
+ //kwayland
+ #include <KWayland/Server/display.h>
+ #include <KWayland/Server/clientconnection.h>
++#endif
+ 
+ // Qt
+ #include <QAction>
+@@ -84,8 +86,10 @@
+     , m_lockState(Unlocked)
+     , m_lockProcess(NULL)
+     , m_lockWindow(NULL)
++#ifdef WAYLAND_FOUND
+     , m_waylandServer(new WaylandServer(this))
+     , m_waylandDisplay(nullptr)
++#endif  /* WAYLAND_FOUND */
+     , m_lockedTimer(QElapsedTimer())
+     , m_idleId(0)
+     , m_lockGrace(0)
+@@ -96,8 +100,12 @@
+     , m_greeterEnv(QProcessEnvironment::systemEnvironment())
+     , m_powerManagementInhibition(new PowerManagementInhibition(this))
+ {
++#ifdef WAYLAND_FOUND
+     m_isX11 = QX11Info::isPlatformX11();
+     m_isWayland = QCoreApplication::instance()->property("platformName").toString().startsWith( QLatin1String("wayland"), Qt::CaseInsensitive);
++#else
++    m_isX11 = true;
++#endif
+ }
+ 
+ KSldApp::~KSldApp()
+@@ -215,9 +223,11 @@
+     auto finishedSignal = static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished);
+     connect(m_lockProcess, finishedSignal, this,
+         [this](int exitCode, QProcess::ExitStatus exitStatus) {
++#ifdef WAYLAND_FOUND
+             if (m_isWayland && m_waylandDisplay && m_greeterClientConnection) {
+                 m_greeterClientConnection->destroy();
+             }
++#endif  /* WAYLAND_FOUND */
+             if ((!exitCode && exitStatus == QProcess::NormalExit) || s_graceTimeKill || s_logindExit) {
+                 // unlock process finished successfully - we can remove the lock grab
+                 s_graceTimeKill = false;
+@@ -240,7 +250,9 @@
+         [this](QProcess::ProcessError error) {
+             if (error == QProcess::FailedToStart) {
+                 doUnlock();
++#ifdef WAYLAND_FOUND
+                 m_waylandServer->stop();
++#endif  /* WAYLAND_FOUND */
+                 qCritical() << "Greeter Process not available";
+             }
+         }
+@@ -533,7 +545,9 @@
+     m_lockedTimer.invalidate();
+     m_greeterCrashedCounter = 0;
+     endGraceTime();
++#ifdef WAYLAND_FOUND
+     m_waylandServer->stop();
++#endif  /* WAYLAND_FOUND */
+     KNotification::event(QStringLiteral("unlocked"),
+                          i18n("Screen unlocked"),
+                          QPixmap(),
+@@ -553,6 +567,7 @@
+ {
+     QProcessEnvironment env = m_greeterEnv;
+ 
++#ifdef WAYLAND_FOUND
+     if (m_isWayland && m_waylandDisplay) {
+         int sx[2];
+         if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sx) < 0) {
+@@ -576,6 +591,7 @@
+             env.insert("WAYLAND_SOCKET", QByteArray::number(socket));
+         }
+     }
++#endif  /* WAYLAND_FOUND */
+     QStringList args;
+     if (establishLock == EstablishLock::Immediate) {
+         args << QStringLiteral("--immediateLock");
+@@ -596,6 +612,7 @@
+         env.insert(s_qtQuickBackend, QStringLiteral("software"));
+     }
+ 
++#ifdef WAYLAND_FOUND
+     // start the Wayland server
+     int fd = m_waylandServer->start();
+     if (fd == -1) {
+@@ -605,10 +622,13 @@
+ 
+     args << QStringLiteral("--ksldfd");
+     args << QString::number(fd);
++#endif  /* WAYLAND_FOUND */
+ 
+     m_lockProcess->setProcessEnvironment(env);
+     m_lockProcess->start(QStringLiteral(KSCREENLOCKER_GREET_BIN), args);
++#ifdef WAYLAND_FOUND
+     close(fd);
++#endif
+ }
+ 
+ void KSldApp::showLockWindow()
+@@ -617,9 +637,11 @@
+         if (m_isX11) {
+             m_lockWindow = new X11Locker(this);
+         }
++#ifdef WAYLAND_FOUND
+         if (m_isWayland) {
+             m_lockWindow = new WaylandLocker(m_waylandDisplay, this);
+         }
++#endif  /* WAYLAND_FOUND */
+         if (!m_lockWindow) {
+             return;
+         }
+@@ -637,7 +659,9 @@
+                 lockScreenShown();
+             }
+         , Qt::QueuedConnection);
++#ifdef WAYLAND_FOUND
+         connect(m_waylandServer, &WaylandServer::x11WindowAdded, m_lockWindow, &AbstractLocker::addAllowedWindow);
++#endif  /* WAYLAND_FOUND */
+     }
+     m_lockWindow->showLockWindow();
+     if (m_isX11) {
+@@ -702,12 +726,14 @@
+     }
+ }
+ 
++#ifdef WAYLAND_FOUND
+ void KSldApp::setWaylandDisplay(KWayland::Server::Display *display)
+ {
+     if (m_waylandDisplay != display) {
+         m_waylandDisplay = display;
+     }
+ }
++#endif  /* WAYLAND_FOUND */
+ 
+ void KSldApp::lockScreenShown()
+ {
+@@ -723,9 +749,11 @@
+ void KSldApp::setGreeterEnvironment(const QProcessEnvironment &env)
+ {
+     m_greeterEnv = env;
++#ifdef WAYLAND_FOUND
+     if (m_isWayland) {
+         m_greeterEnv.insert(QStringLiteral("QT_QPA_PLATFORM"), QStringLiteral("wayland"));
+     }
++#endif  /* WAYLAND_FOUND */
+ }
+ 
+ bool KSldApp::event(QEvent *event)
+--- kscreenlocker-5.12.9/autotests/CMakeLists.txt.old	2019-09-10 10:30:16.000000000 +0000
++++ kscreenlocker-5.12.9/autotests/CMakeLists.txt	2019-12-29 17:16:10.540254516 +0000
+@@ -55,6 +55,7 @@
+ add_test(ksmserver-x11LockerTest x11LockerTest)
+ ecm_mark_as_test(x11LockerTest)
+ 
++if(KF5Wayland_FOUND)
+ #######################################
+ # NoScreensTest
+ #######################################
+@@ -67,3 +68,4 @@
+     )
+ add_test(ksld-noScreensTest noScreensTest)
+ ecm_mark_as_test(noScreensTest)
++endif()
+--- kscreenlocker-5.12.9/greeter/greeterapp.cpp.old	2019-09-10 10:30:16.000000000 +0000
++++ kscreenlocker-5.12.9/greeter/greeterapp.cpp	2019-12-29 17:14:57.458241696 +0000
+@@ -26,6 +26,7 @@
+ #include "lnf_integration.h"
+ 
+ #include <config-kscreenlocker.h>
++#include <config-workspace.h>
+ 
+ // KDE
+ #include <KAuthorized>
+@@ -40,12 +41,14 @@
+ #include <KPackage/Package>
+ #include <KPackage/PackageStructure>
+ #include <KPackage/PackageLoader>
++#ifdef WAYLAND_FOUND
+ // KWayland
+ #include <KWayland/Client/connection_thread.h>
+ #include <KWayland/Client/event_queue.h>
+ #include <KWayland/Client/plasmashell.h>
+ #include <KWayland/Client/registry.h>
+ #include <KWayland/Client/surface.h>
++#endif
+ // Qt
+ #include <QClipboard>
+ #include <QAbstractNativeEventFilter>
+@@ -63,9 +66,11 @@
+ #include <QQmlExpression>
+ 
+ #include <QX11Info>
++#ifdef WAYLAND_FOUND
+ // Wayland
+ #include <wayland-client.h>
+ #include <wayland-ksld-client-protocol.h>
++#endif
+ // X11
+ #include <X11/Xatom.h>
+ #include <X11/Xlib.h>
+@@ -137,6 +142,7 @@
+     }
+     qDeleteAll(m_views);
+ 
++#ifdef WAYLAND_FOUND
+     if (m_ksldInterface) {
+         org_kde_ksld_destroy(m_ksldInterface);
+     }
+@@ -148,6 +154,7 @@
+         m_ksldConnectionThread->quit();
+         m_ksldConnectionThread->wait();
+     }
++#endif  /* WAYLAND_FOUND */
+ }
+ 
+ Authenticator *UnlockApp::createAuthenticator()
+@@ -165,7 +172,10 @@
+ 
+ void UnlockApp::initialize()
+ {
++#ifdef WAYLAND_FOUND
+     initializeWayland();
++#endif  /* WAYLAND_FOUND */
++
+     // set up the request ignore timeout, so that multiple requests to sleep/suspend/shutdown
+     // are not processed in quick (and confusing) succession)
+     m_resetRequestIgnoreTimer->setSingleShot(true);
+@@ -205,6 +215,7 @@
+     if (!platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) {
+         return;
+     }
++#ifdef WAYLAND_FOUND
+     using namespace KWayland::Client;
+     auto *c = ConnectionThread::fromApplication(this);
+     if (!c) {
+@@ -219,6 +230,7 @@
+         return;
+     }
+     m_plasmaShell = r->createPlasmaShell(i.name, i.version, this);
++#endif  /* WAYLAND_FOUND */
+ }
+ 
+ void UnlockApp::loadWallpaperPlugin(KQuickAddons::QuickViewSharedEngine *view)
+@@ -281,6 +293,7 @@
+             }
+         }
+ 
++#ifdef WAYLAND_FOUND
+         if (m_ksldInterface) {
+             view->create();
+             org_kde_ksld_x11window(m_ksldInterface, view->winId());
+@@ -294,6 +307,7 @@
+                 view->setProperty("plasmaShellSurface", QVariant::fromValue(shellSurface));
+             }
+         }
++#endif  /* WAYLAND_FOUND */
+ 
+         // engine stuff
+         QQmlContext* context = view->engine()->rootContext();
+@@ -353,10 +367,14 @@
+ 
+         auto screen = QGuiApplication::screens()[i];
+         view->setGeometry(screen->geometry());
++#ifdef WAYLAND_FOUND
+         KWayland::Client::PlasmaShellSurface *plasmaSurface = view->property("plasmaShellSurface").value<KWayland::Client::PlasmaShellSurface *>();
+         if (plasmaSurface) {
+             plasmaSurface->setPosition(view->geometry().topLeft());
+         }
++#else
++	void *plasmaSurface = nullptr;
++#endif  /* WAYLAND_FOUND */
+         if (auto object = view->property("wallpaperGraphicsObject").value<KDeclarative::QmlObjectSharedEngine*>()) {
+             //initialize with our size to avoid as much resize events as possible
+             object->completeInitialization({
+@@ -370,9 +388,11 @@
+                 view,
+                 [view, plasmaSurface](const QRect &geo)  {
+                     view->setGeometry(geo);
++#ifdef WAYLAND_FOUND
+                     if (plasmaSurface) {
+                         plasmaSurface->setPosition(view->geometry().topLeft());
+                     }
++#endif  /* WAYLAND_FOUND */
+                 }
+         );
+ 
+@@ -477,6 +497,7 @@
+ 
+ void UnlockApp::suspendToRam()
+ {
++#ifdef WAYLAND_FOUND
+     if (m_ignoreRequests) {
+         return;
+     }
+@@ -485,11 +506,12 @@
+     m_resetRequestIgnoreTimer->start();
+ 
+     org_kde_ksld_suspendSystem(m_ksldInterface);
+-
++#endif  /* WAYLAND_FOUND */
+ }
+ 
+ void UnlockApp::suspendToDisk()
+ {
++#ifdef WAYLAND_FOUND
+     if (m_ignoreRequests) {
+         return;
+     }
+@@ -498,6 +520,7 @@
+     m_resetRequestIgnoreTimer->start();
+ 
+     org_kde_ksld_hibernateSystem(m_ksldInterface);
++#endif  /* WAYLAND_FOUND */
+ }
+ 
+ void UnlockApp::setTesting(bool enable)
+@@ -626,7 +649,7 @@
+     m_defaultToSwitchUser = defaultToSwitchUser;
+ }
+ 
+-
++#ifdef WAYLAND_FOUND
+ static void osdProgress(void *data, org_kde_ksld *org_kde_ksld, const char *icon, int32_t percent, const char *text)
+ {
+     Q_UNUSED(org_kde_ksld)
+@@ -657,9 +680,11 @@
+     canSuspend,
+     canHibernate
+ };
++#endif  /* WAYLAND_FOUND */
+ 
+ void UnlockApp::setKsldSocket(int socket)
+ {
++#ifdef WAYLAND_FOUND
+     using namespace KWayland::Client;
+     m_ksldConnection = new ConnectionThread;
+     m_ksldConnection->setSocketFd(socket);
+@@ -697,6 +722,7 @@
+     m_ksldConnection->moveToThread(m_ksldConnectionThread);
+     m_ksldConnectionThread->start();
+     m_ksldConnection->initConnection();
++#endif  /* WAYLAND_FOUND */
+ }
+ 
+ void UnlockApp::osdProgress(const QString &icon, int percent, const QString &additionalText)
+--- kscreenlocker-5.12.9/greeter/CMakeLists.txt.old	2019-09-10 10:30:16.000000000 +0000
++++ kscreenlocker-5.12.9/greeter/CMakeLists.txt	2019-12-29 17:29:44.832222068 +0000
+@@ -24,10 +24,16 @@
+ qt5_add_resources(kscreenlocker_greet_SRCS fallbacktheme.qrc)
+ kconfig_add_kcfg_files(kscreenlocker_greet_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../kcfg/kscreensaversettings.kcfgc)
+ 
++if(KF5Wayland_FOUND)
+ ecm_add_wayland_client_protocol(kscreenlocker_greet_SRCS
+     PROTOCOL ../protocols/ksld.xml
+     BASENAME ksld
+ )
++set(OPT_WL_CLI_LIBRARIES
++    KF5::WaylandClient
++    Wayland::Client
++)
++endif()
+ 
+ add_executable(kscreenlocker_greet ${kscreenlocker_greet_SRCS})
+ 
+@@ -43,8 +49,7 @@
+                         Qt5::Qml
+                         Qt5::X11Extras
+                         ${X11_LIBRARIES}
+-                        KF5::WaylandClient
+-                        Wayland::Client
++                        ${OPT_WL_CLI_LIBRARIES}
+                         )
+ if(HAVE_SECCOMP)
+     target_link_libraries(kscreenlocker_greet Qt5::DBus Seccomp::Seccomp)
diff --git a/user/ksshaskpass/APKBUILD b/user/ksshaskpass/APKBUILD
index 2bf88f6b0..3bbf2524f 100644
--- a/user/ksshaskpass/APKBUILD
+++ b/user/ksshaskpass/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=ksshaskpass
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="Plasma integration for SSH agents"
 url="https://www.KDE.org/"
@@ -24,7 +24,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
@@ -36,4 +36,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="31181cba266e8fe5bcb7c6ab988a213fefed7e3717af5780e90d69b519b2ef21647d69c60331e9c3745fdb8d9a6b61ae2f02a5573c1d908b8c3fc3cc812580b7  ksshaskpass-5.12.8.tar.xz"
+sha512sums="79d75e2394cce5e24120c6fee7fbe698069f1146b3c27c9f97b29eaeba03f32233eeea4daf0e2a26b050cb3407c06bcc817fc8ca952fabf1c99061ed8cedd79a  ksshaskpass-5.12.9.tar.xz"
diff --git a/user/ksysguard/APKBUILD b/user/ksysguard/APKBUILD
index 54c227779..c17fe4220 100644
--- a/user/ksysguard/APKBUILD
+++ b/user/ksysguard/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=ksysguard
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="KDE system monitor utility"
 url="https://www.kde.org/"
@@ -29,7 +29,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
@@ -41,6 +41,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="9ea21ba61866f1b36f15f41011dfcab562ede45cc3403f030184680f6e3b0717fc5ac774089784a3d14015728c3b721887083154b32b786e804dfc1aace89585  ksysguard-5.12.8.tar.xz
+sha512sums="bce502bd5f5c1473372875e969900c01728e4192eb9097643985dc3c8b9a8ce08f602f3cf954da622fee9925056121643be601bf75c318a65cb07b6c4713799c  ksysguard-5.12.9.tar.xz
 13a26451c459cff1d3b00af27c953d10c55e7e8f43ef7a6f0f54dd05dcb612546545c0170089e9499bb041f004cdacf19cb112d247a8ccf8fd4e77fea0d1c8bc  ksysguard-5.6.5-rindex-header.patch
 0a424bb5e23f283d0cccfe86c0a6c2915f563a82e27a1dc16be8b4dc4b3d90ce116c4eb448dd1d5dc07602225468880206a5eb70c1b66d1e19e9a405fae7aa88  0001-Linux-softraid-define-_GNU_SOURCE-for-pipe2.patch"
diff --git a/user/libksysguard/APKBUILD b/user/libksysguard/APKBUILD
index e8a05e1d1..22d5633d1 100644
--- a/user/libksysguard/APKBUILD
+++ b/user/libksysguard/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=libksysguard
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="KDE system monitor library"
 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,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="9913b5491ad8305efa20e933db3a108da93b83323cde33cdef24f3b40beadb166de99cbd5cbde033d82de913c5a66b493860f9d14351a7b20c401bd1a5648039  libksysguard-5.12.8.tar.xz"
+sha512sums="7f3f8740d6add7edcea9b40e819e1c4a0cfdf40e6ba57b646cfdd68b6de5801259632f95e21226dae2c8336c0ef3f955a14b727fc2ba014f9fec44117b93e628  libksysguard-5.12.9.tar.xz"
diff --git a/user/milou/APKBUILD b/user/milou/APKBUILD
index 787a48375..ed8cd7bd9 100644
--- a/user/milou/APKBUILD
+++ b/user/milou/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=milou
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="Search and launch plasmoid"
 url="https://www.kde.org/"
@@ -24,7 +24,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
@@ -36,4 +36,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="87b34643c32e9c57cc3aa8b12b536d2cb1bf38fb8f4c4ea7df7b6022c498d3f3d796cb825b14d9fa7b636c30bfb2d136d4771b68e9951d4e5e9fc98bd4a53a28  milou-5.12.8.tar.xz"
+sha512sums="24e61d7e209a5e563d0d8da3db013c127ecd2b59fde7ea90893daae5a9de8f02315832a985eab2f6ed1a5eae891ce33c18548e56e98d79a25b848e46527e3ee8  milou-5.12.9.tar.xz"
diff --git a/user/oxygen/APKBUILD b/user/oxygen/APKBUILD
index e94059d0b..1747dd4f6 100644
--- a/user/oxygen/APKBUILD
+++ b/user/oxygen/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=oxygen
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="'Oxygen' theme for KDE"
 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="d6d60c295eab7e1d8eb453c3150ad50fa387dc6ad8f2950ed53df320ccd2499397b35561dafcf7c3f4faef84039a9c1f54ad19b69a42c100d453ad87420982b3  oxygen-5.12.8.tar.xz"
+sha512sums="9a4c292742e48c2ede86d254ed1d456249e11a5b88102dee34fce7e96dbc0fdeb561661c383c1c39f4d9ab9ebf133a4c432118d1e4933245280279593e6edf4b  oxygen-5.12.9.tar.xz"
diff --git a/user/sddm-kcm/APKBUILD b/user/sddm-kcm/APKBUILD
index 6a8deccf3..6f10587a7 100644
--- a/user/sddm-kcm/APKBUILD
+++ b/user/sddm-kcm/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=sddm-kcm
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="KDE configuration applet for SDDM"
 url="https://www.kde.org/"
@@ -14,9 +14,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev
 	knewstuff-dev"
 install_if="systemsettings sddm"
 subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/sddm-kcm-$pkgver.tar.xz
-	qt59.patch
-	"
+source="https://download.kde.org/stable/plasma/$pkgver/sddm-kcm-$pkgver.tar.xz"
 
 build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
@@ -29,7 +27,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
@@ -41,5 +39,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="dbf341868837044a12d50c9292fefaf6a28cd3da48b91a0516f9709c63124ab2ccc73e3472d78dd41209fd07532126bb94059d1b27bf877e61deb1b3cbd5ac64  sddm-kcm-5.12.8.tar.xz
-698bdd605b96655dc2038378cb3a749101c0dcc19cf7ba996f4d64ec6281e8541efb313b8dbf6095181766ab5a5bb3d2fecd25267e61b848dc4f08f89cde9bde  qt59.patch"
+sha512sums="c7f05a5bcd08b74591bece6bf9af65e3132e834c528107d911af2fd6e30c227ba6048fa1297b0d90444db499deed64899c026ceaf2e3d4bd56096068d60b4f37  sddm-kcm-5.12.9.tar.xz"
diff --git a/user/sddm-kcm/qt59.patch b/user/sddm-kcm/qt59.patch
deleted file mode 100644
index 977874172..000000000
--- a/user/sddm-kcm/qt59.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e2f7ead351eedf245c2bb1840053288d18d5c0fc Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Tue, 5 Mar 2019 14:05:21 +0000
-Subject: Revert "Fix autologin session loading"
-
-It introduces Qt API > 5.8 which Plasma 5.12 depends on
-
-This reverts commit 634a2dd1bef5dd8434db95a391300f68f30fd14e.
----
- src/sessionmodel.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sessionmodel.cpp b/src/sessionmodel.cpp
-index 08fe05d..9e52b12 100644
---- a/src/sessionmodel.cpp
-+++ b/src/sessionmodel.cpp
-@@ -64,7 +64,7 @@ void SessionModel::loadDir(const QString &path, SessionType type)
-         QFile inputFile(dir.absoluteFilePath(session));
-         if (!inputFile.open(QIODevice::ReadOnly))
-             continue;
--        SessionPtr si { new Session { session.chopped(strlen(".desktop")), QString(), QString(), QString() } };
-+        SessionPtr si { new Session { session, "", "", "" } };
-         bool isHidden = false;
-         QString current_section;
-         QTextStream in(&inputFile);
--- 
-cgit v1.1
-
diff --git a/user/systemsettings/APKBUILD b/user/systemsettings/APKBUILD
index 3fa213be7..94ef3ed76 100644
--- a/user/systemsettings/APKBUILD
+++ b/user/systemsettings/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=systemsettings
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="KDE system settings configuration utility"
 url="https://www.kde.org/"
@@ -27,7 +27,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
@@ -39,4 +39,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="00dc0c39004bfd8938610ef6e0c08dc1d0c8738e7b3f7f4044586c0628d5a574c07f9a69bfa288ab8c3dd7beced4d5fa4b8ba34ace35668a53b364534d929d78  systemsettings-5.12.8.tar.xz"
+sha512sums="620704f2b74a81e151933cac62d3ac09ad085db6094a2cd96f20337ba056ac7b908bf7f9a6b0a6532cc15ff3e55a7299b06357b3f41ad224f4aaa53db5b765f7  systemsettings-5.12.9.tar.xz"
diff --git a/user/user-manager/APKBUILD b/user/user-manager/APKBUILD
index cddcb2960..b4e10a6c6 100644
--- a/user/user-manager/APKBUILD
+++ b/user/user-manager/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=user-manager
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="Manage user accounts from KDE"
 url="https://www.KDE.org/"
@@ -25,7 +25,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
@@ -37,4 +37,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="2dd6ce318bede7fea7e80e54e1f9432b0dfa5e99e34def28d91c99230de175a9d84acf6c3a4b0c27fb311a34ddd3d98b0d7dbf3cbacd0e030c880b853279430d  user-manager-5.12.8.tar.xz"
+sha512sums="52a7b213fb69aec57284fa53e2ec800b0d47adacabddf774707a2eb434da083adbde6ff93300f831ac83f804dd6faab2c00d10e76a41581e3607b98cb615cc1b  user-manager-5.12.9.tar.xz"