gentoo resync : 10.02.2020

3 files changed, 61 insertions, 3 deletions

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index e341e2ae35c5..b8a00c83c420 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,8 +1,9 @@
 AUX kio-5.64.0-fix-ftp-proxy-settings.patch 1328 BLAKE2B e98d9be736b6f2df4928e113533d5894858cb174456407dafab00fd496379f8f223b028beeea0ff37afbac0c676ee6ac78717a48d27bde73bbd7396c8fd9b796 SHA512 44aeb4f6edfa1aa95157cd1596bfac5aa920d66619de1976f22c4fcf214b2ee5fe5856e28fe9d8c1c4a7036d7aa00bc2e1f7217a0395ee25fd9c1e11c7132389
 AUX kio-5.64.0-fix-http-proxy-settings.patch 1357 BLAKE2B 06d2a706dc71eb4febf5577b9243ac21636b55e28f0952208a1fd65189629fbff9fdd45dddba7b003b453510e54623670dd8a344ddc34c6f31a96fe44d6a453a SHA512 931b3bdc63409c997c945c98376152fe397835eda98cb5c312feaeead8136092e73b3ebb22cd054169a9214bbc85f0c6d27adb5a7b70fb47d051165b4f549678
 AUX kio-5.64.0-fix-no-proxy-settings.patch 1722 BLAKE2B 884221f34e9370889e4ca3076fbe824e87eb6801b9463b534856b7b9cb5087b1de1073013d6c9185e6de7a5d4a852a7a6a6ac5f7cca1ef91809947228df54150 SHA512 568169ac2f34114f85ceadbab8a010f4cbbdee790e17132808cb9fa1fc7a3525a545ec47ff242ba29f5f088c33cbf4cbaa22c9e9585a21866ad5820dbe517102
+AUX kio-5.67.0-memleak.patch 1461 BLAKE2B d891dd6e0012e23ac76216ad7f569215bcb17b2283e1e6dfc66ced2633fcbc41eae7830a3f670c8605396387c59b2338b2628f9919dbbeaeb557bea864b40931 SHA512 8dcff03fcd915c1adff16976839fc85b9e2ce6cf509aae29a93b4f385e8af0dad241360c87413943d5755c72de2b4c2da5423d35dc4be84dcc61756502abe407
 DIST kio-5.64.0.tar.xz 3176912 BLAKE2B 148e42792d16a5848ae82767d6b609c6475a0576d930ffafe6276fc44758751e5a435956250c937c05e1d8472a79198b5d4953e7eadc928a19ce74dbe5dc336c SHA512 fe629c397e09d045421ba7fe289e6f0c490510b2574190c23becfd5272c6fe760ed830d6a9282ab61da028028fcff768b82760ac4a010ea88ede0da1d3dc8652
-DIST kio-5.66.0.tar.xz 3202728 BLAKE2B 74721ebaa9ab63fb29b5310f4f49562b20df2e97a3582f80e1060613719096d624e9dac682f3433e16568a6c0cb82c789a1af67afe659b1f7ab1f0d0b79665ab SHA512 7be872029fb93e76663291e868e829603f14fadfb0264c2c7dff351eba64a8574776a595ae57ca920a394e56940b220fc1065c01d0d88858fe3b7a3e5757ce87
+DIST kio-5.67.0.tar.xz 3223032 BLAKE2B 297ebb3f12282951e85edc4eb9869ff3b6fd9536aa312f32ab7403337bb13a142c37edc03ae2295fe55cc935d6952c70e0efda95a3fcc280709e6ef33c30ea04 SHA512 baf1e6abc6ae1ffa4010245a79cb676787217d365fb033f620a9da293565ec267186afaac08791104cead3ce5c87d3a76ec89b796355361b326b16f044691d72
 EBUILD kio-5.64.0-r2.ebuild 2344 BLAKE2B d3e798c1f2e962b09bcb51872819d12cb027664cc7b9bbeef048e4f2f51791cd91502961bd02bcb758c1f4274821586f8a890fdf3a4ac9cd0db35368d6429447 SHA512 641e02da13919f2566031f3c76c2b4b22d1af82b1744a70a21f8831055f76111a83b8ce456e534dfadb2570170f2fc08d35e86a277f191c1271dac673074d725
