From b9895e501cb1bdcd19ea7071b2d2f2a800756fe8 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 29 Dec 2019 18:05:25 +0000
Subject: user/[KDE Plasma]: Bump non-WL components to 5.12.9

* Makes KScreenLocker's Wayland dep optional.
---
 user/sddm-kcm/APKBUILD   | 11 ++++-------
 user/sddm-kcm/qt59.patch | 28 ----------------------------
 2 files changed, 4 insertions(+), 35 deletions(-)
 delete mode 100644 user/sddm-kcm/qt59.patch

(limited to 'user/sddm-kcm')

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
-
-- 
cgit v1.2.3-60-g2f50