user/plasma-workspace: Bump to 5.12.9, with fixes

* header.patch: Backports from 5.17 to build against Qt 5.12

* session-conflict.patch: Ensure the Wayland session is clearly marked as
  such, so that users are aware it is unsupported.

4 files changed, 199 insertions, 6 deletions

diff --git a/user/plasma-workspace/APKBUILD b/user/plasma-workspace/APKBUILD
index 036b2b456..0bb3216e4 100644
--- a/user/plasma-workspace/APKBUILD
+++ b/user/plasma-workspace/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=plasma-workspace
-pkgver=5.12.8
+pkgver=5.12.9
 pkgrel=0
 pkgdesc="KDE Plasma 5 workspace"
 url="https://www.kde.org/plasma-desktop"
@@ -20,7 +20,8 @@ depends="$depends libdbusmenu-qt kcmutils kde-cli-tools kded kdesu kio-extras
 depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev kdelibs4support-dev
 	kitemmodels-dev kservice-dev kwindowsystem-dev"
 makedepends="$depends_dev cmake extra-cmake-modules qt5-qtscript-dev
-	iso-codes-dev libdbusmenu-qt-dev libxtst-dev xcb-util-image-dev
+	iso-codes-dev libdbusmenu-qt-dev libqalculate-dev libxtst-dev
+	xcb-util-image-dev
 
 	baloo-dev kactivities-dev kcmutils-dev kcrash-dev kdbusaddons-dev
 	kdeclarative-dev kdesu-dev kdoctools-dev kglobalaccel-dev kholidays-dev
@@ -31,6 +32,8 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qtscript-dev
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz
 	cmake-fixes.patch
