diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2024-03-24 16:18:04 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2024-03-24 16:18:04 -0400 |
| commit | 33ba2a18bdc47cb0cb63059ef12249616a309a81 (patch) | |
| tree | 2e3b9fe95abc3dd00281c522f3aa40c94c8f742a /kde-apps | |
| parent | dev-db/rqlite: drop 7.17.0 (diff) | |
| download | gentoo-33ba2a18bdc47cb0cb63059ef12249616a309a81.tar.gz gentoo-33ba2a18bdc47cb0cb63059ef12249616a309a81.tar.bz2 gentoo-33ba2a18bdc47cb0cb63059ef12249616a309a81.zip | |
kde-apps/krdc: fix build with FreeRDP 3 installed
Closes: https://bugs.gentoo.org/927545
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'kde-apps')
| -rw-r--r-- | kde-apps/krdc/files/krdc-winpr-version.patch | 31 | ||||
| -rw-r--r-- | kde-apps/krdc/krdc-24.02.1.ebuild | 7 |
2 files changed, 38 insertions, 0 deletions
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 000000000000..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 <floppym@gentoo.org> +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 |