From 26fe534666f8c8ac0e8f2c2a432e5b877f756f4c Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 6 Aug 2019 22:47:32 +0000
Subject: user/[KDE Plasma]: Bump to 5.12.8

---
 user/sddm-kcm/APKBUILD   | 14 +++++++-------
 user/sddm-kcm/qt59.patch | 28 ++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 7 deletions(-)
 create 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 19d4af447..6a8deccf3 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@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=sddm-kcm
-pkgver=5.12.7
+pkgver=5.12.8
 pkgrel=0
 pkgdesc="KDE configuration applet for SDDM"
 url="https://www.kde.org/"
@@ -14,10 +14,11 @@ 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"
+source="https://download.kde.org/stable/plasma/$pkgver/sddm-kcm-$pkgver.tar.xz
+	qt59.patch
+	"
 
 build() {
-	cd "$builddir"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
@@ -33,13 +34,12 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="29d7b03378a6d5a3d58a0c2b85f6dbe4d0114785456072f16872cd09e7ce355f4e59149e31cb69fe7fbb35678c6fc075c788a091c3b638661a64a856aa4a145b  sddm-kcm-5.12.7.tar.xz"
+sha512sums="dbf341868837044a12d50c9292fefaf6a28cd3da48b91a0516f9709c63124ab2ccc73e3472d78dd41209fd07532126bb94059d1b27bf877e61deb1b3cbd5ac64  sddm-kcm-5.12.8.tar.xz
+698bdd605b96655dc2038378cb3a749101c0dcc19cf7ba996f4d64ec6281e8541efb313b8dbf6095181766ab5a5bb3d2fecd25267e61b848dc4f08f89cde9bde  qt59.patch"
diff --git a/user/sddm-kcm/qt59.patch b/user/sddm-kcm/qt59.patch
new file mode 100644
index 000000000..977874172
--- /dev/null
+++ b/user/sddm-kcm/qt59.patch
@@ -0,0 +1,28 @@
+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-70-g09d2