diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2024-06-17 19:03:42 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2024-06-17 19:04:20 +0200 |
| commit | 5ba7186a1237d56f9f76faf1becf16163b8cb954 (patch) | |
| tree | d16d50f6d067a896cc5560e243f8ce5348814989 /kde-plasma/krdp | |
| parent | dev-ml/cstruct: add test deps (diff) | |
| download | gentoo-5ba7186a1237d56f9f76faf1becf16163b8cb954.tar.gz gentoo-5ba7186a1237d56f9f76faf1becf16163b8cb954.tar.bz2 gentoo-5ba7186a1237d56f9f76faf1becf16163b8cb954.zip | |
kde-plasma/krdp: Fix build with net-misc/freerdp:3 installed
Closes: https://bugs.gentoo.org/934387
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma/krdp')
| -rw-r--r-- | kde-plasma/krdp/files/krdp-6.0.90-cmake.patch | 38 | ||||
| -rw-r--r-- | kde-plasma/krdp/krdp-6.0.90.ebuild | 2 |
2 files changed, 40 insertions, 0 deletions
diff --git a/kde-plasma/krdp/files/krdp-6.0.90-cmake.patch b/kde-plasma/krdp/files/krdp-6.0.90-cmake.patch new file mode 100644 index 000000000000..62505900a869 --- /dev/null +++ b/kde-plasma/krdp/files/krdp-6.0.90-cmake.patch @@ -0,0 +1,38 @@ +From d2e49c9904897d418930d2e014ad1c4d86df93c4 Mon Sep 17 00:00:00 2001 +From: David Edmundson <david@davidedmundson.co.uk> +Date: Sun, 16 Jun 2024 21:30:28 +0000 +Subject: [PATCH] Ensure WinPR version matches FreeRDP version + +Mixing WinPR 3 with FreeRDP 2 results in disaster. + +See also: https://invent.kde.org/network/krdc/-/merge_requests/90 +Downstream report: https://bugs.gentoo.org/934387 + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> + + +(cherry picked from commit e19742ddb3d7dd99892a9e1bd87bd615ae0c059d) + +Co-authored-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b5c39ba..c23be53 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,8 +41,8 @@ find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS Config DBusAddons KCMUti + find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS Config DBusAddons) + + find_package(FreeRDP 2.10 REQUIRED) +-find_package(WinPR REQUIRED) +-find_package(FreeRDP-Server REQUIRED) ++find_package(WinPR 2.10 REQUIRED) ++find_package(FreeRDP-Server 2.10 REQUIRED) + find_package(KPipeWire 5.27.80 REQUIRED) + find_package(XKB REQUIRED) + +-- +GitLab + diff --git a/kde-plasma/krdp/krdp-6.0.90.ebuild b/kde-plasma/krdp/krdp-6.0.90.ebuild index 034663c89647..7a4a52c8e6bb 100644 --- a/kde-plasma/krdp/krdp-6.0.90.ebuild +++ b/kde-plasma/krdp/krdp-6.0.90.ebuild @@ -40,3 +40,5 @@ RDEPEND="${COMMON_DEPEND} >=kde-frameworks/kirigami-${KFMIN}:6 " BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" + +PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # fixed in 6.1.0 |