diff options
| -rw-r--r-- | kde-apps/krdc/Manifest | 2 | ||||
| -rw-r--r-- | kde-apps/krdc/files/krdc-19.12.3-kf5bookmarks-5.69.patch | 48 | ||||
| -rw-r--r-- | kde-apps/krdc/krdc-20.04.0.ebuild | 2 |
3 files changed, 1 insertions, 51 deletions
diff --git a/kde-apps/krdc/Manifest b/kde-apps/krdc/Manifest index 6ff790f00df..dcb79b74fd3 100644 --- a/kde-apps/krdc/Manifest +++ b/kde-apps/krdc/Manifest @@ -1,2 +1,2 @@ DIST krdc-20.03.90.tar.xz 1424992 BLAKE2B 15dd85a7c8ae10bea2c9c4e60648cf1dc15a9b95c8eee58e8666d81cbb388014210695922740b1d371985a32868b1e9a8f83042e7466b3807692f78bc3123e28 SHA512 c96ef622c309ca9c29f7f19261056fb7737e86e9fe88d988241b85bf3663123e15b3b8a806acc9f3daa229a0da9363c7d7610df9aae4f7216414a29062ce05f2 -DIST krdc-20.04.0.tar.xz 1424852 BLAKE2B 7e5d6781bbad2acdff6c5e28172f4cbff90d8bdad29b70e4b4f4f6ac62e3bca9314d6ddbf0275298322a40117337790dbf2663fae7f322467b9669c4f0dd8071 SHA512 3a40bcfb9fec404097f017962f23ceb73b0249193eef7b14c0d3e4b4a2c284c57a7274fbd2e272a9f40efc35652f60d32752ebe0eba54d65813b3fa95af6d85b +DIST krdc-20.04.0.tar.xz 1424980 BLAKE2B 2a4778026d8dd286dd31b03df825b2a9045fe666b569da40b002476220e8cf3e50ee995e8f0d63c26f8cc47133698bf31fe82f0060b97d5b448d456a06572dd8 SHA512 79a20fafb2ddde9b4b6aa6e05c089fc61c9d83e5494e9ab7747a899c8a769963b44210931d444d719126b0b638d07d23c89bb92cc551f91f018be87b9471f85e 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 03dc0059147..00000000000 --- 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 3c05c05c7cf..74b781eac86 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) |