[gentoo-commits] proj/kde:master commit in: kde-apps/kcharselect/, kde-apps/kcharselect/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     1c45a6e5e5b897b399cef44c8c44b17d36412380
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 18 13:45:11 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 18 13:45:11 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1c45a6e5

kde-apps/kcharselect: Adapt to >=kde-frameworks/kbookmarks-5.69

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kcharselect-19.12.3-kf5bookmarks-5.69.patch    | 50 ++++++++++++++++++++++
 kde-apps/kcharselect/kcharselect-20.04.0.ebuild    |  2 +
 2 files changed, 52 insertions(+)

diff --git a/kde-apps/kcharselect/files/kcharselect-19.12.3-kf5bookmarks-5.69.patch b/kde-apps/kcharselect/files/kcharselect-19.12.3-kf5bookmarks-5.69.patch
new file mode 100644
index 0000000000..46d943bb03
--- /dev/null
+++ b/kde-apps/kcharselect/files/kcharselect-19.12.3-kf5bookmarks-5.69.patch
@@ -0,0 +1,50 @@
+From 7972b9858bcdd2bf8cd2b09cb7e8b6c9b51dfec9 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Fri, 17 Apr 2020 21:49:00 +0200
+Subject: [KCharSelect] Adapt the code to KBookmarks-5.69 changes
+
+Test Plan:
+The Bookmarks menu has the usual entries, and the bookmark actions are
+displayed in the configure shortcuts dialog.
+
+Reviewers: cfeck
+
+Reviewed By: cfeck
+
+Subscribers: asturmlechner, kde-utils-devel
+
+Differential Revision: https://phabricator.kde.org/D28927
+---
+ kcharselectdia.cc | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/kcharselectdia.cc b/kcharselectdia.cc
+index 116cba4..37ef894 100644
+--- a/kcharselectdia.cc
++++ b/kcharselectdia.cc
+@@ -27,6 +27,7 @@
+ #include <QMenu>
+ 
+ #include <KActionCollection>
++#include <kbookmarks_version.h>
+ #include <KBookmarkManager>
+ #include <KBookmarkMenu>
+ #include <KConfigGroup>
+@@ -185,7 +186,14 @@ KCharSelectDia::KCharSelectDia()
+   action->setText(i18n("Bookmarks"));
+   QMenu *bmmenu = new QMenu(this);
+   action->setMenu(bmmenu);
++
++#if KBOOKMARKS_VERSION < QT_VERSION_CHECK(5, 69, 0)
+   KBookmarkMenu *bm = new KBookmarkMenu(manager, new KCharSelectBookmarkOwner(this), bmmenu, actionCollection());
++#else
++  KBookmarkMenu *bm = new KBookmarkMenu(manager, new KCharSelectBookmarkOwner(this), bmmenu);
++  actionCollection()->addActions(bmmenu->actions());
++#endif
++
+   bm->setParent(this);
+ 
+   setupGUI(ToolBar|Keys|Save|Create);
+-- 
+cgit v1.1
+

diff --git a/kde-apps/kcharselect/kcharselect-20.04.0.ebuild b/kde-apps/kcharselect/kcharselect-20.04.0.ebuild
index 52f5c54f49..8055e31401 100644
--- a/kde-apps/kcharselect/kcharselect-20.04.0.ebuild
+++ b/kde-apps/kcharselect/kcharselect-20.04.0.ebuild
@@ -29,3 +29,5 @@ DEPEND="
 	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-19.12.3-kf5bookmarks-5.69.patch" )