commit: 36c6a11623a22308703232b98c221b3610fe1430 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Apr 18 12:25:30 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Apr 18 13:43:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36c6a116
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-19.12.3-r1.ebuild | 34 +++++++++++++++ 2 files changed, 84 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 00000000000..46d943bb037 --- /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 <[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-19.12.3-r1.ebuild b/kde-apps/kcharselect/kcharselect-19.12.3-r1.ebuild new file mode 100644 index 00000000000..552741cdfb6 --- /dev/null +++ b/kde-apps/kcharselect/kcharselect-19.12.3-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +KFMIN=5.63.0 +QTMIN=5.12.3 +inherit ecm kde.org + +DESCRIPTION="KDE character selection utility" +HOMEPAGE="https://kde.org/applications/utilities/org.kde.kcharselect +https://utils.kde.org/projects/kcharselect/"; + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="" + +# drop kbookmarks subslot operator when KFMIN >= 5.69.0 +DEPEND=" + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kbookmarks-${KFMIN}:5= + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-kf5bookmarks-5.69.patch" )
