summaryrefslogtreecommitdiff
path: root/kde-plasma/kwin
diff options
context:
space:
mode:
Diffstat (limited to 'kde-plasma/kwin')
-rw-r--r--kde-plasma/kwin/Manifest5
-rw-r--r--kde-plasma/kwin/files/kwin-5.25.4-drm-fix-blob-updating.patch38
-rw-r--r--kde-plasma/kwin/kwin-5.25.5.ebuild (renamed from kde-plasma/kwin/kwin-5.25.4-r1.ebuild)2
3 files changed, 2 insertions, 43 deletions
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 2eb81705479f..82f57461e76b 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -2,9 +2,8 @@ AUX kwin-5.21.80-gstreamer-optional.patch 971 BLAKE2B f31d18f865a9108ff1bfb711ea
AUX kwin-5.24.6-drm-fix-blob-updating.patch 1096 BLAKE2B 1d9492147732110b9835ff25d7ee3c24eaf9ec145676b95782a94a3972b4766686f1a8b591f272250c8dc4958b686b510cec9ad21db7c39801d02150f7f4dc0a SHA512 d451ac0371e1c467a9f7033faccebfe29adc82977dcbddfd892eca5913ef8df22f7bc0addab42f36e39467d71022c7862e0b33e39f1f800347ddf21d3265b6a1
AUX kwin-5.24.6-emit-rowsChanged.patch 999 BLAKE2B ed3519679b81e56a4c52e7d20b91516cefeaa4c4cdb432795edeb9fb8f98aba0ec720662966a2b9ff764ec3bf5126ab2aafe08a209dac826b30dc0139737cc6b SHA512 f6b865aededd119fed69b19d994604179de0ac69efbbefc300872a396125bb3acd635b2784dd54ab961d517b5752e2520c7e2c701263abbc47c3ca3335d44bb3
AUX kwin-5.24.6-fix-color-picker.patch 1952 BLAKE2B 36409ce88f6a0ec2a9b561ed33134db8d10c9a1e3f2e936d7a4375d9eef2f6f41c64a3c584187ef8b0e7cbd2b91f0f3248f462bf5093a17108f27722bbdf7afd SHA512 77cc88b24baaadbcd0737a8bd2a8b14f5f2b4f5bd7348553c67d406032ba886720b448691ba9c99c12e1da41f5af31752955caaa43f2f75064816ca4f739b105
-AUX kwin-5.25.4-drm-fix-blob-updating.patch 1096 BLAKE2B e0d4980bb08e5b1469df84a5682eab739f99f86fdcbffb6577f9cfdffd815c32f58cb7b891c2305c7ddce20fa5456524061f51f3084a77e6d64d0ff81ddc79fb SHA512 54cfcc6f72151787c7b22efb629dfbbd8e5af1b05567071b3aa2f11caf3c65295127e5fa1529763157971f6d707c4078c28d9cddd5bb0f244b774f20a734e08c
DIST kwin-5.24.6.tar.xz 6464412 BLAKE2B e3dabbac99cb1ad4eab9995987b6070d2ae0c7d24b8745edad51d573f955783ef4dfafa91ef686a9325659b7ff32282f8448c4beca90b8ad357d83d210964008 SHA512 582464134046c672f9dd798a5485eb2ea93c71676ad20aebda60d978d459104e74fe1283cb0e16968216faf53827dc3e47d669d4c977e0fb7a5a4bb408f77eeb
-DIST kwin-5.25.4.tar.xz 6639040 BLAKE2B d2160b7e9bedb77ed50033eee9e901edf962c3b6c2b6d0c4e5b19651a1a466c4e5868a2b66dc6b2b00f73381661a59fc9da317fc9cda48488b57ee86f7543f7f SHA512 14ffb4ea0eb069811803253b8abb7737eecb5c121c99c477c1b085a80812eae10d9e2012e3343b326f1a3258a2854d1f8b138dad2f31e548835b9bf09769c0fd
+DIST kwin-5.25.5.tar.xz 6650756 BLAKE2B e0e08b6f688e0f614635618022142eafc7913935b14e5408927bc69762042e5e6085476ddda24fde2dd51571995709702d8c4aaffcf7004dbe1c77f155e02924 SHA512 7fe60738a02eb097e3f97ec2d93a5bc3788f16de75d2e98e3370db46a83152c9ca52973781049b260ec81f2dab6a6d17e699b58903d897c34f7034fec3a3a0df
EBUILD kwin-5.24.6-r2.ebuild 4194 BLAKE2B fdb0bd8025961424f53a05ce566d6dc91c19d54d2aa81dff98ed5bb4002c5a976917126ba49bf72241d497a37bbd3de04190a3a1f223776f0b8973f72b854ee7 SHA512 35f7bdd1b8679d3bb945a749ffd3a5f88d158ecf592e59ef29b708b6b201f230ca2d9a72a03f5316eebc14136565d9cbfab06f66acc2c2ed9df6437fe094196b
-EBUILD kwin-5.25.4-r1.ebuild 4261 BLAKE2B 54cac57cf5022ed700f94cae73463a29b3bf12ae08f0e652fff1189b94b6560f332805f764eebab661b62a504f9c455df1b217e1e4aa21f2f9c98b4495cdf051 SHA512 4188247aba43f8b37dff1aa7dad6becad7ae5e94e457d29ed1070c2520157ef321891d9fa9b3117d37f85c621b0f2e132ff7df84df06f68bea190d54ff86c5dc
+EBUILD kwin-5.25.5.ebuild 4184 BLAKE2B 2125f4b38821aa20f5aea1573cd944da84cdf6b999da0649a24657f0638d7991b100bff3547a2f6bc554a9bcd27cb28d04ee15bc3dcd81ebdc526da41ceef192 SHA512 d98d9215b849068709589c9ef2557eea02df7e01a712a2ab30dec36cdb76f244e7294533c0da14814eb21ea53ec5b5e219e4c2432d34064082fea209e4f893ab
MISC metadata.xml 505 BLAKE2B 41f9200ff14d77161bb0863065be67315f5459fa8232da5f0cf18aacd8abb15f7e858277a59a219e59f777fbd2d2d1f035c941d1a06e459b01935b70921e678d SHA512 19c2af1c8b56be6989b617adc24fc0a8bc33d4913eecf22a4ecef3c1a2cf2994e814655f3a885a75ad17613af1dc41b6babb5e4375a3e217f0cc5842ba969a29
diff --git a/kde-plasma/kwin/files/kwin-5.25.4-drm-fix-blob-updating.patch b/kde-plasma/kwin/files/kwin-5.25.4-drm-fix-blob-updating.patch
deleted file mode 100644
index 282913620c7b..000000000000
--- a/kde-plasma/kwin/files/kwin-5.25.4-drm-fix-blob-updating.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 9a81567777f94e2e6c1a121f1d86dd2bdea83adf Mon Sep 17 00:00:00 2001
-From: Xaver Hugl <xaver.hugl@gmail.com>
-Date: Thu, 4 Aug 2022 15:36:26 +0200
-Subject: [PATCH] backends/drm: fix blob updating
-
-Two things about the code were wrong:
-1. m_current is used in updateBlob() but was only updated afterwards
-2. the assumption that the property having the same ID means it has the
-same blob contents is not always true
-
-BUG: 449285
-
-
-(cherry picked from commit 97939ceae864aef2f50e117496f548555877b4ea)
----
- src/backends/drm/drm_property.cpp | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/src/backends/drm/drm_property.cpp b/src/backends/drm/drm_property.cpp
-index c9f7718abd..cee80d043a 100644
---- a/src/backends/drm/drm_property.cpp
-+++ b/src/backends/drm/drm_property.cpp
-@@ -112,10 +112,8 @@ bool DrmProperty::needsCommit() const
-
- void DrmProperty::setCurrent(uint64_t value)
- {
-- if (m_current != value) {
-- updateBlob();
-- m_current = value;
-- }
-+ m_current = value;
-+ updateBlob();
- }
-
- uint64_t DrmProperty::current() const
---
-GitLab
-
diff --git a/kde-plasma/kwin/kwin-5.25.4-r1.ebuild b/kde-plasma/kwin/kwin-5.25.5.ebuild
index 44b1802e9117..ca0aa6e8d72d 100644
--- a/kde-plasma/kwin/kwin-5.25.4-r1.ebuild
+++ b/kde-plasma/kwin/kwin-5.25.5.ebuild
@@ -102,8 +102,6 @@ BDEPEND="
"
PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-PATCHES=( "${FILESDIR}/${P}-drm-fix-blob-updating.patch" ) # KDE-bug 449285
-
src_prepare() {
ecm_src_prepare
use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"