diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-09-30 11:39:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-09-30 11:39:43 +0100 |
| commit | c417025a2ab386cddabb71ad598a9b75b47af313 (patch) | |
| tree | 65963e1f2e99ed22f278cdb819bb1d0892062731 /kde-plasma/kwin | |
| parent | 49fadb6686800eac5ce039896df6437ac7240c8c (diff) | |
gentoo auto-resync : 30:09:2023 - 11:39:43
Diffstat (limited to 'kde-plasma/kwin')
| -rw-r--r-- | kde-plasma/kwin/Manifest | 3 | ||||
| -rw-r--r-- | kde-plasma/kwin/files/kwin-5.27.8-fix-segfalt-in-EglGbmBackend.patch | 27 | ||||
| -rw-r--r-- | kde-plasma/kwin/kwin-5.27.8-r3.ebuild (renamed from kde-plasma/kwin/kwin-5.27.8-r1.ebuild) | 6 |
3 files changed, 34 insertions, 2 deletions
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest index a36026b6bb67..273909533e81 100644 --- a/kde-plasma/kwin/Manifest +++ b/kde-plasma/kwin/Manifest @@ -1,7 +1,8 @@ AUX kwin-5.26.80-gstreamer-optional.patch 948 BLAKE2B 880e77ce6462c115953471dfd4985cc4891a05a910323c1760e01870f04a6930d6d4680811701e12094f1bc3eabbba6b097535408b9148dea4beca31496c7e35 SHA512 66e839c7d603873d675b96430ae48d89366a7f1c5019686c9471ef4fd66449bc4bc22752856665a5d90ab8e503e40d307c4671ac0c2f2991b869e211f7b46c86 AUX kwin-5.27.8-cmake.patch 1127 BLAKE2B 74ed8d9295f5fa35da7e531f0e455177a33e24ecc6b73bb8ce825be458ad3d4f115adcd92933e9c88b957be8365bbab8b00431e708d78e6b8e1c8f1c8174cc61 SHA512 f1f0cc8ab5ff7842879b62ab2bd2397c900b82ce10555193ee91fbbeee994474f63d825be797c9ceb83167701d7fa8ae7ee45f1c541ad3eae863cae0b5778a8f AUX kwin-5.27.8-crashfix.patch 1294 BLAKE2B 4dd8711a3bd442ad15f1f305087ffccbf146b5635f05df4bbb1a285fd2981a374333856c09ec80a0dcc496005078ce3ebd0e635abf1fcc533d2020aac7cac2b8 SHA512 32d6a1158d88cf78f8a7be15af6f6f737192d49dc87dd4989a9557015b341acd3e96a35de7442d43c748d544ac72ef5703b55120415dfd71d8e7617ca9aba253 +AUX kwin-5.27.8-fix-segfalt-in-EglGbmBackend.patch 1048 BLAKE2B 073f9f4d343391854be980289ccad6d9c164b06352fb6963ef7ef5db9e394d8bba423bccdd8d5ff5fae0b6453c60a6e1cad320f462845ceca32cc75dd1ebb706 SHA512 4be4197ecc49c0782851829773b4d9ec0ccf649e24763648b8ed9f4aed11d2a730ee726dfa3fb458e289aeef9f7e29fd9fee878ce5fb19ad77ba4fb74f9a5005 DIST kwin-5.27.8.tar.xz 7631012 BLAKE2B 75bee4f9e13d231a92785eebd7cffcaa8bee556efbf33a731eaa1918c6c471954bc3d059c13f2e2c5f7cce83610a044c73b798bca54ae9c39fe816ae5013054b SHA512 7947d0bf85cd67b83d79580fa355e5217cd4d356b2daa94aff67c637de38625be9f949d4a1441414ba488426ce85a352c6e81d24afdda4930c7d738d575d5163 -EBUILD kwin-5.27.8-r1.ebuild 4193 BLAKE2B 4d39e468fe63ca70baabdfefdfaf757626ac66409beb8fc3a518317966889a8d96e84e71afccc23a90387d05a1e50ea839db436aa11916473c767c19743ceb8d SHA512 83798698df78edd83331551c9ffe879a7be070762c55e10d90c3791fdef4d4186f7a68f3d609503094a79816ffa35cf65a3a5702221240539cd9a395590d0346 EBUILD kwin-5.27.8-r2.ebuild 4243 BLAKE2B 22745e0cade543dad39639c208142242ae77f5e9785e787c7a40094d3d9abf1bd10569e75ec9d55c5ddd663b5b903c73dcbda059b4f6a950d9f522bade54523e SHA512 0f81d27107ac833d55b63ddd30d68a72229be6f0c0a7e788204c39013a1747055945717e6db6c9c4842458a372744466a36aa603fd69c3a13ae19e5bf04e9fc2 +EBUILD kwin-5.27.8-r3.ebuild 4301 BLAKE2B 7750ecce87f49e259cb625cfb324d228b3f579d39cb69d23a0fc3689ec53c4574bc4c48227d538d55574b6615551a7ffb58a00464dbfa0def7231530cd65e6cc SHA512 18e1db5ad76d621b0d08365dbf966f35fd801e3289431631e7238170e2368353baab136b56d324b66cb7741e9bb52aa665335edd410ba2cce6cfcdb226817517 MISC metadata.xml 505 BLAKE2B 41f9200ff14d77161bb0863065be67315f5459fa8232da5f0cf18aacd8abb15f7e858277a59a219e59f777fbd2d2d1f035c941d1a06e459b01935b70921e678d SHA512 19c2af1c8b56be6989b617adc24fc0a8bc33d4913eecf22a4ecef3c1a2cf2994e814655f3a885a75ad17613af1dc41b6babb5e4375a3e217f0cc5842ba969a29 diff --git a/kde-plasma/kwin/files/kwin-5.27.8-fix-segfalt-in-EglGbmBackend.patch b/kde-plasma/kwin/files/kwin-5.27.8-fix-segfalt-in-EglGbmBackend.patch new file mode 100644 index 000000000000..91f42a6d58b1 --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.27.8-fix-segfalt-in-EglGbmBackend.patch @@ -0,0 +1,27 @@ +From e6b20c47ea2d3dfc38632958e0be295a0d376e1f Mon Sep 17 00:00:00 2001 +From: Aki Sakurai <kde@aki.tw> +Date: Thu, 28 Sep 2023 23:50:32 +0800 +Subject: [PATCH] fix segfault in EglGbmBackend::textureForOutput + +(cherry picked from commit 0f1da589ebc90d7436d4f6e8a418be76c10258c6) +--- + src/backends/drm/drm_egl_backend.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/backends/drm/drm_egl_backend.cpp b/src/backends/drm/drm_egl_backend.cpp +index 3b22ef21db2..d6adbe83f04 100644 +--- a/src/backends/drm/drm_egl_backend.cpp ++++ b/src/backends/drm/drm_egl_backend.cpp +@@ -214,6 +214,9 @@ OutputLayer *EglGbmBackend::primaryLayer(Output *output) + std::shared_ptr<GLTexture> EglGbmBackend::textureForOutput(Output *output) const + { + const auto drmOutput = static_cast<DrmAbstractOutput *>(output); ++ if (const auto virtualLayer = dynamic_cast<VirtualEglGbmLayer *>(drmOutput->primaryLayer())) { ++ return virtualLayer->texture(); ++ } + return static_cast<EglGbmLayer *>(drmOutput->primaryLayer())->texture(); + } + +-- +GitLab + diff --git a/kde-plasma/kwin/kwin-5.27.8-r1.ebuild b/kde-plasma/kwin/kwin-5.27.8-r3.ebuild index 9a17232d63c3..64251666db60 100644 --- a/kde-plasma/kwin/kwin-5.27.8-r1.ebuild +++ b/kde-plasma/kwin/kwin-5.27.8-r3.ebuild @@ -100,7 +100,11 @@ BDEPEND=" " PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" -PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # bug 914143 +PATCHES=( + "${FILESDIR}/${P}-cmake.patch" # bug 914143 + "${FILESDIR}/${P}-crashfix.patch" # KDE-bug 471562 + "${FILESDIR}/${P}-fix-segfalt-in-EglGbmBackend.patch" +) src_prepare() { ecm_src_prepare |