user/[Plasma]: bump to 5.12.2

5 files changed, 5 insertions, 157 deletions

diff --git a/user/plasma-workspace/APKBUILD b/user/plasma-workspace/APKBUILD
index c6b4dc276..8da9a35ac 100644
--- a/user/plasma-workspace/APKBUILD
+++ b/user/plasma-workspace/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=plasma-workspace
-pkgver=5.8.7
-pkgrel=8
+pkgver=5.12.2
+pkgrel=0
 pkgdesc="KDE Plasma 5 workspace"
 url="https://www.kde.org/plasma-desktop"
 arch="all"
@@ -23,15 +23,11 @@ depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtscript-dev kwallet-dev
 	kcrash-dev kglobalaccel-dev kdbusaddons-dev kitemmodels-dev kdesu-dev
 	kidletime-dev kwayland-dev kjsembed-dev kxmlrpcclient-dev kholidays-dev
 	libksysguard-dev kpackage-dev baloo-dev kwin-dev libdbusmenu-qt-dev
-	ktexteditor-dev prison-dev"
+	ktexteditor-dev prison-dev libxtst-dev"
 makedepends="$depends_dev cmake extra-cmake-modules kdoctools-dev"
 install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.kde.org/Attic/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz
-	plasma-workspace-5.8-cmake-update.patch
-	plasma-workspace-5.8.7-disable-broken-test.patch
-	plasma-workspace-5.8-honour-uint.patch
-	fix-crash-on-wallpaper-change.patch
+source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz
 	"
 builddir="$srcdir/plasma-workspace-$pkgver"
 
