From d6ca4e4f90cb75c323b5988eefa96a04c0d36908 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 20 Jun 2024 00:10:57 +0100
Subject: gentoo auto-resync : 20:06:2024 - 00:10:56

---
 kde-plasma/Manifest.gz                        | Bin 11646 -> 11642 bytes
 kde-plasma/krdp/Manifest                      |   3 +-
 kde-plasma/krdp/files/krdp-6.0.90-cmake.patch |  38 ++++++++++++++++++++++++++
 kde-plasma/krdp/krdp-6.1.0.ebuild             |   2 ++
 4 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 kde-plasma/krdp/files/krdp-6.0.90-cmake.patch

(limited to 'kde-plasma')

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index fbd393735ad4..facd01725e7c 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/krdp/Manifest b/kde-plasma/krdp/Manifest
index 0453e5a65d2d..6ff77d357cd4 100644
--- a/kde-plasma/krdp/Manifest
+++ b/kde-plasma/krdp/Manifest
@@ -1,3 +1,4 @@
+AUX krdp-6.0.90-cmake.patch 1219 BLAKE2B 0be659611c2c23009e3c185a710a1a7a957bc929e74996a721ed07b0e493fff244c2e2f6f1f1be3f1784dc9e040ec92387269789038e486f812955168608fdcb SHA512 938e40a1a822c71cd548821b8481d6f4f3b610dcd17dc043d846185cce8321beb1884f3ad0ab1d31bf9f631e7cca2694a198ade86f7197d4867c553ac813392c
 DIST krdp-6.1.0.tar.xz 80148 BLAKE2B b349d8ecf5b207726267ce176bdd448f725e8abfe6204aec293e4e412155fc081550532a6dcd8c203d260c13bf8b2466ae90e7e3c29e605f19d5dcbf17499145 SHA512 ae9d65f1f19cfff9b90cf19b5ef4aabb14ae4a5d3afc13e823ca64c4715be82fcfb68effc2faf640d915077e5ccc35aac90d25e0ddcb08f80c509b227bcadc4f
-EBUILD krdp-6.1.0.ebuild 1141 BLAKE2B 42df892a79f60221668cf8b384b2cc3d209df0016bac2ec6b18bdb53378e725fe73f2155765512aba5699ba6556833797c2b46218db8b25657398f1b4f8fc136 SHA512 39a034053aed0bb4befbc694436ebcc368c5a8b91593f455453811c5232f83ca61cb4c3c7d4f48da0de64036c8bea32b9b914242cea31251741365181c5a61c4
+EBUILD krdp-6.1.0.ebuild 1210 BLAKE2B 2e38b2f9c0167a56fc6cf2ff49a4c9a0f79981b1517da012bf866d3b03b9b56fbdecb76adc21b449f9d1df86fe779fab3e80a34a6efa2276b53571cd76f31b65 SHA512 3924d6b09be48a4db24c7f2a293f51f983704b0fbeffdcd49a9a4b33b5ce6a39f252cf10a04fc2e6ed545e67031859864d4f117646c5bb3a1eaa0b40210f6921
 MISC metadata.xml 373 BLAKE2B 0d959dd73fc16211a3a99f2505daa6250608d3e1b60b5964450c608871be52b9edbc2d369664c7ac5b7ed8e279865cbfb34ed27f2b193e78907f7ac226ebbbc9 SHA512 4b563b18a30555ea7a648b98a6c245dea0c3c33acd676a46c53947fc0ff5dad9b01d6d70385ffbd9d351ea77c7444ab3cc8dc68854f4ef743416947a41d64366
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
-- 
cgit v1.2.3