diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-06-18 00:10:02 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-18 00:10:02 +0100 |
| commit | ccaccfe4f1da8c11d9fa110f6e4eb847358769d7 (patch) | |
| tree | ff02c95ae3d9a1e73e2a182e268161743d81a88b /kde-plasma | |
| parent | 74e526c590f52d24a213e25f77858ae0b34ec2c8 (diff) | |
gentoo auto-resync : 18:06:2024 - 00:10:02
Diffstat (limited to 'kde-plasma')
| -rw-r--r-- | kde-plasma/Manifest.gz | bin | 11640 -> 11646 bytes | |||
| -rw-r--r-- | kde-plasma/krdp/Manifest | 3 | ||||
| -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 | ||||
| -rw-r--r-- | kde-plasma/libksysguard/Manifest | 2 | ||||
| -rw-r--r-- | kde-plasma/libksysguard/libksysguard-6.0.90-r1.ebuild | 1 |
6 files changed, 43 insertions, 3 deletions
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz Binary files differindex 9c878048dac0..7ebba5ae77c4 100644 --- a/kde-plasma/Manifest.gz +++ b/kde-plasma/Manifest.gz diff --git a/kde-plasma/krdp/Manifest b/kde-plasma/krdp/Manifest index a6639bd02dfe..c21ef449d098 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.0.90.tar.xz 74200 BLAKE2B 14c518cf9fbbd0520a8c2748f93bd71ec3fb32dc274b4e521a640a5ae94ec2df5c4e9dfe51a3e628bfae2fc4b474493b7f5ca4c58325b732da41359cdc079aaa SHA512 ccbc9b54ebe7c4580ee4fc9d76e32bd165ccff2a42c41fbb73969d315f28a9e96e0b98c828928ab44518f97184fb0a6e1ac3ce294dbd97501887b556f7fbaabe -EBUILD krdp-6.0.90.ebuild 1141 BLAKE2B 59c1d8976150500088faa4a60486a115c9c6f055e61edc0b75c08b0a9b3dfd65d9214683849dba6eaa8a6c2620df7f158daad5172d5d177110adccac506da78b SHA512 2dbb772aa0e99774cb54c1fdfb20b4d45d68e0cff13595aeca123ac09575f657495a5120b77c663e7050d447af1c2b3ae211b29989a2431404f81b3c6d8c9eba +EBUILD krdp-6.0.90.ebuild 1202 BLAKE2B 74e508920e9ce2cf0a8582f9dc41e9081a2dd3a367b7c2edbb5f3a1474e1ad0298cef0efee1dc6fec82f3c1ab79851a3a5ad5f4f25820ac3b9e6194bcfbae9f5 SHA512 f121e32fb8556837ad3aacc5f7a2f0add424bc7674d1c6e1362de1d7ecbe11388b83a872539acbaa069dba2e435f5c2be1d5373a216c901d7757cec986b152c1 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.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 diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest index e4cb144542b0..810e98822e65 100644 --- a/kde-plasma/libksysguard/Manifest +++ b/kde-plasma/libksysguard/Manifest @@ -2,5 +2,5 @@ AUX libksysguard-5.22.80-no-detailed-mem-message.patch 1091 BLAKE2B 1c15fbea7e0f DIST libksysguard-5.27.11.tar.xz 890640 BLAKE2B 61a657f8fbc1042e57ec6e4ba85a6900db680547c61a611200dddc15b94af76f5183db6dc2c867138ccfc2af67f185d16eaff130999c525b3c8b7c23e38adc42 SHA512 21ac0f398c969146a9901cb184508cfab8f1d6e75e364ca638f85e87b0a25f9c901f81696c0bd6ee060f35c54204718f891510e7816858c190d78c2b25004544 DIST libksysguard-6.0.90.tar.xz 303432 BLAKE2B 6de363dca043bb78913de050df119c566f2cf6fa12cb37a6b939d9daab8b73648e79d24d5a443f7839e709320b70258a43e38d0b5cd97a0f362c095c84e5b5fd SHA512 57d8be1e83cde6019e737f17f22f4ba5a2ba31b167389dfb4b3feca8c0486b252375408f26afff7b62fec5829f5d31e227bf632f535141ab313a025a45d632eb EBUILD libksysguard-5.27.11.ebuild 1903 BLAKE2B 01c6fd6fa52cc0386bc9416f93c0d557a0edf91454212ee96fc918b86b93bc0c01791ed792b3a552fef6da21ed4f76cbefc7aed852943c7cdfc4d9f396f121d8 SHA512 f4860635158f1956b3a895295537bf1a2ecd794fac0b670ccce6f29ed5689ae05f269c91f0597ba7d5173ead8c2274f74ef4cf647fb4ec08561cc6d7fc27b462 -EBUILD libksysguard-6.0.90-r1.ebuild 994 BLAKE2B 710f47b3bd88fc8558a563c6c0d9020ec7783fa16e4bf65bfe923452bbb6958ac49d9d16496ba7f830407feac5159185d559ac5001809214547dc1327567f1b7 SHA512 3759bed8c3fa0ebfb66aa914999dde61769ab627bbf3d31383a7061a2d4d254c17b8c5bbd15c7b27b20978624ccaad315da5f2293b740dec9b5f63f90dfb2133 +EBUILD libksysguard-6.0.90-r1.ebuild 968 BLAKE2B 64569f1bc66ee63b0f6e534c332f0ca979a5c4a5771481c68a09b42c3b28d4e4dd74ee48bd8d04186f24a28afe4f41d3f22339c28a7f7182478e45d6f670f32c SHA512 9cdad472f494b991078497edeb2e209027a86e989d9ae001ff3304e2d2cb99fa8338a5ab38006026f21d3df2ef8b6e5d73309cd7500b144da6d026b24abb2a4c MISC metadata.xml 611 BLAKE2B 7e821b5bc0966b855561677eb598ec5eca351955c79f40e2f8622981eb02a206a07b47aec23db6efea5e08edfa2546a01f7f953ed7c7c3dae46ac1fa3f8cfeaa SHA512 ebdb86fa4d523efa0fd614acd9b2275284fb8298a75532d6afb272fe92cd927486044074121811f34ec8096d6de331934413347d1ca6f0f137e5beda0cdfc302 diff --git a/kde-plasma/libksysguard/libksysguard-6.0.90-r1.ebuild b/kde-plasma/libksysguard/libksysguard-6.0.90-r1.ebuild index b3e67e0537c6..88efbb13a4b7 100644 --- a/kde-plasma/libksysguard/libksysguard-6.0.90-r1.ebuild +++ b/kde-plasma/libksysguard/libksysguard-6.0.90-r1.ebuild @@ -3,7 +3,6 @@ EAPI=8 -ECM_DESIGNERPLUGIN="true" ECM_TEST="true" KFMIN=6.3.0 QTMIN=6.7.1 |