gentoo resync : 22.01.2021

4 files changed, 7 insertions, 77 deletions

diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index dba32497eab4..1863b936d0db 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,6 +1,5 @@
-AUX qqc2-desktop-style-5.74.0-move-dbus-connection-in-singleton.patch 2617 BLAKE2B e0a7b44d4df2dc62f9778337beca7ac3c52fecb8558022df58224615a414131b20b6e37e3df89c7217ced582b45a4b62df79b9370aa5dbe08bbf836b11dc43bb SHA512 b6af1ea12353cb15b2c41b9aec5fc6ed9c135374213306999fb21f1901ca24b7fbc070e08d0c256e0b3dd0955f786c962d9cdefd989ba07d6f09b7acbe709899
-DIST qqc2-desktop-style-5.74.0.tar.xz 58632 BLAKE2B a4f3545d83f03eb57cd7dd9ee81db59bd56a22b7907af4eb00a50a9fa1d2a5e507a271fcb4d2a2e7465691076122251f48c0baed05e7c30042489f6dd93e60ee SHA512 88c91d5933bc2c0020a574be05a851aea54382b6c1dd5f459cba792e4ac784782bc88a36670c28f2df29188cf001bf2c9af98b3e9bc84dd59c110fd7bf936258
 DIST qqc2-desktop-style-5.77.0.tar.xz 59812 BLAKE2B 2e3bd046635bec99fe89a20975edf3ed9132836fe3db792236233e2942d58ebb35b48697e3f0582d012ac7a1d995cee58bed9b5167c0e66b6f4f923a32d30c81 SHA512 de8a24912c6de97b23c1e48cc362148256d9cb3284078107ff900af80224752cc6ec9ad568c4b65afe4c36a937dad7040eea19aa2bf4fa5d3047d4a60626cc14
