1 |
commit: 20ad98f2ac9c38c0d52070802f8db04a926511ed |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 23 13:30:49 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=20ad98f2 |
7 |
|
8 |
kde-frameworks/kbookmarks: Backport Konqueror 20.04.0 fix for KF-5.69 |
9 |
|
10 |
...to fix kde-apps/konqueror-19.12.3, which did not contain the header yet. |
11 |
|
12 |
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=420010 |
13 |
Closes: https://bugs.gentoo.org/717316 |
14 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
16 |
|
17 |
.../files/kbookmarks-5.69.0-konqbookmarkmenu.patch | 67 ++++++++++++++++++++++ |
18 |
.../kbookmarks/kbookmarks-5.69.0-r1.ebuild | 36 ++++++++++++ |
19 |
2 files changed, 103 insertions(+) |
20 |
|
21 |
diff --git a/kde-frameworks/kbookmarks/files/kbookmarks-5.69.0-konqbookmarkmenu.patch b/kde-frameworks/kbookmarks/files/kbookmarks-5.69.0-konqbookmarkmenu.patch |
22 |
new file mode 100644 |
23 |
index 00000000000..c0e68bc8427 |
24 |
--- /dev/null |
25 |
+++ b/kde-frameworks/kbookmarks/files/kbookmarks-5.69.0-konqbookmarkmenu.patch |
26 |
@@ -0,0 +1,67 @@ |
27 |
+From 8504e095478b1c922055fc4ae6c736472708fddd Mon Sep 17 00:00:00 2001 |
28 |
+From: Stefano Crocco <stefano.crocco@×××××.it> |
29 |
+Date: Mon, 13 Apr 2020 10:53:06 +0200 |
30 |
+Subject: [PATCH] Fix crash due to changes in KBookmarkMenu |
31 |
+ |
32 |
+Summary: |
33 |
+Since version 5.69, KBookmarkMenu doesn't automatically create an action |
34 |
+collection. This causes Konqueror to crash when going on a submenu in |
35 |
+the Bookmarks menu. To avoid it, manually create the action collection. |
36 |
+ |
37 |
+Also, avoid calling the version of KBookmarkMenu construction which |
38 |
+takes a KActionCollection, as it's deprecated. |
39 |
+ |
40 |
+Test Plan: |
41 |
+Open the bookmarks menu and hover with the mouse on a submenu. Check |
42 |
+that it crashes. Do the same after this change and check it doesn't crash |
43 |
+anymore. |
44 |
+ |
45 |
+Reviewers: dfaure, nicolasfella |
46 |
+ |
47 |
+Reviewed By: nicolasfella |
48 |
+ |
49 |
+Subscribers: poboiko |
50 |
+ |
51 |
+Differential Revision: https://phabricator.kde.org/D28789 |
52 |
+ |
53 |
+* asturm, 2020-04-23: This *is* KF-5.69 so no need to check for the |
54 |
+ version wrt commit b61086cf. |
55 |
+--- |
56 |
+ src/konqbookmarkmenu.h | 6 +++++- |
57 |
+ 1 file changed, 5 insertions(+), 1 deletion(-) |
58 |
+ |
59 |
+diff --git a/src/konqbookmarkmenu.h b/src/konqbookmarkmenu.h |
60 |
+index 4898c3a..45bdb84 100644 |
61 |
+--- a/src/konqbookmarkmenu.h |
62 |
++++ b/src/konqbookmarkmenu.h |
63 |
+@@ -25,6 +25,8 @@ |
64 |
+ #include "kbookmarkactionmenu.h" |
65 |
+ #include "kbookmarkcontextmenu.h" |
66 |
+ |
67 |
++#include <KActionCollection> |
68 |
++ |
69 |
+ #if KBOOKMARKS_ENABLE_DEPRECATED_SINCE(5, 0) |
70 |
+ #include "kbookmarkowner.h" // for SC reasons |
71 |
+ |
72 |
+@@ -56,8 +58,9 @@ public: |
73 |
+ */ |
74 |
+ KBOOKMARKS_DEPRECATED_VERSION(5, 65, "This class has moved to Konqueror") |
75 |
+ KonqBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner, KBookmarkActionMenu *parentMenu, KActionCollection *collec) |
76 |
+- : KBookmarkMenu(mgr, owner, parentMenu->menu(), collec) |
77 |
++ : KBookmarkMenu(mgr, owner, parentMenu->menu()) |
78 |
+ { |
79 |
++ m_actionCollection = collec; |
80 |
+ } |
81 |
+ ~KonqBookmarkMenu() override |
82 |
+ {} |
83 |
+@@ -71,6 +74,7 @@ public: |
84 |
+ KonqBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner, KBookmarkActionMenu *parentMenu, QString parentAddress) |
85 |
+ : KBookmarkMenu(mgr, owner, parentMenu->menu(), parentAddress) |
86 |
+ { |
87 |
++ m_actionCollection = new KActionCollection(this); |
88 |
+ } |
89 |
+ |
90 |
+ protected: |
91 |
+-- |
92 |
+2.26.2 |
93 |
+ |
94 |
|
95 |
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.69.0-r1.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.69.0-r1.ebuild |
96 |
new file mode 100644 |
97 |
index 00000000000..886f2635f73 |
98 |
--- /dev/null |
99 |
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.69.0-r1.ebuild |
100 |
@@ -0,0 +1,36 @@ |
101 |
+# Copyright 1999-2020 Gentoo Authors |
102 |
+# Distributed under the terms of the GNU General Public License v2 |
103 |
+ |
104 |
+EAPI=7 |
105 |
+ |
106 |
+PVCUT=$(ver_cut 1-2) |
107 |
+QTMIN=5.12.3 |
108 |
+VIRTUALX_REQUIRED="test" |
109 |
+inherit ecm kde.org |
110 |
+ |
111 |
+DESCRIPTION="Framework for managing bookmarks stored in XBEL format" |
112 |
+ |
113 |
+LICENSE="LGPL-2+" |
114 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
115 |
+IUSE="nls" |
116 |
+ |
117 |
+BDEPEND=" |
118 |
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) |
119 |
+" |
120 |
+RDEPEND=" |
121 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
122 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
123 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
124 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
125 |
+ =kde-frameworks/kcodecs-${PVCUT}*:5 |
126 |
+ =kde-frameworks/kconfig-${PVCUT}*:5 |
127 |
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5 |
128 |
+ =kde-frameworks/kiconthemes-${PVCUT}*:5 |
129 |
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 |
130 |
+ =kde-frameworks/kxmlgui-${PVCUT}*:5 |
131 |
+" |
132 |
+DEPEND="${RDEPEND} |
133 |
+ >=kde-frameworks/kconfigwidgets-${PVCUT}:5 |
134 |
+" |
135 |
+ |
136 |
+PATCHES=( "${FILESDIR}/${P}-konqbookmarkmenu.patch" ) |