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

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

commit:     735b5f84af3e70fd91315827f9ad22be512670e1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 22 14:14:52 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 22 14:14:52 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=735b5f84

kde-apps/krdc: 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>

 .../files/krdc-19.12.3-kf5bookmarks-5.69.patch     | 48 ----------------------
 kde-apps/krdc/krdc-20.04.0.ebuild                  |  2 -
 2 files changed, 50 deletions(-)

diff --git a/kde-apps/krdc/files/krdc-19.12.3-kf5bookmarks-5.69.patch b/kde-apps/krdc/files/krdc-19.12.3-kf5bookmarks-5.69.patch
deleted file mode 100644
index 03dc005914..0000000000
--- a/kde-apps/krdc/files/krdc-19.12.3-kf5bookmarks-5.69.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 70e9d2728a4928dd2aeb170935d966e934315cf4 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Fri, 17 Apr 2020 15:52:15 +0200
-Subject: Adapt to changes in KBookmarks >= 5.69
-
-Test Plan:
-The Bookmarks menu is still added as expected and the actions still show
-in the configure shortcuts dialog. I couldn't test actually creating a
-bookmark as I have no access to remote servers.
-
-Reviewers: cfeck, uwolfer, murrant
-
-Reviewed By: cfeck
-
-Differential Revision: https://phabricator.kde.org/D28920
----
- bookmarkmanager.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/bookmarkmanager.cpp b/bookmarkmanager.cpp
-index 47ac779..a34cb2c 100644
---- a/bookmarkmanager.cpp
-+++ b/bookmarkmanager.cpp
-@@ -25,6 +25,7 @@
- #include "mainwindow.h"
- #include "krdc_debug.h"
- 
-+#include <kbookmarks_version.h>
- #include <KBookmarks/KBookmarkOwner>
- #include <KLocalizedString>
- 
-@@ -41,7 +42,13 @@ BookmarkManager::BookmarkManager(KActionCollection *collection, QMenu *menu, Mai
- 
-     m_manager = KBookmarkManager::managerForFile(file, QLatin1String("krdc"));
-     m_manager->setUpdate(true);
-+
-+#if KBOOKMARKS_VERSION < QT_VERSION_CHECK(5, 69, 0)
-     m_bookmarkMenu = new KBookmarkMenu(m_manager, this, menu, collection);
-+#else
-+    m_bookmarkMenu = new KBookmarkMenu(m_manager, this, menu);
-+    collection->addActions(menu->actions());
-+#endif
- 
-     KBookmarkGroup root = m_manager->root();
-     KBookmark bm = root.first();
--- 
-cgit v1.1
-

diff --git a/kde-apps/krdc/krdc-20.04.0.ebuild b/kde-apps/krdc/krdc-20.04.0.ebuild
index 3c05c05c7c..74b781eac8 100644
--- a/kde-apps/krdc/krdc-20.04.0.ebuild
+++ b/kde-apps/krdc/krdc-20.04.0.ebuild
@@ -43,8 +43,6 @@ RDEPEND="${DEPEND}
 	rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-19.12.3-kf5bookmarks-5.69.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package vnc LibVNCServer)