@@ -61,8 +57,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ba35a050384e0bf410097027bfb70ca7594cd5352fd6470228d537f4e876ec72ec26bac3be9a6750f306b1d2937ff53c267c2246f191c93a13972a0cf33b4faf  plasma-workspace-5.8.7.tar.xz
-3d7cfb1c7c54bcbca47c5c01497c776d54d1e2327bc0a3777cfaf001f44ec7c1863f15ab0586c00db6d7194f759b91d0a86e47ae99e7fa23782dd7deda264e47  plasma-workspace-5.8-cmake-update.patch
-2151dab30716e0b2b6a9146fd6262f4f134884961bebe9cf9baee269f35b1b3955ed07dcee2602b5adc2fc93aa15d37cb72d6983f026a2b504feb451d944d965  plasma-workspace-5.8.7-disable-broken-test.patch
-48b4c448a4e964e61f25fa751fbc67f6cfce0e792139a124a70fa5c07f8b1b1a1c51fd5652679a3c46ac997c2dda3df476e8c8ebfdc6a08ece4f2e79282d81a3  plasma-workspace-5.8-honour-uint.patch
-52ac2f37a7e1fde97385a372a4c198b573fb51fe1334bddf340c034ba0fbd2a97174d9bab9f9c8446048deb3a2c9ea3c571b0adcdb1f710b513b311c824ab88a  fix-crash-on-wallpaper-change.patch"
+sha512sums="5e4d5386e1d4fc0fa81303c22b1570da8b6d82f8cf47a7137f7edbe1647ad5575ce36465010a7433183e29f4704cb17a40ff869d7df7d6706ba35ccc79bd190e  plasma-workspace-5.12.2.tar.xz"
diff --git a/user/plasma-workspace/fix-crash-on-wallpaper-change.patch b/user/plasma-workspace/fix-crash-on-wallpaper-change.patch
deleted file mode 100644
index 078a48e3a..000000000
--- a/user/plasma-workspace/fix-crash-on-wallpaper-change.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From a44d84ef47492ca60ee608996b5ab1f2849ef16e Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Mon, 14 Aug 2017 10:04:19 +0100
-Subject: Don't change fillMode of image just before deleting it
-
-It is still set for when a source is applied for the next
-transistion.
-
-Summary:
-This saves evaluating a new paintedSize and doing a bunch of evaluations
-which are not used.
-
-More importantly it works round a Qt animation crash.
-
-fadeAnim.running is bound to otherImage.status !== loading
-
-with the intention of delaying animations until the images are really
-loaded.
-
-By setting the fill mode and then the source, we go to loading and back,
-effectively restarting the animation from within the animation.
-This leads to a crash.
-
-CCBUG: 381105
-
-Test Plan:
-End user result is the same.
-
-Reviewers: #plasma, broulik, mart
-
-Reviewed By: #plasma, broulik, mart
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D7248
----
- wallpapers/image/imagepackage/contents/ui/main.qml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/wallpapers/image/imagepackage/contents/ui/main.qml b/wallpapers/image/imagepackage/contents/ui/main.qml
-index fc22176..0539f37 100644
---- a/wallpapers/image/imagepackage/contents/ui/main.qml
-+++ b/wallpapers/image/imagepackage/contents/ui/main.qml
-@@ -193,8 +193,8 @@ Item {
-         }
-         ScriptAction {
-             script: {
--                otherImage.fillMode = fillMode;
-                 otherImage.source = "";
-+                otherImage.fillMode = fillMode;
-             }
-         }
-     }
--- 
-cgit v0.11.2
-
diff --git a/user/plasma-workspace/plasma-workspace-5.8-cmake-update.patch b/user/plasma-workspace/plasma-workspace-5.8-cmake-update.patch
deleted file mode 100644
index e77731eb5..000000000
--- a/user/plasma-workspace/plasma-workspace-5.8-cmake-update.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 052ab380b6cb7f27da19ba0937bc2563b175a19b Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Mon, 17 Jul 2017 00:07:47 +0200
-Subject: Fix compilation with current cmake (git branch release).
-
-I don't see what the private/ in front of the moc_ filenames was for anyway.
----
- shell/containmentconfigview.cpp          | 2 +-
- shell/currentcontainmentactionsmodel.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/shell/containmentconfigview.cpp b/shell/containmentconfigview.cpp
-index 4d107be..8d6df0d 100644
---- a/shell/containmentconfigview.cpp
-+++ b/shell/containmentconfigview.cpp
-@@ -245,4 +245,4 @@ void ContainmentConfigView::syncWallpaperObjects()
-     m_currentWallpaperConfig = static_cast<KDeclarative::ConfigPropertyMap *>(wallpaperGraphicsObject->property("configuration").value<QObject *>());
- }
- 
--#include "private/moc_containmentconfigview.cpp"
-+#include "moc_containmentconfigview.cpp"
-diff --git a/shell/currentcontainmentactionsmodel.cpp b/shell/currentcontainmentactionsmodel.cpp
-index 08317ed..521d1c9 100644
---- a/shell/currentcontainmentactionsmodel.cpp
-+++ b/shell/currentcontainmentactionsmodel.cpp
-@@ -275,4 +275,4 @@ void CurrentContainmentActionsModel::save()
-     }
- }
- 
--#include "private/moc_currentcontainmentactionsmodel.cpp"
-+#include "moc_currentcontainmentactionsmodel.cpp"
--- 
-cgit v0.11.2
-
diff --git a/user/plasma-workspace/plasma-workspace-5.8-honour-uint.patch b/user/plasma-workspace/plasma-workspace-5.8-honour-uint.patch
deleted file mode 100644
index a5e16d7b3..000000000
--- a/user/plasma-workspace/plasma-workspace-5.8-honour-uint.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 2f22f0a935b69f2f2a866050be5b905f9df4e4b6 Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Mon, 20 Mar 2017 16:59:25 +0100
-Subject: fix compilation with old gcc
-
-Summary:
-gcc 4.8.5 (opensuse leap) fails building modeltest with
-CMakeFiles/testHistoryModel.dir/modeltest.cpp.o: In function `ModelTest::data()':
-modeltest.cpp:(.text+0x5a57): undefined reference to `bool QTest::qCompare<int, unsigned int>(int const&, unsigned int const&, char const*, char const*, char const*, int)'
-
-Test Plan:
-builds fine now
-same thing should be done to modeltest usage in kwin
-
-Reviewers: #plasma, davidedmundson
-
-Reviewed By: #plasma, davidedmundson
-
-Subscribers: davidedmundson, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D5083
----
- klipper/autotests/modeltest.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/klipper/autotests/modeltest.cpp b/klipper/autotests/modeltest.cpp
-index d42d95f..d9b70f9 100644
---- a/klipper/autotests/modeltest.cpp
-+++ b/klipper/autotests/modeltest.cpp
-@@ -453,7 +453,7 @@ void ModelTest::data()
-     // Check that the alignment is one we know about
-     QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole );
-     if ( textAlignmentVariant.isValid() ) {
--        int alignment = textAlignmentVariant.toInt();
-+        unsigned int alignment = textAlignmentVariant.toUInt();
-         QCOMPARE( alignment, ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) );
-     }
- 
--- 
-cgit v0.11.2
-
diff --git a/user/plasma-workspace/plasma-workspace-5.8.7-disable-broken-test.patch b/user/plasma-workspace/plasma-workspace-5.8.7-disable-broken-test.patch
deleted file mode 100644
index 362002d61..000000000
--- a/user/plasma-workspace/plasma-workspace-5.8.7-disable-broken-test.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- plasma-workspace-5.8.7/drkonqi/tests/CMakeLists.txt.old	2017-05-23 07:17:40.000000000 -0500
-+++ plasma-workspace-5.8.7/drkonqi/tests/CMakeLists.txt	2017-10-05 18:04:03.428394763 -0500
-@@ -1,5 +1,5 @@
- add_subdirectory(crashtest)
--add_subdirectory(backtraceparsertest)
-+#add_subdirectory(backtraceparsertest)
- if(KF5XmlRpcClient_FOUND)
-     add_subdirectory(bugzillalibtest)
- endif()