diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2024-06-19 16:45:36 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2024-06-19 17:03:07 +0200 |
| commit | 8c08005448a4b8779e8bb33815d8fa3b486fbabd (patch) | |
| tree | 7425d08001beb4f81e9558a6c360c87544e95df3 /kde-plasma/krdp | |
| parent | dev-python/pyeclib: enable py3.13 (diff) | |
| download | gentoo-8c08005448a4b8779e8bb33815d8fa3b486fbabd.tar.gz gentoo-8c08005448a4b8779e8bb33815d8fa3b486fbabd.tar.bz2 gentoo-8c08005448a4b8779e8bb33815d8fa3b486fbabd.zip | |
kde-plasma/krdp: Re-add 6.0.90 net-misc/freerdp:3 buildsys fix
Closes: https://bugs.gentoo.org/934545
This reverts commit 1c193dfad02fcb63aeb3873c9c767f35cac68a86.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma/krdp')
| -rw-r--r-- | kde-plasma/krdp/Manifest | 1 | ||||
| -rw-r--r-- | kde-plasma/krdp/files/krdp-6.0.90-cmake.patch | 38 | ||||
| -rw-r--r-- | kde-plasma/krdp/krdp-6.1.0.ebuild | 2 |
3 files changed, 41 insertions, 0 deletions
diff --git a/kde-plasma/krdp/Manifest b/kde-plasma/krdp/Manifest index 984a0fec04dd..0fa05e33df23 100644 --- a/kde-plasma/krdp/Manifest +++ b/kde-plasma/krdp/Manifest @@ -1 +1,2 @@ +DIST krdp-6.0.90.tar.xz 74200 BLAKE2B 14c518cf9fbbd0520a8c2748f93bd71ec3fb32dc274b4e521a640a5ae94ec2df5c4e9dfe51a3e628bfae2fc4b474493b7f5ca4c58325b732da41359cdc079aaa SHA512 ccbc9b54ebe7c4580ee4fc9d76e32bd165ccff2a42c41fbb73969d315f28a9e96e0b98c828928ab44518f97184fb0a6e1ac3ce294dbd97501887b556f7fbaabe DIST krdp-6.1.0.tar.xz 80148 BLAKE2B b349d8ecf5b207726267ce176bdd448f725e8abfe6204aec293e4e412155fc081550532a6dcd8c203d260c13bf8b2466ae90e7e3c29e605f19d5dcbf17499145 SHA512 ae9d65f1f19cfff9b90cf19b5ef4aabb14ae4a5d3afc13e823ca64c4715be82fcfb68effc2faf640d915077e5ccc35aac90d25e0ddcb08f80c509b227bcadc4f 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.1.0.ebuild b/kde-plasma/krdp/krdp-6.1.0.ebuild index 527feca2c991..a6c2f3fd159d 100644 --- a/kde-plasma/krdp/krdp-6.1.0.ebuild +++ b/kde-plasma/krdp/krdp-6.1.0.ebuild @@ -40,3 +40,5 @@ RDEPEND="${COMMON_DEPEND} >=kde-frameworks/kirigami-${KFMIN}:6 " BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" + +PATCHES=( "${FILESDIR}/${PN}-6.0.90-cmake.patch" ) # fixed in 6.1.1 |