1 |
commit: 93d86ef95882e8cc6d1e02b0ce84444f5de92eb8 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 23 13:56:07 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 23 22:06:58 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93d86ef9 |
7 |
|
8 |
kde-apps/konqueror: Adapt to >=kde-frameworks/kbookmarks-5.69 |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
.../konqueror-20.04.0-kf5bookmarks-5.69.patch | 55 ++++++++++++++++++++++ |
14 |
kde-apps/konqueror/konqueror-20.04.0.ebuild | 4 ++ |
15 |
2 files changed, 59 insertions(+) |
16 |
|
17 |
diff --git a/kde-apps/konqueror/files/konqueror-20.04.0-kf5bookmarks-5.69.patch b/kde-apps/konqueror/files/konqueror-20.04.0-kf5bookmarks-5.69.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..67eab1d6315 |
20 |
--- /dev/null |
21 |
+++ b/kde-apps/konqueror/files/konqueror-20.04.0-kf5bookmarks-5.69.patch |
22 |
@@ -0,0 +1,55 @@ |
23 |
+From b61086cfece0d0f11ecfe9c3309697997cada201 Mon Sep 17 00:00:00 2001 |
24 |
+From: Stefano Crocco <stefano.crocco@×××××.it> |
25 |
+Date: Tue, 14 Apr 2020 10:21:48 +0200 |
26 |
+Subject: [PATCH] Fix crash due to changes in KBookmarkMenu |
27 |
+ |
28 |
+Summary: |
29 |
+Since version 5.69, KBookmarkMenu doesn't automatically create an action |
30 |
+collection. This causes Konqueror to crash when going on a submenu in |
31 |
+the Bookmarks menu. To avoid it, manually create the action collection. |
32 |
+ |
33 |
+Also, avoid calling the version of KBookmarkMenu construction which |
34 |
+takes a KActionCollection, as it's deprecated. |
35 |
+ |
36 |
+Test Plan: |
37 |
+Open the bookmarks menu and hover with the mouse on a submenu. Check |
38 |
+that it crashes. Do the same after this change and check it doesn't crash |
39 |
+anymore. |
40 |
+ |
41 |
+Reviewers: dfaure, nicolasfella |
42 |
+ |
43 |
+Reviewed By: dfaure, nicolasfella |
44 |
+ |
45 |
+Subscribers: arojas, poboiko |
46 |
+ |
47 |
+Differential Revision: https://phabricator.kde.org/D28789 |
48 |
+--- |
49 |
+ src/konqbookmarkmenu.h | 4 ++++ |
50 |
+ 1 file changed, 4 insertions(+) |
51 |
+ |
52 |
+diff --git a/src/konqbookmarkmenu.h b/src/konqbookmarkmenu.h |
53 |
+index 9ff4c0f55..d47960f7b 100644 |
54 |
+--- a/src/konqbookmarkmenu.h |
55 |
++++ b/src/konqbookmarkmenu.h |
56 |
+@@ -26,6 +26,7 @@ |
57 |
+ #include "kbookmarkcontextmenu.h" |
58 |
+ |
59 |
+ #include <KActionCollection> |
60 |
++#include <kbookmarks_version.h> |
61 |
+ |
62 |
+ namespace Konqueror { // to avoid clashing with KF5::Bookmarks which had a KonqBookmarkMenu class. Remove once using KF6. |
63 |
+ |
64 |
+@@ -61,7 +62,10 @@ public: |
65 |
+ KonqBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner, KBookmarkActionMenu *parentMenu, QString parentAddress) |
66 |
+ : KBookmarkMenu(mgr, owner, parentMenu->menu(), parentAddress) |
67 |
+ { |
68 |
++//KBookmarkMenu doesn't create an action collection only in version 5.69.0 |
69 |
++#if KBOOKMARKS_VERSION == QT_VERSION_CHECK(5, 69, 0) |
70 |
+ m_actionCollection = new KActionCollection(this); |
71 |
++#endif |
72 |
+ } |
73 |
+ |
74 |
+ protected: |
75 |
+-- |
76 |
+2.26.2 |
77 |
+ |
78 |
|
79 |
diff --git a/kde-apps/konqueror/konqueror-20.04.0.ebuild b/kde-apps/konqueror/konqueror-20.04.0.ebuild |
80 |
index 4d7a5e44fde..9f95cfadf19 100644 |
81 |
--- a/kde-apps/konqueror/konqueror-20.04.0.ebuild |
82 |
+++ b/kde-apps/konqueror/konqueror-20.04.0.ebuild |
83 |
@@ -63,6 +63,10 @@ RDEPEND="${COMMON_DEPEND} |
84 |
kde-plasma/kde-cli-tools:5 |
85 |
" |
86 |
|
87 |
+PATCHES=( |
88 |
+ "${FILESDIR}/${P}-kf5bookmarks-5.69.patch" # bug 717316, KDE-Bug 420010 |
89 |
+) |
90 |
+ |
91 |
src_prepare() { |
92 |
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc |