commit: 29b9e242aae1dcf070a78da821b417d5794e9b69 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Apr 22 14:10:56 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Apr 22 14:10:56 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=29b9e242
kde-apps/kcharselect: Tarball respun See also: https://mail.kde.org/pipermail/release-team/2020-April/011840.html 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 deletions(-) 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 deleted file mode 100644 index 46d943bb03..0000000000 --- a/kde-apps/kcharselect/files/kcharselect-19.12.3-kf5bookmarks-5.69.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 7972b9858bcdd2bf8cd2b09cb7e8b6c9b51dfec9 Mon Sep 17 00:00:00 2001 -From: Ahmad Samir <[email protected]> -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 bd0583b8eb..616a58fa3d 100644 --- a/kde-apps/kcharselect/kcharselect-20.04.0.ebuild +++ b/kde-apps/kcharselect/kcharselect-20.04.0.ebuild @@ -29,5 +29,3 @@ DEPEND=" >=kde-frameworks/kxmlgui-${KFMIN}:5 " RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-19.12.3-kf5bookmarks-5.69.patch" )