-EBUILD qqc2-desktop-style-5.74.0-r2.ebuild 749 BLAKE2B ab41eea7121cfe8467d3c0b27fe131cc1ae760591dfe9a820bcbe4b9d1ead0b3bd7310070ff8cdd95ee6541c723485ade694d9e435e79111d9633f786a92ff65 SHA512 19335782c68aad57c2cf3ba875273616640216aa79bb80975ee0a8821db1038348a74e1a9ab6f35b60009798dd1933dcafbee3def0f5fec2f7c2203ebba85972
-EBUILD qqc2-desktop-style-5.77.0.ebuild 680 BLAKE2B d934e8a012ead22ce895bf901392791c31e6577e40316fec9e7811a1d4928a2f7f438e466de8622264446fd820f83047c6f09a8afbcf4293e82270c2c8933d8c SHA512 9958b7dd7812f3bc378a0fe573a20bd0b9574c5cb3eadc076334820475e926b344b146de3115eb59ea18a8dc30d099fe867accb8bb265bd9bd29d0356ca8f8fd
+DIST qqc2-desktop-style-5.78.0.tar.xz 59512 BLAKE2B 470775f55bd177454785634f2590bc6f93d52e629021b60f71b86e45ad0f033c930796e3f8058627ae35badfb375b9d2884dde64c51077a63bf1b6572c81a15b SHA512 cde01e39512a5315f31a1df47788564c8b0698391e7b5260be4f370f559fd15fd56f8f9c4be0cbe17db62ec3c5d7cd6519bf37f61f0e49419025db6cee84293f
+EBUILD qqc2-desktop-style-5.77.0.ebuild 677 BLAKE2B dd85a5791e0f3ff3ccbaecb32c0cab37e8325d7a2a11e9136cf08456bf10b63ebcd08a290d399798f2dcd70f91ebffcc26a18f8dd8240f5f6f5b5b03407ac79e SHA512 37fa1a65f5c850caccdcc191ceb5954537eb8a294f94ace65128a8fb5a622ccd330f2bca2d42e1b9c195989386f5bd5273ec28b6b7c163e331d2deebad7466a3
+EBUILD qqc2-desktop-style-5.78.0.ebuild 680 BLAKE2B 208af71147a6401b6e1bab24a4a02ed5eab6fc3a2296e0f845da499a8ecb1fb948a940311901caad37a84a7454d7f7135d0235fc86f7a45b0f532a26282b8983 SHA512 bd8ab2fcc72fc7bcefa0152ce09567f12e72ac3a026db7285623ed446eacff717ae3f33cf9c17112ecf0bd14035add2df5f0d27e2b0b86751b97ef03376abdc4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.74.0-move-dbus-connection-in-singleton.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.74.0-move-dbus-connection-in-singleton.patch
deleted file mode 100644
index 026a5b65d02f..000000000000
--- a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.74.0-move-dbus-connection-in-singleton.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From f8e56a22721057107bccdf319da36ff82ca2a804 Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Mon, 7 Sep 2020 09:52:57 +0000
-Subject: [PATCH] move the dbus connection in the singleton
-
-connecting to dbus is expensive, do it only once in the singleton
-the theme instance will only connecto to the signal forwarded by
-the singleton
----
- .../plasmadesktoptheme.cpp                    | 20 +++++++++++--------
- 1 file changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp b/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
-index babb433..ff046eb 100644
---- a/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
-+++ b/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
-@@ -45,6 +45,14 @@ public:
-     {
-         connect(qGuiApp, &QGuiApplication::paletteChanged,
-                 this, &StyleSingleton::refresh);
-+
-+        // Use DBus in order to listen for kdeglobals changes directly, as the
-+        // QApplication doesn't expose the font variants we're looking for,
-+        // namely smallFont.
-+        QDBusConnection::sessionBus().connect( QString(),
-+        QStringLiteral( "/KGlobalSettings" ),
-+        QStringLiteral( "org.kde.KGlobalSettings" ),
-+        QStringLiteral( "notifyChange" ), this, SIGNAL(configurationChanged()));
-     }
- 
-     void refresh()
-@@ -125,6 +133,7 @@ public:
-     KColorScheme viewScheme;
- 
- Q_SIGNALS:
-+    void configurationChanged();
-     void paletteChanged();
- 
- private:
-@@ -161,14 +170,6 @@ PlasmaDesktopTheme::PlasmaDesktopTheme(QObject *parent)
-                 });
-     }
- 
--    // Use DBus in order to listen for kdeglobals changes directly, as the
--    // QApplication doesn't expose the font variants we're looking for,
--    // namely smallFont.
--    QDBusConnection::sessionBus().connect( QString(),
--        QStringLiteral( "/KGlobalSettings" ),
--        QStringLiteral( "org.kde.KGlobalSettings" ),
--        QStringLiteral( "notifyChange" ), this, SLOT(configurationChanged()));
--
-     //TODO: correct? depends from https://codereview.qt-project.org/206889
-     connect(qGuiApp, &QGuiApplication::fontDatabaseChanged, this, [this]() {setDefaultFont(qApp->font());});
-     configurationChanged();
-@@ -181,6 +182,9 @@ PlasmaDesktopTheme::PlasmaDesktopTheme(QObject *parent)
-     connect(s_style->data(), &StyleSingleton::paletteChanged,
-             this, &PlasmaDesktopTheme::syncColors);
- 
-+    connect(s_style->data(), &StyleSingleton::configurationChanged,
-+            this, &PlasmaDesktopTheme::configurationChanged);
-+
-     syncColors();
- }
- 
--- 
-GitLab
-
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.77.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.77.0.ebuild
index ed3615bd08c1..7a1989001aac 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.77.0.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.77.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.74.0-r2.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.78.0.ebuild
index f3f9d7d8827a..3f9a3c7b4b37 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.74.0-r2.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.78.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ )"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -26,5 +26,3 @@ RDEPEND="${DEPEND}
 	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 "
-
-PATCHES=( "${FILESDIR}"/${P}-move-dbus-connection-in-singleton.patch )