gentoo resync : 17.02.2020

6 files changed, 52 insertions, 34 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 78af4116a69e..cd29a1e8dc3d 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,7 +1,8 @@
-AUX plasma-desktop-5.17.4-pager-regression.patch 1062 BLAKE2B 6c5a321cfff23f48c79e8c5d0d72fc71d6cfafc8b76441789dcf1b377c3cd54b48b6050e4649d88bdd747ff5de72337bb0f048ac4be1757748e78c57159f03e0 SHA512 e0919291ae335f717ca029460f78337ed72ae4a88c8c3c0185b3f0fb74544681d446463c21b6a8337c72ae4dce58b5581a6b7faa04d95c4eed9481a8bac61898
 AUX plasma-desktop-5.17.5-revert-activities-jagginess.patch 1214 BLAKE2B 3d6517a6020639a5f0f7720d22e45c985a95553bb62a2d365d219ff05d18eed5c105c17c54b21eb114e85b2012dead46f1e928d1082b7b1387d813e75144f775 SHA512 c7910def604e6a6cf23d11d50c33f585d67a7e539cdfc2d4a81449e46eb4e823fe63e484f5cdb535f4fdec0fcc6be805ede703b74b22b88f4dc941593b6f4fa3
-DIST plasma-desktop-5.17.4.tar.xz 9452532 BLAKE2B 1e93c30194d1a745a45eae6eaae515f83b5ae97c40c3ce5fabbedb6f00c0228085983767711a5537358bca0fd394fc8d82666092a394692b56683ff447107b9c SHA512 b3d4ad7ccffb911dd0bea9c33d1e814ffb8ddb53379cc26a543ed19a61d9d0cb36ae856151e187354e2af50c47c330fd54bea06602afe5336b885b611d70962c
+AUX plasma-desktop-5.18.0-kcm_fonts.patch 503 BLAKE2B 4a9a7f8b0fb7feeeb8b4881950688e2e8372d607270077b8f783e68bb97ed8992ef5530f0bcf0011bd703bb6131d516692b0f8224827bc3a0549344036c5d6cb SHA512 de0bf603d387fbe68ecde24ce6bb03647c04c61e7eee7995506e5d13fbe5e39def4414feb39f9d65d110c641fdc7821c1fcafcfabc94dcd1453988e20e4da4ae
+AUX plasma-desktop-5.18.0-unlock-widgets.patch 722 BLAKE2B 275c9382ed492140a743d375d128172d76409ae906bb53c5b9bccdf5be97b309a8b7b55a828182710f493a520b9bcb032232d35719d30c3f0ab05802ee72f196 SHA512 93c99a9d4503ee6113eeb6633a7fef79b1bea567388d69bf1550e0a435121ffbbb151013c783a85d19458eb114ef2ef1be91482f10710d1b3b35fe3da1a3206a
 DIST plasma-desktop-5.17.5.tar.xz 9448300 BLAKE2B 2599c77527d4210f442c51b7bc8465fd35be83c711f1fcd9a31a6206475319035aac7962320bb47f74bd89d7a70e0ab46b866dfd5424d23d9934806a2b03d3f5 SHA512 c910be6bf63091f14f190e8fbfbd0039aa175d30f7a6870dbd99ffc3ff49a0f77e63e2d3fc9319dab1c650b15108cdaefee470eddab1213afe8d3a149ac64dd4
