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 75C55138350 for ; Wed, 22 Apr 2020 20:34:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D2D1E0DA2; Wed, 22 Apr 2020 20:34:21 +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 DF912E0DA2 for ; Wed, 22 Apr 2020 20:34:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 2865834F08B for ; Wed, 22 Apr 2020 20:34:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8F0D81C8 for ; Wed, 22 Apr 2020 20:34:16 +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: <1587564656.29b9e242aae1dcf070a78da821b417d5794e9b69.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: 29b9e242aae1dcf070a78da821b417d5794e9b69 X-VCS-Branch: master Date: Wed, 22 Apr 2020 20:34:16 +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: a8bc9f21-ef38-4e71-bdeb-adf9ec236657 X-Archives-Hash: ae8cb338a31b28dbc33c7a0b3132609e commit: 29b9e242aae1dcf070a78da821b417d5794e9b69 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Apr 22 14:10:56 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 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 -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 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" )