From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 80922138353 for ; Sat, 18 Apr 2020 13:45:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8EBDE0784; Sat, 18 Apr 2020 13:45:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 84FC3E0784 for ; Sat, 18 Apr 2020 13:45:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9597834F124 for ; Sat, 18 Apr 2020 13:45:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD0031E2 for ; Sat, 18 Apr 2020 13:45:39 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1587217511.1c45a6e5e5b897b399cef44c8c44b17d36412380.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kcharselect/, kde-apps/kcharselect/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kcharselect/files/kcharselect-19.12.3-kf5bookmarks-5.69.patch kde-apps/kcharselect/kcharselect-20.04.0.ebuild X-VCS-Directories: kde-apps/kcharselect/files/ kde-apps/kcharselect/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 1c45a6e5e5b897b399cef44c8c44b17d36412380 X-VCS-Branch: master Date: Sat, 18 Apr 2020 13:45:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 73430173-6846-4032-8ad5-9a386b4327ca X-Archives-Hash: 0ad367cf7ad73d899d62e3f5e3b2cb60 commit: 1c45a6e5e5b897b399cef44c8c44b17d36412380 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 18 13:45:11 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +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 + + #include ++#include + #include + #include + #include +@@ -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" )