gentoo resync : 30.09.2020

3 files changed, 73 insertions, 2 deletions

diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index c779374c268e..0665ec2d0fe0 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,5 +1,6 @@
+AUX qqc2-desktop-style-5.74.0-move-dbus-connection-in-singleton.patch 2617 BLAKE2B e0a7b44d4df2dc62f9778337beca7ac3c52fecb8558022df58224615a414131b20b6e37e3df89c7217ced582b45a4b62df79b9370aa5dbe08bbf836b11dc43bb SHA512 b6af1ea12353cb15b2c41b9aec5fc6ed9c135374213306999fb21f1901ca24b7fbc070e08d0c256e0b3dd0955f786c962d9cdefd989ba07d6f09b7acbe709899
 DIST qqc2-desktop-style-5.70.0.tar.xz 58388 BLAKE2B 8eeeac78f137eb38256076f7a31b9b9ebebd3ac897ead75e5c3fb348cc0909f6b41af42e5384bdd6a47656c4062b537a66b8860fc97898d816cfdcf5a9c01928 SHA512 4064acfe3864c539708571e2ff1f72aec34d40a98f7ecc5a4579bd244dd2f9c5404bb382cc2b7d598cfa97b7bbb96eebed06400d6cf99bfcfe327c522bbcbea0
 DIST qqc2-desktop-style-5.74.0.tar.xz 58632 BLAKE2B a4f3545d83f03eb57cd7dd9ee81db59bd56a22b7907af4eb00a50a9fa1d2a5e507a271fcb4d2a2e7465691076122251f48c0baed05e7c30042489f6dd93e60ee SHA512 88c91d5933bc2c0020a574be05a851aea54382b6c1dd5f459cba792e4ac784782bc88a36670c28f2df29188cf001bf2c9af98b3e9bc84dd59c110fd7bf936258
 EBUILD qqc2-desktop-style-5.70.0.ebuild 676 BLAKE2B 43534376c93b7ae2252c7c3bc642b0bc22519cb1213e27e8db3693ba33e70cd4ba39c451b59662a363c9920aa5369bee558d8c5ded3d85b1d1597c7d9418e7ec SHA512 af76a42cfa3d4947bf5d82c23448b04e995a24c04ba31afb9c16dcf58b3e6ee81a60b962af44d795f2838614878c526aac805a0103799d2eb83fdde5f7ba1fe9
-EBUILD qqc2-desktop-style-5.74.0.ebuild 679 BLAKE2B be29de8fe382baf35c4e839362466b1a95023dd371ba175c4639792cfabc6f086f37a9ba1775569b47293c7788f1fb9d18d7425388ed9590afa3d2a11252b696 SHA512 c9f1ce854c7d1c7f76a9663425b9b33a97a68a6f5c6552738466e223a152015ad3be0b6e15cd591f8d589b8ec7a65147f5b55da169179cca17532fe224377cd2
+EBUILD qqc2-desktop-style-5.74.0-r1.ebuild 752 BLAKE2B 8ba7f5571b9ba0988d3757bc2294e0440475660ed7cf99d4a4028cc980d20da8fe063007c6a1059f979288630781ab202aff6b38d46a412f87ebb04b3940156f SHA512 c266e3f67df4d4429379c026f41014ab3da5254d20f0db05a62bcfb934786feddb642169c1ab6ff564bf05d7a1ae1459884512c8e595110cc0322785d9edb24b
 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
new file mode 100644
index 000000000000..026a5b65d02f
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.74.0-move-dbus-connection-in-singleton.patch
@@ -0,0 +1,67 @@
+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.74.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.74.0-r1.ebuild
index 87eb0019645e..5c012a581d59 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.74.0.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.74.0-r1.ebuild
@@ -9,8 +9,9 @@ QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
 LICENSE="|| ( GPL-2+ LGPL-3+ )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -25,3 +26,5 @@ RDEPEND="${DEPEND}
 	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 "
+
+PATCHES=( "${FILESDIR}"/${P}-move-dbus-connection-in-singleton.patch )