diff options
| -rw-r--r-- | kde-apps/krdc/Manifest | 1 | ||||
| -rw-r--r-- | kde-apps/krdc/files/krdc-19.12.3-kf5bookmarks-5.69.patch | 48 | ||||
| -rw-r--r-- | kde-apps/krdc/krdc-19.12.3-r1.ebuild | 55 |
3 files changed, 0 insertions, 104 deletions
diff --git a/kde-apps/krdc/Manifest b/kde-apps/krdc/Manifest index ae72633a5eb4..078ce061930c 100644 --- a/kde-apps/krdc/Manifest +++ b/kde-apps/krdc/Manifest @@ -1,2 +1 @@ -DIST krdc-19.12.3.tar.xz 1424052 BLAKE2B b03514265d0e7af5e75dab5a224f61b43f33e36a1617dac7e99270e82e5954fc8910072e11561fb51fd1d8ee7287aaf24371d9b1d1022418e4e30defcb45ad48 SHA512 f752180980eebc9aaee92180d3bbc9e4db723ef0ed637b3ec66a5944e30eba3c224972d4e8f543ee1c32a4e62a0d90d37c4f82f575e94a3ac8d9dbe5feb63474 DIST krdc-20.04.3.tar.xz 1424740 BLAKE2B 92f3751c14974ea3b79e17dbadd8f89665adbcc5c147bc5228d9bf6bb146e079a82343840adb62e812b31dc4553faa77a45bdd4a176f83f9e4d14f4423b86be2 SHA512 f7ff9be6ffa612e8da0766309f812e7041393eb9b5ff4b1cb58385f1f754c0851357a4509bff7eea76e0e035bcefac9580415710561f1369dab1dd4e9f86a4ff 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 03dc0059147a..000000000000 --- 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-19.12.3-r1.ebuild b/kde-apps/krdc/krdc-19.12.3-r1.ebuild deleted file mode 100644 index 967beea4ffec..000000000000 --- a/kde-apps/krdc/krdc-19.12.3-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="optional" -KFMIN=5.63.0 -QTMIN=5.12.3 -inherit ecm kde.org - -DESCRIPTION="Remote desktop connection (RDP and VNC) client" -HOMEPAGE="https://kde.org/applications/internet/org.kde.krdc" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 arm64 x86" -IUSE="+rdp +vnc" - -# drop kbookmarks subslot operator when KFMIN >= 5.69.0 -#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24 -DEPEND=" - >=kde-frameworks/kbookmarks-${KFMIN}:5= - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdnssd-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - vnc? ( >=net-libs/libvncserver-0.9 ) -" -RDEPEND="${DEPEND} - rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) -" - -PATCHES=( "${FILESDIR}/${P}-kf5bookmarks-5.69.patch" ) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package vnc LibVNCServer) - ) - - ecm_src_configure -} |