-EBUILD plasma-desktop-5.17.4-r2.ebuild 4053 BLAKE2B 92d7a1c6707fc4bdd96f61282273220820a0465af58135793a9cf625e2d988211126ccb64019055cd422b44ecd308cac5e9420d6aadad72d2082a99870a434a4 SHA512 d988d4f7a542cbe1ad40323bb91c615c0244587b738f45b513f1ae5af014c33d05f3ac1028a159dfead0d0fa99abd7c93b6febc7575518d88c6ff1ae28ce92d9
-EBUILD plasma-desktop-5.17.5-r1.ebuild 4074 BLAKE2B 7b54ebf4439b3424d8c8128ce5e11594458b10cdcc359025629910010fef258b9865f97a94e8c88448822aad115fff3cbdaaf9f7178f7685b485d527627cd29f SHA512 5c3c7d017e46071bf53c691a8210d39963328f056e7edb41697de9dd37543d42cb66b51c9e57af279ad901d7d8fbe10801b220de2391059eab577e48a60c8a3a
+DIST plasma-desktop-5.18.0.tar.xz 9409548 BLAKE2B 37fe888adc2ce5e21b081a8a062cc620542327161ab490a2248d4e10a8343f524da2a2502218bb63be5ab6b047c906e20015d65058a7d3ba11dae3438da8bd47 SHA512 863516751f4f37193ad5a96713fa9c7eb8d346e3bbe33dc43dcb83fa18955456dc875ddc3e2db990e7f3a017e394a69790e3dc21e13e8fc0c5d6841591c8fb4e
+EBUILD plasma-desktop-5.17.5-r1.ebuild 4071 BLAKE2B 8710be965b9fa342a9c8d4331181cf4ccb1f258fccff4cd19ce2b17a6e0c79a3ef3ef79a5bee41e11ba19a9334c800c57723b18089211111ca5879bc0d2b216a SHA512 669dd8f639d8b7c36b4cd45268972935c18dfe8a274c532100573d65d20d714dedce1c2d4879a543dfc1534827e1a9ab1d1ecca39c7036ef25d4f753ebfd838a
+EBUILD plasma-desktop-5.18.0-r1.ebuild 4156 BLAKE2B 21bedcb8126691a8f3daf974fe53399974d906b1a8d6722cbf8cfc294291157f20590a248392bbc8018daf1d9644b3ef69e365efedb07de39943c757312ef640 SHA512 e6fa891ba2d23a6c18db4db7bcc1ba9e05c83e6a36096ba5a623e7cc57ca264c7fc47174edb815bd5db0e3893a54e4f0f5a5a40852bffdef60693d9ba3dc9c5f
 MISC metadata.xml 514 BLAKE2B 31b846e6675005788e3041e22365385edcb4ac253db87f15a048b7d3a0cbe61494ce7a3e495444ef9c9bd3455e566d7a89664a8969041b22a3474eb4e99d1397 SHA512 a14dbd159795a2982ba81c0856f2f058664b807a3c26afe9371e4be3ccb5bb0b8a48c086fd580549c35006821304df4c22ad3a1c7e43d5fda4a37688044fb99d
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.4-pager-regression.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.4-pager-regression.patch
deleted file mode 100644
index d8057f22a4c2..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.4-pager-regression.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2b5e86323f180f0c51ef9af898a69a522bc379ad Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Sat, 14 Dec 2019 00:29:32 +0100
-Subject: Fix regression in "Port the pager applet away from QtWidgets"
-
-BUG: 414849
----
- applets/pager/plugin/windowmodel.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/applets/pager/plugin/windowmodel.cpp b/applets/pager/plugin/windowmodel.cpp
-index 93273bb..bcda333 100644
---- a/applets/pager/plugin/windowmodel.cpp
-+++ b/applets/pager/plugin/windowmodel.cpp
-@@ -77,7 +77,7 @@ QVariant WindowModel::data(const QModelIndex &index, int role) const
-     if (role == AbstractTasksModel::Geometry) {
-         QRect windowGeo = TaskFilterProxyModel::data(index, role).toRect();
-         QList<QScreen *> screens = QGuiApplication::screens();
--        const QRect desktopGeo = screens.at(0)->geometry();
-+        const QRect desktopGeo = screens.at(0)->virtualGeometry();
- 
-         if (KWindowSystem::mapViewport()) {
-             int x = windowGeo.center().x() % desktopGeo.width();
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-kcm_fonts.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-kcm_fonts.patch
new file mode 100644
index 000000000000..ec05442beff1
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-kcm_fonts.patch
@@ -0,0 +1,14 @@
+diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp
+--- a/kcms/fonts/fonts.cpp
++++ b/kcms/fonts/fonts.cpp
+@@ -572,8 +572,8 @@
+     // previews
+     engine()->addImageProvider("preview", new PreviewImageProvider(m_settings->font()));
+ 
+-    // reload state after loading by emiting a settings signal
+-    emit m_settings->activeFontChanged();
++    // KCM expect save state to be false at this point (can be true because of setNearestExistingFonts
++    setNeedsSave(false);
+ }
+ 
+ void KFonts::save()
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-unlock-widgets.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-unlock-widgets.patch
new file mode 100644
index 000000000000..9ea643b86597
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-unlock-widgets.patch
@@ -0,0 +1,23 @@
+From 2bc3c5e92d4789146548e8de4d520cd191994e1c Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Tue, 11 Feb 2020 16:41:26 +0100
+Subject: unlock widgets
+
+5.18 doesn't offer a way anymore from the gui
+so unlock them if they're locked
+BUG:417424
+---
+ desktoppackage/contents/updates/unlock_widgets.js | 2 ++
+ 1 file changed, 2 insertions(+)
+ create mode 100644 desktoppackage/contents/updates/unlock_widgets.js
+
+diff --git a/desktoppackage/contents/updates/unlock_widgets.js b/desktoppackage/contents/updates/unlock_widgets.js
+new file mode 100644
+index 0000000..c332270
+--- /dev/null
++++ b/desktoppackage/contents/updates/unlock_widgets.js
+@@ -0,0 +1,2 @@
++
++__AppInterface.locked = false;
+-- 
+cgit v1.1
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.17.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.17.5-r1.ebuild
index 7270d25d7fbd..36d9ae8b74ae 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.17.5-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.17.5-r1.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
 DESCRIPTION="KDE Plasma desktop"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+fontconfig ibus +mouse scim +semantic-desktop touchpad"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.17.4-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.0-r1.ebuild
index eb00ab2ef8ab..1ade6819cc1d 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.17.4-r2.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.0-r1.ebuild
@@ -5,16 +5,17 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-VIRTUALX_REQUIRED="test"
-KFMIN=5.64.0
+KFMIN=5.66.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma desktop"
+
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="~amd64 ~ppc64"
 IUSE="+fontconfig ibus +mouse scim +semantic-desktop touchpad"
 
 COMMON_DEPEND="
@@ -57,6 +58,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/solid-${KFMIN}:5
 	>=kde-frameworks/sonnet-${KFMIN}:5
 	>=kde-plasma/kwin-${PVCUT}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
 	>=kde-plasma/plasma-workspace-${PVCUT}:5
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -115,7 +117,10 @@ RDEPEND="${COMMON_DEPEND}
 	!<kde-plasma/kdeplasma-addons-5.15.80
 "
 
-PATCHES=( "${FILESDIR}"/${P}-pager-regression.patch )
+PATCHES=(
+	"${FILESDIR}/${P}-kcm_fonts.patch" # KDE-Bug #416358
+	"${FILESDIR}/${P}-unlock-widgets.patch" # KDE-Bug #417424
+)
 
 src_configure() {
 	local mycmakeargs=(