[gentoo-commits] repo/gentoo:master commit in: kde-apps/krdc/
commit: 4428c37127dfcb9d91cdd9bbb9f9919dea3eba7f Author: Sam James gentoo org> AuthorDate: Sat Apr 20 04:40:31 2024 + Commit: Sam James gentoo org> CommitDate: Sat Apr 20 04:41:58 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4428c371 kde-apps/krdc: fix slotted freerdp dep This reverts commit f3308126e5bf44da62d79bea5e97de819cb6e457 and then fixes the dep another way. asturm points out that krdc's usage is of the executable so either should be fine after b8adacb0f2818c0e592067c30c11ea7a8788a32f. Instead, let's use :* then. Signed-off-by: Sam James gentoo.org> kde-apps/krdc/{krdc-23.08.5-r1.ebuild => krdc-23.08.5-r2.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/krdc/krdc-23.08.5-r1.ebuild b/kde-apps/krdc/krdc-23.08.5-r2.ebuild similarity index 97% rename from kde-apps/krdc/krdc-23.08.5-r1.ebuild rename to kde-apps/krdc/krdc-23.08.5-r2.ebuild index eaa03d19e23b..3e4e6e3461b3 100644 --- a/kde-apps/krdc/krdc-23.08.5-r1.ebuild +++ b/kde-apps/krdc/krdc-23.08.5-r2.ebuild @@ -44,7 +44,7 @@ DEPEND=" ) " RDEPEND="${DEPEND} - rdp? ( >=net-misc/freerdp-2.1.0:2=[X] ) + rdp? ( >=net-misc/freerdp-1.1.0_beta1:*[X] ) " src_configure() {
[gentoo-commits] repo/gentoo:master commit in: kde-apps/krdc/
commit: f3308126e5bf44da62d79bea5e97de819cb6e457 Author: Sam James gentoo org> AuthorDate: Fri Apr 19 09:21:17 2024 + Commit: Sam James gentoo org> CommitDate: Fri Apr 19 09:21:17 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3308126 kde-apps/krdc: adapt to slotted freerdp We can do this now slotted freerdp is stable. Signed-off-by: Sam James gentoo.org> kde-apps/krdc/{krdc-23.08.5.ebuild => krdc-23.08.5-r1.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/krdc/krdc-23.08.5.ebuild b/kde-apps/krdc/krdc-23.08.5-r1.ebuild similarity index 97% rename from kde-apps/krdc/krdc-23.08.5.ebuild rename to kde-apps/krdc/krdc-23.08.5-r1.ebuild index 04f9b30352cf..eaa03d19e23b 100644 --- a/kde-apps/krdc/krdc-23.08.5.ebuild +++ b/kde-apps/krdc/krdc-23.08.5-r1.ebuild @@ -44,7 +44,7 @@ DEPEND=" ) " RDEPEND="${DEPEND} - rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) + rdp? ( >=net-misc/freerdp-2.1.0:2=[X] ) " src_configure() {
[gentoo-commits] repo/gentoo:master commit in: kde-apps/krdc/files/
commit: 99c7d46983eaca1e121d61a281750415dd20d688 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Thu Apr 18 18:08:10 2024 + Commit: Conrad Kostecki gentoo org> CommitDate: Thu Apr 18 19:31:46 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99c7d469 kde-apps/krdc: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> kde-apps/krdc/files/krdc-winpr-version.patch | 31 1 file changed, 31 deletions(-) diff --git a/kde-apps/krdc/files/krdc-winpr-version.patch b/kde-apps/krdc/files/krdc-winpr-version.patch deleted file mode 100644 index 564dda1af516.. --- a/kde-apps/krdc/files/krdc-winpr-version.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://invent.kde.org/network/krdc/-/merge_requests/90 -https://bugs.gentoo.org/927545 - -From ae05b83ce36ca675c74006c772d9c30de46d96b9 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Sun, 24 Mar 2024 16:10:42 -0400 -Subject: [PATCH] Ensure WinPR version matches FreeRDP version - -Mixing WinPR 3 with FreeRDP 2 results in disaster. - -Bug: https://bugs.gentoo.org/927545 - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 907b7b7d..0440ad34 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -135,7 +135,7 @@ if(WITH_RDP) - PURPOSE "FreeRDP provides RDP support" - TYPE REQUIRED - ) --find_package(WinPR) -+find_package(WinPR 2.10) - set_package_properties(WinPR PROPERTIES - DESCRIPTION "Windows Portable Runtime" - URL "https://www.freerdp.com/; --- -GitLab -
[gentoo-commits] repo/gentoo:master commit in: kde-apps/krdc/files/, kde-apps/krdc/
commit: 33ba2a18bdc47cb0cb63059ef12249616a309a81 Author: Mike Gilbert gentoo org> AuthorDate: Sun Mar 24 20:18:04 2024 + Commit: Mike Gilbert gentoo org> CommitDate: Sun Mar 24 20:18:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33ba2a18 kde-apps/krdc: fix build with FreeRDP 3 installed Closes: https://bugs.gentoo.org/927545 Signed-off-by: Mike Gilbert gentoo.org> kde-apps/krdc/files/krdc-winpr-version.patch | 31 kde-apps/krdc/krdc-24.02.1.ebuild| 7 +++ 2 files changed, 38 insertions(+) diff --git a/kde-apps/krdc/files/krdc-winpr-version.patch b/kde-apps/krdc/files/krdc-winpr-version.patch new file mode 100644 index ..564dda1af516 --- /dev/null +++ b/kde-apps/krdc/files/krdc-winpr-version.patch @@ -0,0 +1,31 @@ +https://invent.kde.org/network/krdc/-/merge_requests/90 +https://bugs.gentoo.org/927545 + +From ae05b83ce36ca675c74006c772d9c30de46d96b9 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Sun, 24 Mar 2024 16:10:42 -0400 +Subject: [PATCH] Ensure WinPR version matches FreeRDP version + +Mixing WinPR 3 with FreeRDP 2 results in disaster. + +Bug: https://bugs.gentoo.org/927545 +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 907b7b7d..0440ad34 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -135,7 +135,7 @@ if(WITH_RDP) + PURPOSE "FreeRDP provides RDP support" + TYPE REQUIRED + ) +-find_package(WinPR) ++find_package(WinPR 2.10) + set_package_properties(WinPR PROPERTIES + DESCRIPTION "Windows Portable Runtime" + URL "https://www.freerdp.com/; +-- +GitLab + diff --git a/kde-apps/krdc/krdc-24.02.1.ebuild b/kde-apps/krdc/krdc-24.02.1.ebuild index 85f26c34a85a..cfc7fc48dcfa 100644 --- a/kde-apps/krdc/krdc-24.02.1.ebuild +++ b/kde-apps/krdc/krdc-24.02.1.ebuild @@ -48,6 +48,13 @@ DEPEND=" " RDEPEND="${DEPEND}" +src_prepare() { + local PATCHES=( + "${FILESDIR}/krdc-winpr-version.patch" + ) + ecm_src_prepare +} + src_configure() { local mycmakeargs=( # TODO: in port to KF6: PlasmaActivities
[gentoo-commits] repo/gentoo:master commit in: kde-apps/krdc/
commit: bb83ab10cb76a823a39e18d919c71322fb33381f Author: Mike Gilbert gentoo org> AuthorDate: Sat Mar 16 16:43:15 2024 + Commit: Mike Gilbert gentoo org> CommitDate: Sun Mar 17 16:34:01 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb83ab10 kde-apps/krdc: depend on slotted freerdp Signed-off-by: Mike Gilbert gentoo.org> kde-apps/krdc/{krdc-24.02.0.ebuild => krdc-24.02.0-r1.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/krdc/krdc-24.02.0.ebuild b/kde-apps/krdc/krdc-24.02.0-r1.ebuild similarity index 96% rename from kde-apps/krdc/krdc-24.02.0.ebuild rename to kde-apps/krdc/krdc-24.02.0-r1.ebuild index bd4d687f5d7b..f66841821cb4 100644 --- a/kde-apps/krdc/krdc-24.02.0.ebuild +++ b/kde-apps/krdc/krdc-24.02.0-r1.ebuild @@ -40,7 +40,7 @@ DEPEND=" >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 ) - rdp? ( >=net-misc/freerdp-2.1.0:= =net-misc/freerdp-2.1.0:2= ) vnc? ( net-libs/libssh:= >=net-libs/libvncserver-0.9
[gentoo-commits] repo/gentoo:master commit in: kde-apps/krdc/
commit: ed2522ecbb4ed40ab1f4cf216e2db0f2011f3dd3 Author: Alex Fan yahoo com> AuthorDate: Sun Sep 12 07:38:45 2021 + Commit: Yixun Lan gentoo org> CommitDate: Sun Sep 12 11:26:58 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed2522ec kde-apps/krdc: keyword 21.08.1 for ~riscv Signed-off-by: Alex Fan yahoo.com> Signed-off-by: Yixun Lan gentoo.org> kde-apps/krdc/krdc-21.08.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/krdc/krdc-21.08.1.ebuild b/kde-apps/krdc/krdc-21.08.1.ebuild index 6481e148aab..ea6946acb53 100644 --- a/kde-apps/krdc/krdc-21.08.1.ebuild +++ b/kde-apps/krdc/krdc-21.08.1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/krdc/; LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="+rdp +vnc" #nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
[gentoo-commits] repo/gentoo:master commit in: kde-apps/krdc/
commit: 052ef35748314573c7829bfa8958bb755609d71c Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Oct 16 09:27:54 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Oct 16 17:45:02 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=052ef357 kde-apps/krdc: add ~ppc64 keyword Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Georgy Yakovlev gentoo.org> kde-apps/krdc/krdc-20.08.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/krdc/krdc-20.08.2.ebuild b/kde-apps/krdc/krdc-20.08.2.ebuild index 38d98430e2f..15fba7ddcb7 100644 --- a/kde-apps/krdc/krdc-20.08.2.ebuild +++ b/kde-apps/krdc/krdc-20.08.2.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/internet/org.kde.krdc; LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="+rdp +vnc" #nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
[gentoo-commits] repo/gentoo:master commit in: kde-apps/krdc/
commit: 137b50e8b2cd2fa37f3b0f0a4402030cd3b77706 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 10 18:41:40 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 10 18:41:40 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=137b50e8 kde-apps/krdc: Drop 19.12.3 (r0) Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/krdc/krdc-19.12.3.ebuild | 52 --- 1 file changed, 52 deletions(-) diff --git a/kde-apps/krdc/krdc-19.12.3.ebuild b/kde-apps/krdc/krdc-19.12.3.ebuild deleted file mode 100644 index dbedd4c702b..000 --- a/kde-apps/krdc/krdc-19.12.3.ebuild +++ /dev/null @@ -1,52 +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" - -#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] ) -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package vnc LibVNCServer) - ) - - ecm_src_configure -}
[gentoo-commits] repo/gentoo:master commit in: kde-apps/krdc/
commit: da8a1a1b388a87e20694ce565aad4cb1d03f498a Author: Sam James (sam_c) cmpct info> AuthorDate: Sat May 9 22:17:32 2020 + Commit: Mart Raudsepp gentoo org> CommitDate: Sun May 10 17:39:00 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da8a1a1b kde-apps/krdc: arm64 stable (bug #720178) Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Sam James (sam_c) cmpct.info> Signed-off-by: Mart Raudsepp gentoo.org> kde-apps/krdc/krdc-19.12.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/krdc/krdc-19.12.3-r1.ebuild b/kde-apps/krdc/krdc-19.12.3-r1.ebuild index 510257cde00..967beea4ffe 100644 --- a/kde-apps/krdc/krdc-19.12.3-r1.ebuild +++ b/kde-apps/krdc/krdc-19.12.3-r1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/internet/org.kde.krdc; LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm64 x86" +KEYWORDS="amd64 arm64 x86" IUSE="+rdp +vnc" # drop kbookmarks subslot operator when KFMIN >= 5.69.0
[gentoo-commits] repo/gentoo:master commit in: kde-apps/krdc/
commit: 7142ead10ad880c6a2678cecebe1447fdd8cee5f Author: Mikle Kolyada gentoo org> AuthorDate: Sun May 10 09:19:16 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun May 10 09:19:48 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7142ead1 kde-apps/krdc: x86 stable wrt bug #720178 Package-Manager: Portage-2.3.99, Repoman-2.3.22 RepoMan-Options: --include-arches="x86" Signed-off-by: Mikle Kolyada gentoo.org> kde-apps/krdc/krdc-19.12.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/krdc/krdc-19.12.3-r1.ebuild b/kde-apps/krdc/krdc-19.12.3-r1.ebuild index 11a72ee0049..510257cde00 100644 --- a/kde-apps/krdc/krdc-19.12.3-r1.ebuild +++ b/kde-apps/krdc/krdc-19.12.3-r1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/internet/org.kde.krdc; LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="+rdp +vnc" # drop kbookmarks subslot operator when KFMIN >= 5.69.0
[gentoo-commits] repo/gentoo:master commit in: kde-apps/krdc/
commit: ad88d423eba7dd739dbbb81df409dcd025951a29 Author: Mikle Kolyada gentoo org> AuthorDate: Sun May 10 09:14:48 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun May 10 09:15:41 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad88d423 kde-apps/krdc: amd64 stable wrt bug #720178 Package-Manager: Portage-2.3.99, Repoman-2.3.22 RepoMan-Options: --include-arches="amd64" Signed-off-by: Mikle Kolyada gentoo.org> kde-apps/krdc/krdc-19.12.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/krdc/krdc-19.12.3-r1.ebuild b/kde-apps/krdc/krdc-19.12.3-r1.ebuild index bd5ed9467fa..11a72ee0049 100644 --- a/kde-apps/krdc/krdc-19.12.3-r1.ebuild +++ b/kde-apps/krdc/krdc-19.12.3-r1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/internet/org.kde.krdc; LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 ~x86" IUSE="+rdp +vnc" # drop kbookmarks subslot operator when KFMIN >= 5.69.0
[gentoo-commits] repo/gentoo:master commit in: kde-apps/krdc/
commit: e3f1778380f1d2f229b363165e60d51b0a83bc9f Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Apr 17 20:58:22 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 17 20:58:45 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3f17783 kde-apps/krdc: Set ISE="+vnc" Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/krdc/krdc-19.12.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/krdc/krdc-19.12.3-r1.ebuild b/kde-apps/krdc/krdc-19.12.3-r1.ebuild index b1956006882..bd5ed9467fa 100644 --- a/kde-apps/krdc/krdc-19.12.3-r1.ebuild +++ b/kde-apps/krdc/krdc-19.12.3-r1.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/applications/internet/org.kde.krdc; LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="+rdp vnc" +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
[gentoo-commits] repo/gentoo:master commit in: kde-apps/krdc/, kde-apps/krdc/files/
commit: 22184441bd9a176fde8c921f7b8432887305b0c6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Apr 17 19:13:18 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 17 20:53:07 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22184441 kde-apps/krdc: Adapt the code to >=kde-frameworks/kbookmarks-5.69 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/krdc-19.12.3-kf5bookmarks-5.69.patch | 48 +++ kde-apps/krdc/krdc-19.12.3-r1.ebuild | 55 ++ 2 files changed, 103 insertions(+) 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 new file mode 100644 index 000..03dc0059147 --- /dev/null +++ b/kde-apps/krdc/files/krdc-19.12.3-kf5bookmarks-5.69.patch @@ -0,0 +1,48 @@ +From 70e9d2728a4928dd2aeb170935d966e934315cf4 Mon Sep 17 00:00:00 2001 +From: Ahmad Samir +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 + #include + #include + +@@ -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 new file mode 100644 index 000..b1956006882 --- /dev/null +++ b/kde-apps/krdc/krdc-19.12.3-r1.ebuild @@ -0,0 +1,55 @@ +# 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 +}
[gentoo-commits] repo/gentoo:master commit in: kde-apps/krdc/
commit: 5c2123915a14bcff3e29d29347493a39d189e13c Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Mar 1 07:33:08 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Mar 1 09:24:38 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c212391 kde-apps/krdc: Fix cmake arg Closes: https://bugs.gentoo.org/678832 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/krdc/krdc-18.12.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/krdc/krdc-18.12.2.ebuild b/kde-apps/krdc/krdc-18.12.2.ebuild index 90e4a4554f1..e4f81e20735 100644 --- a/kde-apps/krdc/krdc-18.12.2.ebuild +++ b/kde-apps/krdc/krdc-18.12.2.ebuild @@ -39,7 +39,7 @@ RDEPEND="${DEPEND} src_configure() { local mycmakeargs=( - -DWITH_LibVNCServer=$(usex vnc) + $(cmake-utils_use_find_package vnc LibVNCServer) ) kde5_src_configure
[gentoo-commits] repo/gentoo:master commit in: kde-apps/krdc/
commit: dfe0a5956197eee285bf77716335d61985f77691 Author: Johannes Huber gentoo org> AuthorDate: Sun Jan 8 11:35:42 2017 + Commit: Johannes Huber gentoo org> CommitDate: Sun Jan 8 11:37:23 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfe0a595 kde-apps/krdc: Use global use desc for rdp Package-Manager: Portage-2.3.3, Repoman-2.3.1 kde-apps/krdc/metadata.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/kde-apps/krdc/metadata.xml b/kde-apps/krdc/metadata.xml index ec0ea8d..2fdbf33 100644 --- a/kde-apps/krdc/metadata.xml +++ b/kde-apps/krdc/metadata.xml @@ -5,7 +5,4 @@ k...@gentoo.org Gentoo KDE Project - - Enable runtime dependency for net-misc/rdesktop -
[gentoo-commits] repo/gentoo:master commit in: kde-apps/krdc/
commit: c3f62e6c893c6be26a09fa6dab082d5dd10b5e80 Author: Pacho Ramos gentoo org> AuthorDate: Fri Jan 6 11:20:19 2017 + Commit: Pacho Ramos gentoo org> CommitDate: Fri Jan 6 11:48:11 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3f62e6c kde-apps/krdc: Move to rdp USE, https://archives.gentoo.org/gentoo-dev/message/8cd304c4f5cdf91e195dc0e6a65b7ad0 Package-Manager: Portage-2.3.3, Repoman-2.3.1 kde-apps/krdc/krdc-16.08.3.ebuild | 6 +++--- kde-apps/krdc/krdc-16.12.0.ebuild | 6 +++--- kde-apps/krdc/metadata.xml| 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kde-apps/krdc/krdc-16.08.3.ebuild b/kde-apps/krdc/krdc-16.08.3.ebuild index bbee92d..2d46f5b 100644 --- a/kde-apps/krdc/krdc-16.08.3.ebuild +++ b/kde-apps/krdc/krdc-16.08.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -10,7 +10,7 @@ inherit kde5 DESCRIPTION="Remote desktop connection (RDP and VNC) client" HOMEPAGE="https://www.kde.org/applications/internet/krdc/; KEYWORDS="amd64 x86" -IUSE="+rdesktop vnc" +IUSE="+rdp vnc" #nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24 @@ -36,7 +36,7 @@ DEPEND=" vnc? ( >=net-libs/libvncserver-0.9 ) " RDEPEND="${DEPEND} - rdesktop? ( >=net-misc/freerdp-1.1.0_beta1[X] ) + rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) " src_configure() { diff --git a/kde-apps/krdc/krdc-16.12.0.ebuild b/kde-apps/krdc/krdc-16.12.0.ebuild index ea37fe9..ef64e8c 100644 --- a/kde-apps/krdc/krdc-16.12.0.ebuild +++ b/kde-apps/krdc/krdc-16.12.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -10,7 +10,7 @@ inherit kde5 DESCRIPTION="Remote desktop connection (RDP and VNC) client" HOMEPAGE="https://www.kde.org/applications/internet/krdc/; KEYWORDS="~amd64 ~x86" -IUSE="+rdesktop vnc" +IUSE="+rdp vnc" #nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24 @@ -36,7 +36,7 @@ DEPEND=" vnc? ( >=net-libs/libvncserver-0.9 ) " RDEPEND="${DEPEND} - rdesktop? ( >=net-misc/freerdp-1.1.0_beta1[X] ) + rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) " src_configure() { diff --git a/kde-apps/krdc/metadata.xml b/kde-apps/krdc/metadata.xml index c642fbe..ec0ea8d 100644 --- a/kde-apps/krdc/metadata.xml +++ b/kde-apps/krdc/metadata.xml @@ -6,6 +6,6 @@ Gentoo KDE Project - Enable runtime dependency for net-misc/rdesktop + Enable runtime dependency for net-misc/rdesktop
[gentoo-commits] repo/gentoo:master commit in: kde-apps/krdc/files/
commit: 24135174f425c331da88f64b4544aff8bf566751 Author: Johannes Huber gentoo org> AuthorDate: Fri Jul 8 21:00:18 2016 + Commit: Johannes Huber gentoo org> CommitDate: Fri Jul 8 21:02:18 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24135174 kde-apps/krdc: Remove unused patch Package-Manager: portage-2.3.0 kde-apps/krdc/files/krdc-4.13.1-freerdp.patch | 184 -- 1 file changed, 184 deletions(-) diff --git a/kde-apps/krdc/files/krdc-4.13.1-freerdp.patch b/kde-apps/krdc/files/krdc-4.13.1-freerdp.patch deleted file mode 100644 index 75b5146..000 --- a/kde-apps/krdc/files/krdc-4.13.1-freerdp.patch +++ /dev/null @@ -1,184 +0,0 @@ -Support >=free-rdp-1.1.0. - -https://git.reviewboard.kde.org/r/115059/ - -diff --git a/rdp/rdpview.cpp b/rdp/rdpview.cpp -index 0d14e04691549e084b58501cd10ca2382ef25c63..9062ba5fa060284a679f0c9bc211ab7dd6972c0a 100644 a/rdp/rdpview.cpp -+++ b/rdp/rdpview.cpp -@@ -158,71 +158,58 @@ bool RdpView::start() - width = this->parentWidget()->size().width(); - height = this->parentWidget()->size().height(); - } --arguments << "-g" << QString::number(width) + 'x' + QString::number(height); -+arguments << "-decorations"; // put this option first so we can detect xfreerdp < 1.1 -+arguments << "/w:" + QString::number(width); -+arguments << "/h:" + QString::number(height); - --arguments << "-k" << keymapToXfreerdp(m_hostPreferences->keyboardLayout()); -+arguments << "/kbd:" + keymapToXfreerdp(m_hostPreferences->keyboardLayout()); - - if (!m_url.userName().isEmpty()) { - // if username contains a domain, it needs to be set with another parameter - if (m_url.userName().contains('\\')) { - const QStringList splittedName = m_url.userName().split('\\'); --arguments << "-d" << splittedName.at(0); --arguments << "-u" << splittedName.at(1); -+arguments << "/d:" + splittedName.at(0); -+arguments << "/u:" + splittedName.at(1); - } else { --arguments << "-u" << m_url.userName(); -+arguments << "/u:" + m_url.userName(); - } - } else { --arguments << "-u" << ""; -+arguments << "-u:"; - } - --if (!m_url.password().isNull()) --arguments << "-p" << m_url.password(); -- --arguments << "-D"; // request the window has no decorations --arguments << "-X" << QString::number(m_container->winId()); --arguments << "-a" << QString::number((m_hostPreferences->colorDepth() + 1) * 8); -- --switch (m_hostPreferences->sound()) { --case 1: --arguments << "-o"; --break; --case 0: --arguments << "--plugin" << "rdpsnd"; --break; --case 2: --default: --break; --} -+arguments << "/parent-window:" + QString::number(m_container->winId()); -+arguments << "/bpp:" + QString::number((m_hostPreferences->colorDepth() + 1) * 8); -+arguments << "/audio-mode:" + m_hostPreferences->sound(); - - if (!m_hostPreferences->shareMedia().isEmpty()) { - QStringList shareMedia; --shareMedia << "--plugin" << "rdpdr" << "--data" << "disk:media:" + m_hostPreferences->shareMedia() << "--"; -+shareMedia << "/drive:media," + m_hostPreferences->shareMedia(); - arguments += shareMedia; - } - - QString performance; - switch (m_hostPreferences->performance()) { - case 0: --performance = 'm'; -+performance = "modem"; - break; - case 1: --performance = 'b'; -+performance = "broadband"; - break; - case 2: --performance = 'l'; -+performance = "lan"; - break; - default: - break; - } - --arguments << "-x" << performance; -+arguments << "/network:" + performance; - - if (m_hostPreferences->console()) { --arguments << "-0"; -+arguments << "/admin"; - } - - if (m_hostPreferences->remoteFX()) { --arguments << "--rfx"; -+arguments << "/rfx"; - } - - if (!m_hostPreferences->extraOptions().isEmpty()) { -@@ -233,16 +220,21 @@ bool RdpView::start() - // krdc has no support for certificate management yet; it would not be possbile to connect to any host: - // "The host key for example.com has changed" ... - // "Add correct host key in ~/.freerdp/known_hosts to get rid of this message." --arguments << "--ignore-certificate"; -+arguments << "/cert-ignore"; - - // clipboard sharing is activated in KRDC; user can disable it at runtime --arguments << "--plugin" << "cliprdr"; -+arguments << "/clipboard"; - --arguments << "-t" << QString::number(m_port); --arguments << m_host; -+arguments << "/port:" + QString::number(m_port); -+arguments << "/v:" + m_host; - - kDebug(5012) << "Starting xfreerdp with arguments:" << arguments; - -+
[gentoo-commits] repo/gentoo:master commit in: kde-apps/krdc/
commit: ec863b0c1efec429d2ba7646e2e93b4184278af9 Author: Mikle Kolyada gentoo org> AuthorDate: Sat Mar 5 11:10:26 2016 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Mar 5 11:10:26 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec863b0c kde-apps/krdc: amd64 stable wrt bug #569742 Package-Manager: portage-2.2.26 kde-apps/krdc/krdc-15.08.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/krdc/krdc-15.08.3.ebuild b/kde-apps/krdc/krdc-15.08.3.ebuild index 6db5a22..a3c95d8 100644 --- a/kde-apps/krdc/krdc-15.08.3.ebuild +++ b/kde-apps/krdc/krdc-15.08.3.ebuild @@ -9,7 +9,7 @@ inherit kde4-base DESCRIPTION="KDE remote desktop connection (RDP and VNC) client" HOMEPAGE="https://www.kde.org/applications/internet/krdc/; -KEYWORDS=" ~amd64 ~x86" +KEYWORDS=" amd64 ~x86" IUSE="debug jpeg +rdesktop telepathy vnc zeroconf" #nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.13.1
[gentoo-commits] repo/gentoo:master commit in: kde-apps/krdc/
commit: 54e39eb9d52510af0cc8a5999761a6f72fdee275 Author: Michael Palimaka gentoo org> AuthorDate: Tue Jan 5 16:13:49 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Jan 5 16:14:16 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54e39eb9 kde-apps/krdc: add missing USE dep Package-Manager: portage-2.2.26 kde-apps/krdc/krdc-15.08.3.ebuild | 2 +- kde-apps/krdc/krdc-4.14.3.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/krdc/krdc-15.08.3.ebuild b/kde-apps/krdc/krdc-15.08.3.ebuild index cdbc821..6db5a22 100644 --- a/kde-apps/krdc/krdc-15.08.3.ebuild +++ b/kde-apps/krdc/krdc-15.08.3.ebuild @@ -16,7 +16,7 @@ IUSE="debug jpeg +rdesktop telepathy vnc zeroconf" DEPEND=" jpeg? ( virtual/jpeg:0 ) - telepathy? ( >=net-libs/telepathy-qt-0.9 ) + telepathy? ( >=net-libs/telepathy-qt-0.9[qt4] ) vnc? ( >=net-libs/libvncserver-0.9 ) zeroconf? ( net-dns/avahi ) " diff --git a/kde-apps/krdc/krdc-4.14.3.ebuild b/kde-apps/krdc/krdc-4.14.3.ebuild index fa92466..213b11d 100644 --- a/kde-apps/krdc/krdc-4.14.3.ebuild +++ b/kde-apps/krdc/krdc-4.14.3.ebuild @@ -16,7 +16,7 @@ IUSE="debug jpeg +rdesktop telepathy vnc zeroconf" DEPEND=" jpeg? ( virtual/jpeg:0 ) - telepathy? ( >=net-libs/telepathy-qt-0.9 ) + telepathy? ( >=net-libs/telepathy-qt-0.9[qt4] ) vnc? ( >=net-libs/libvncserver-0.9 ) zeroconf? ( net-dns/avahi ) "
[gentoo-commits] repo/gentoo:master commit in: kde-apps/krdc/
commit: bb976271cf5c403b0b9ba2f2ab7d18aacb429737 Author: Johannes Huber johu AT gentoo DOT org AuthorDate: Wed Aug 26 12:01:15 2015 + Commit: Johannes Huber johu AT gentoo DOT org CommitDate: Wed Aug 26 12:01:28 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb976271 kde-apps/krdc: Version bump 15.08.0 Gentoo-Bug: 533528 Gentoo-Bug: 545032 Gentoo-Bug: 548740 Package-Manager: portage-2.2.20.1 kde-apps/krdc/Manifest| 1 + kde-apps/krdc/krdc-15.08.0.ebuild | 36 2 files changed, 37 insertions(+) diff --git a/kde-apps/krdc/Manifest b/kde-apps/krdc/Manifest index e9596a4..7a38b92 100644 --- a/kde-apps/krdc/Manifest +++ b/kde-apps/krdc/Manifest @@ -1 +1,2 @@ +DIST krdc-15.08.0.tar.xz 399060 SHA256 6f12ff7fefba7335fbb94a7b36bc1e55c5e6e19accc76a528ad80df3ba2ef88f SHA512 34d698904d1ab13e6ae992313101f563e1bab1e0b34d88921e7b5f9b1170a97ced3ce3b736d1095075fd237461b34264d0f073269c2c488921db8f3163c1445d WHIRLPOOL eed54ef750bcf51423f0d9e72618a49f900b04966092adaa1ec28b055160e3af4a370bf747a74d8d6a1bd7cdee4b7b593ad8306c0d29de30a8674ff8a65c1f13 DIST krdc-4.14.3.tar.xz 398048 SHA256 86dbd710db5f64f59d9879e1630e13821f10a779c8cb194eb6b627f8d03fe61e SHA512 4a9c675611ccca121bf67dd1a721836ac6066ce63fc810c7326ea515f38587ab53db3c63e79fd0ee6d1f6e81913253be76b4f091b797a449ece09b819c5ed1b9 WHIRLPOOL 851746217303c6ff668d6a7b6090e193fcd03c4e9a959c911cd78979a10751303ca4ff434344c5e4b9d4c6b37ea6a50f71383dc8792beae928f0dd6a1eda3023 diff --git a/kde-apps/krdc/krdc-15.08.0.ebuild b/kde-apps/krdc/krdc-15.08.0.ebuild new file mode 100644 index 000..7d01e65 --- /dev/null +++ b/kde-apps/krdc/krdc-15.08.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +KDE_HANDBOOK=optional +inherit kde4-base + +DESCRIPTION=KDE remote desktop connection (RDP and VNC) client +HOMEPAGE=http://www.kde.org/applications/internet/krdc/; +KEYWORDS=~amd64 ~x86 +IUSE=debug jpeg +rdesktop telepathy vnc zeroconf + +#nx? ( =net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.13.1 + +DEPEND= + jpeg? ( virtual/jpeg:0 ) + telepathy? ( =net-libs/telepathy-qt-0.9 ) + vnc? ( =net-libs/libvncserver-0.9 ) + zeroconf? ( net-dns/avahi ) + +RDEPEND=${DEPEND} + rdesktop? ( =net-misc/freerdp-1.1.0_beta1[X] ) + + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_with jpeg) + $(cmake-utils_use_with telepathy TelepathyQt4) + $(cmake-utils_use_with vnc LibVNCServer) + $(cmake-utils_use_with zeroconf DNSSD) + ) + + kde4-base_src_configure +}