+	header.patch
+	session-conflict.patch
 	"
 
 build() {
@@ -45,7 +48,7 @@ build() {
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
 		-DBUILD_TESTING=OFF \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
@@ -57,5 +60,7 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c19d338117c5d9b05581fc1be7d99fc60f4453a009a04ddf3609add1fef7ad08bdd0d0c19c0f4151484253036cc444d8301c3fb8ee0d29d8ecc19d9929a9ff8b  plasma-workspace-5.12.8.tar.xz
-39ea169f50b98fd2dd246396133a3e8d9c844409338c9c3ecd79474945377886c5d1050205ad73c3d8c789315e8a4353311bafa9f1ddd22f25403b3ed7f30fde  cmake-fixes.patch"
+sha512sums="d96df6642f8d4c134381d8b186ec8766f0dffa3ebeb11f32242817d500e805e4d6c8df1471b1bdeb95a7778b6e9cd0daf1f72c04f834cc35bd14f1be9749e705  plasma-workspace-5.12.9.tar.xz
+148195f34938c8f2ffd80d25bc07725e4e2a64296ec6292f7d8e739f1ab535f676683aa5d0ad41e1e085394ce733f5d25727cf44d55010488b8139ca9c9af135  cmake-fixes.patch
+9934721c58ed514e55365a9b2e0410ee76fcf444a660ce9086d3aa46ca9fea708866e53c2f33a33a79ea4af13edee102a8bea9ca0bd280a6306527b6e5f46dd5  header.patch
+2212bcafc53d6c9688265aed8ebceddeec23f6e73804ece955ac4006beb862dccbd93076ab357bbbef2d0953976a3347c8a1e5d2fa2654b5a7120abc288ea8ba  session-conflict.patch"
diff --git a/user/plasma-workspace/cmake-fixes.patch b/user/plasma-workspace/cmake-fixes.patch
index 16307ce31..68ad943f1 100644
--- a/user/plasma-workspace/cmake-fixes.patch
+++ b/user/plasma-workspace/cmake-fixes.patch
@@ -75,7 +75,7 @@ diff --git a/soliduiserver/soliduiserver.cpp b/soliduiserver/soliduiserver.cpp
 index 3ec09c0..d06a1e6 100644
 --- a/soliduiserver/soliduiserver.cpp
 +++ b/soliduiserver/soliduiserver.cpp
-@@ -219,7 +219,7 @@ void SolidUiServer::reparentDialog(QWidget *dialog, WId wId, const QString &appI
+@@ -222,7 +222,7 @@ void SolidUiServer::reparentDialog(QWidget *dialog, WId wId, const QString &appI
  
      KWindowSystem::setMainWindow(dialog, wId); // correct, set dialog parent
  
diff --git a/user/plasma-workspace/header.patch b/user/plasma-workspace/header.patch
new file mode 100644
index 000000000..ea82bd7f0
--- /dev/null
+++ b/user/plasma-workspace/header.patch
@@ -0,0 +1,97 @@
+From a788ab3d08a8a68ed232f81a2110f447080451ec Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Thu, 8 Aug 2019 13:54:17 +0200
+Subject: Add missing include
+
+---
+ shell/shellcorona.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
+index 90fd4f9..5c94e32 100644
+--- a/shell/shellcorona.cpp
++++ b/shell/shellcorona.cpp
+@@ -30,6 +30,7 @@
+ #include <QQmlContext>
+ #include <QDBusConnection>
+ #include <QUrl>
++#include <QScreen>
+ 
+ #include <QJsonObject>
+ #include <QJsonDocument>
+-- 
+cgit v1.1
+
+From b98a399bdcdb7f0ca84298bad96b1a13ed8b5d1f Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Thu, 8 Aug 2019 07:54:35 -0600
+Subject: Fix build failure in the CI
+
+---
+ runners/windows/windowsrunner.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/runners/windows/windowsrunner.cpp b/runners/windows/windowsrunner.cpp
+index 70856f7..4fc4aaf 100644
+--- a/runners/windows/windowsrunner.cpp
++++ b/runners/windows/windowsrunner.cpp
+@@ -24,6 +24,7 @@
+ 
+ #include <QDebug>
+ #include <QIcon>
++#include <QMutexLocker>
+ #include <KWindowSystem>
+ #include <KLocalizedString>
+ 
+-- 
+cgit v1.1
+
+From 0c4ec1c4af05aa1f6e36c934881cf6f427f7241a Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Tue, 6 Aug 2019 13:29:56 -0600
+Subject: Fix compilation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Summary:
+Without this patch, plasma-workspace fails to compile for me with the following error:
+```
+In file included from /home/nate/kde/build/plasma-workspace/runners/windows/krunner_windows_autogen/EWIEGA46WW/moc_windowsrunner.cpp:10,
+                 from /home/nate/kde/build/plasma-workspace/runners/windows/krunner_windows_autogen/mocs_compilation.cpp:2:
+/home/nate/kde/build/plasma-workspace/runners/windows/krunner_windows_autogen/EWIEGA46WW/../../../../../../src/plasma-workspace/runners/windows/windowsrunner.h:61:9: error: ‘QMutex’ does not name a type
+   61 |         QMutex m_mutex;
+      |         ^~~~~~
+```
+
+Test Plan: It compiles now
+
+Reviewers: #plasma, aacid
+
+Reviewed By: aacid
+
+Subscribers: plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D22976
+---
+ runners/windows/windowsrunner.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/runners/windows/windowsrunner.h b/runners/windows/windowsrunner.h
+index 016b7c4..a106af8 100644
+--- a/runners/windows/windowsrunner.h
++++ b/runners/windows/windowsrunner.h
+@@ -21,6 +21,8 @@
+ 
+ #include <KRunner/AbstractRunner>
+ 
++#include <QMutex>
++
+ class KWindowInfo;
+ 
+ class WindowsRunner : public Plasma::AbstractRunner
+-- 
+cgit v1.1
+
diff --git a/user/plasma-workspace/session-conflict.patch b/user/plasma-workspace/session-conflict.patch
new file mode 100644
index 000000000..667a7187b
--- /dev/null
+++ b/user/plasma-workspace/session-conflict.patch
@@ -0,0 +1,91 @@
+From 36bc9bfd9661f88039a8945688e07b0626b48610 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 15 Oct 2019 18:33:45 +0200
+Subject: [PATCH 1/2] Fix Name conflict between plasma.desktop and
+ plasmawayland.desktop
+
+Summary:
+SDDM until 0.18.1 appends " (Wayland)" to the name of any session file it
+finds in wayland-sessions dir, and Plasma is relying on that behaviour to
+distinguish between its X11 and Wayland sessions. This leads to duplicate
+"Plasma" entries on any other DM not applying the same hack, e.g. lightdm,
+and users are lost without downstream patching.
+
+SDDM in 0.19 only appends " (Wayland)" in case the session name does
+not already end with this, to avoid duplicating it.
+
+CCBUG: https://bugs.kde.org/show_bug.cgi?id=368409
+See also: https://github.com/sddm/sddm/pull/997
+
+Reviewers: #plasma, davidedmundson, fvogt, ngraham
+
+Reviewed By: #plasma, davidedmundson, fvogt, ngraham
+
+Subscribers: ngraham, pino, rdieter, fvogt, davidedmundson, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D22210
+---
+ login-sessions/plasmawayland.desktop.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plasmawayland.desktop.cmake b/plasmawayland.desktop.cmake
+index 64f997ea4..3e9b46bc9 100644
+--- a/plasmawayland.desktop.cmake
++++ b/plasmawayland.desktop.cmake
+@@ -2,51 +2,7 @@
+ Exec=dbus-run-session ${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland
+ TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland
+ DesktopNames=KDE
+-Name=Plasma
+-Name[ar]=بلازما
+-Name[bs]=Plazma
+-Name[ca]=Plasma
+-Name[ca@valencia]=Plasma
+-Name[cs]=Plasma
+-Name[da]=Plasma
+-Name[de]=Plasma
+-Name[el]=Plasma
+-Name[en_GB]=Plasma
+-Name[es]=Plasma
+-Name[et]=Plasma
+-Name[eu]=Plasma
+-Name[fi]=Plasma
+-Name[fr]=Plasma
+-Name[gl]=Plasma
+-Name[he]=פלזמה
+-Name[hu]=Plasma
+-Name[id]=Plasma
+-Name[is]=Plasma
+-Name[it]=Plasma
+-Name[ja]=プラズマ
+-Name[ko]=Plasma
+-Name[lt]=Plasma
+-Name[nb]=Plasma
+-Name[nds]=Plasma
+-Name[nl]=Plasma
+-Name[nn]=Plasma
+-Name[pa]=ਪਲਾਜ਼ਮਾ
+-Name[pl]=Plazma
+-Name[pt]=Plasma
+-Name[pt_BR]=Plasma
+-Name[ru]=Plasma
+-Name[sk]=Plasma
+-Name[sl]=Plasma
+-Name[sr]=Плазма
+-Name[sr@ijekavian]=Плазма
+-Name[sr@ijekavianlatin]=Plasma
+-Name[sr@latin]=Plasma
+-Name[sv]=Plasma
+-Name[tr]=Plama
+-Name[uk]=Плазма
+-Name[x-test]=xxPlasmaxx
+-Name[zh_CN]=Plasma
+-Name[zh_TW]=Plasma
++Name=Plasma (Wayland)
+ Comment=Plasma by KDE
+ Comment[ar]=بلازما كدي
+ Comment[bs]=Plazma od strane KDe
+-- 
+2.23.0