gentoo resync : 25.04.2020

3 files changed, 71 insertions, 1 deletions

diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index 88c3139df503..f7d5bd290942 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,5 +1,6 @@
+AUX kbookmarks-5.69.0-konqbookmarkmenu.patch 2193 BLAKE2B ebc499bf54b94f4ccbf754670085ef253f8684ff48998b29da734e3a547c21f7b6b826acc778be8ead0f506aa18adae70ed09ea6c7b873ccd5cf59c5ccbdae6c SHA512 7e41a7e1418b71af2b0384924560dd46212286822076b18faec964577aadf00bbe83056cfe209ca61869e0b22b6d832181b4ea22fb7c2f1c809d5aa92756cb8d
 DIST kbookmarks-5.67.0.tar.xz 120776 BLAKE2B 67cc22431d9ef75d6a0c7239a39cc40e9db2d941185ffdd96f0085c0f419569885cee8efe65f21214fb6188ff96bc52d26e0d2fe4b1b18fb9ba99920aa3d74d7 SHA512 3ab71f193e3acf2bd0074d3e20e38c9cc3ee9aec207d59b06cb8f7d160b40337d5473f29afd1fec17f0af0d82abd8b31821f46991734ae8906c5fd6aa926e066
 DIST kbookmarks-5.69.0.tar.xz 121596 BLAKE2B 8a04dedb7eefc048ca4061521825e4eceb5f8c29bcbe08fb976ae3bb2060fb7fd525f171d15584a5b14481b5958e18e260e7cf8cf68f8638b6bccd3a39b366dc SHA512 9c13e15f63ac65215fb0517b781fc217f1e7fc4756a3faca1ce12a9de8cdf5d08094fce5a6dfddaacfe6a9718ba2f47ffce72b690a7903ab726af6e13056ec5a
 EBUILD kbookmarks-5.67.0.ebuild 816 BLAKE2B 3677f8fcd6ad7aa5621b93a4db5e5385956ee17a99aa3bc83518c6016c6ec15d9c49663a9abea7385702b655c1f4113970b34b3384b614ff04054dd473b576c1 SHA512 c3102d9ae062e022fa912a94605be1df8c99574230eec5d0fb5a520c405f5fe583c89f8a60508182787385a44e4ca7cc71530e688d3fc375f3c6e6efb65c1a19
-EBUILD kbookmarks-5.69.0.ebuild 819 BLAKE2B 2e90327e63dd218733f881b022bbe6dc7937ac56a0cb7f399cf48f6e7e55eae057b7d544d2d0c74be89bf6d1da2685c9386f3d612c3337405c8b91c359f4c83f SHA512 f89a5867e5b262da93ad39350b3b0ffb110ba322cc70a06313bbde72755ec257cc9291fd306f6be163800b6ccb5ba268866fcb0bfad817a35a05ec02c22ed123
+EBUILD kbookmarks-5.69.0-r1.ebuild 874 BLAKE2B 6e926f785f0868f1fe762668dd613782edb8f229109a1d58358793c488b41683aeb8b23d30c25c2d4a76b90902f56828325b77b51b70c9908af5dbef0deb1bb4 SHA512 444af9a0720747308e622b9ba95b3e520c144a6611baae7770e1332ad0090124442d07e90a5412b42c84e094afff694073edc74e3cae5bf3d6ed96f26ebb4885
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kbookmarks/files/kbookmarks-5.69.0-konqbookmarkmenu.patch b/kde-frameworks/kbookmarks/files/kbookmarks-5.69.0-konqbookmarkmenu.patch
new file mode 100644
index 000000000000..c0e68bc8427c
--- /dev/null
+++ b/kde-frameworks/kbookmarks/files/kbookmarks-5.69.0-konqbookmarkmenu.patch
@@ -0,0 +1,67 @@
+From 8504e095478b1c922055fc4ae6c736472708fddd Mon Sep 17 00:00:00 2001
+From: Stefano Crocco <stefano.crocco@alice.it>
+Date: Mon, 13 Apr 2020 10:53:06 +0200
+Subject: [PATCH] Fix crash due to changes in KBookmarkMenu
+
+Summary:
+Since version 5.69, KBookmarkMenu doesn't automatically create an action
+collection. This causes Konqueror to crash when going on a submenu in
+the Bookmarks menu. To avoid it, manually create the action collection.
+
+Also, avoid calling the version of KBookmarkMenu construction which
+takes a KActionCollection, as it's deprecated.
+
+Test Plan:
+Open the bookmarks menu and hover with the mouse on a submenu. Check
+that it crashes. Do the same after this change and check it doesn't crash
+anymore.
+
+Reviewers: dfaure, nicolasfella
+
+Reviewed By: nicolasfella
+
+Subscribers: poboiko
+
+Differential Revision: https://phabricator.kde.org/D28789
+
+* asturm, 2020-04-23: This *is* KF-5.69 so no need to check for the
+  version wrt commit b61086cf.
+---
+ src/konqbookmarkmenu.h | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/konqbookmarkmenu.h b/src/konqbookmarkmenu.h
+index 4898c3a..45bdb84 100644
+--- a/src/konqbookmarkmenu.h
++++ b/src/konqbookmarkmenu.h
+@@ -25,6 +25,8 @@
+ #include "kbookmarkactionmenu.h"
+ #include "kbookmarkcontextmenu.h"
+ 
++#include <KActionCollection>
++
+ #if KBOOKMARKS_ENABLE_DEPRECATED_SINCE(5, 0)
+ #include "kbookmarkowner.h" // for SC reasons
+ 
+@@ -56,8 +58,9 @@ public:
+      */
+     KBOOKMARKS_DEPRECATED_VERSION(5, 65, "This class has moved to Konqueror")
+     KonqBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner, KBookmarkActionMenu *parentMenu, KActionCollection *collec)
+-        : KBookmarkMenu(mgr, owner, parentMenu->menu(), collec)
++        : KBookmarkMenu(mgr, owner, parentMenu->menu())
+     {
++        m_actionCollection = collec;
+     }
+     ~KonqBookmarkMenu() override
+     {}
+@@ -71,6 +74,7 @@ public:
+     KonqBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner, KBookmarkActionMenu *parentMenu, QString parentAddress)
+         : KBookmarkMenu(mgr, owner, parentMenu->menu(), parentAddress)
+     {
++        m_actionCollection = new KActionCollection(this);
+     }
+ 
+ protected:
+-- 
+2.26.2
+
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.69.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.69.0-r1.ebuild
index 7e87675a28d2..886f2635f73a 100644
--- a/kde-frameworks/kbookmarks/kbookmarks-5.69.0.ebuild
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.69.0-r1.ebuild
@@ -32,3 +32,5 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=kde-frameworks/kconfigwidgets-${PVCUT}:5
 "
+
+PATCHES=( "${FILESDIR}/${P}-konqbookmarkmenu.patch" )