-EBUILD kio-5.66.0.ebuild 2255 BLAKE2B 07f27995110d736db434d98a4bcbd6c7716025475a667ddcf6603e53b12aec80c34a3a13cfda028609abb5b80e4b5b19eab9d958b5dd460b8c69e0fc27118d4d SHA512 3b8be1b4b16d5047362eabe3b705b4b68474a17c0533dc8f9e9593a4b415bbce121c858ea3c94a047bfaec656126dc1b502fd0002a88959f496b4fdc024f3ba4
+EBUILD kio-5.67.0-r1.ebuild 2464 BLAKE2B 69e9d94d2e6f4e9eef75b1f2aa3d3a383d4171010437ca132d78969a8c2ca4d725f266a18924c901a8ba198664d1f91aa9a135013eb4bf43564f7a83f01a8f3b SHA512 37ce30608d2b4b80a0493fa42e9f8615333ac9fd25fed55ae8ad552649288fc5f6ec30d9fccff930a6b14b32c25b3686d778046f49aef01cc864249e97f5988d
 MISC metadata.xml 465 BLAKE2B f419d817ff7a98c06ebb921974d1c68f1c50eef4548f1d7bb819fb907b7379ad4d4b4424b598f9f216dc96f00a4e9acf7f051cc628af067954b13c3cb80ddada SHA512 6fae28d51cefecbf80962e976366b86ef54ac666421477787b8a438ae18101ea936865db76464b6a95e8ec6559138a063b269b1a17ff1687c73bb6ad398d4f89
diff --git a/kde-frameworks/kio/files/kio-5.67.0-memleak.patch b/kde-frameworks/kio/files/kio-5.67.0-memleak.patch
new file mode 100644
index 000000000000..cf168b791836
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.67.0-memleak.patch
@@ -0,0 +1,43 @@
+From 213ed50634c02d8ec4aa91f0c307cfdd6f78170d Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Wed, 29 Jan 2020 19:50:33 +0100
+Subject: Fix memory leak in KUrlNavigatorPlacesSelector::updateMenu
+
+Summary:
+This method gets called each time solid notices a change, which can in some
+setups be very frequent. It leaked memory as the submenus and their actions
+were not deallocated properly.
+
+Test Plan: Builds. User feedback: "so far so good, 160 MB Memory usage". It was ~7GiB before this patch.
+
+Reviewers: #frameworks, davidedmundson, meven
+
+Reviewed By: davidedmundson, meven
+
+Subscribers: anthonyfieroni, meven, kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D27002
+---
+ src/filewidgets/kurlnavigatorplacesselector.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/filewidgets/kurlnavigatorplacesselector.cpp b/src/filewidgets/kurlnavigatorplacesselector.cpp
+index 7d33930..103a5fc 100644
+--- a/src/filewidgets/kurlnavigatorplacesselector.cpp
++++ b/src/filewidgets/kurlnavigatorplacesselector.cpp
+@@ -71,6 +71,11 @@ void KUrlNavigatorPlacesSelector::updateMenu()
+ {
+     m_placesMenu->clear();
+ 
++    // Submenus have to be deleted explicitly (QTBUG-11070)
++    for(QObject *obj : QObjectList(m_placesMenu->children())) {
++        delete qobject_cast<QMenu*>(obj); // Noop for nullptr
++    }
++
+     updateSelection(m_selectedUrl);
+ 
+     QString previousGroup;
+-- 
+cgit v1.1
diff --git a/kde-frameworks/kio/kio-5.66.0.ebuild b/kde-frameworks/kio/kio-5.67.0-r1.ebuild
index cfa5f2ece815..ab22fcb45049 100644
--- a/kde-frameworks/kio/kio-5.66.0.ebuild
+++ b/kde-frameworks/kio/kio-5.67.0-r1.ebuild
@@ -8,7 +8,7 @@ ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-2)
 QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+inherit ecm kde.org xdg-utils
 
 DESCRIPTION="Framework providing transparent file and data management"
 LICENSE="LGPL-2+"
@@ -71,6 +71,10 @@ PDEPEND="
 # tests hang
 RESTRICT+=" test"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-memleak.patch # bug 708876, KF-5.68
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package acl ACL)
@@ -82,3 +86,13 @@ src_configure() {
 
 	ecm_src_configure
 }
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	ecm_pkg_postrm
+	xdg_desktop_database_update
+}