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

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

[Mike Gilbert]

commit:     33ba2a18bdc47cb0cb63059ef12249616a309a81
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 20:18:04 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 20:18:04 2024 +0000
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 <floppym <AT> 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 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