gentoo auto-resync : 19:04:2023 - 17:58:12

3 files changed, 35 insertions, 2 deletions

diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index d8d684ed6ae6..b57709e812c0 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,6 +1,7 @@
+AUX libkscreen-5.27.4-cleanup-dpms-obj-in-destructor.patch 726 BLAKE2B bb44e67305f109d3dbe2c74286b3dcba805a781756c33cf8c6130891c2f3ad1e2aeedaac2dfe4833823c68fee64c96c6516497ae11ebcad9dc8a9af3debf4a39 SHA512 1742d9eac14b6713565e70557499149c8f1b22de7d85488fd23d7a3a25109ce1b0663875e4a0823fcc1364304e88d61e8cb9545f5a9db3b94ff311cdd79e0e2f
 AUX libkscreen-5.27.4-clear-edid.patch 1199 BLAKE2B 5323d5314ebd8b37368564a4b936981dc3597bc1a3e85ccee619ae9f92c109b48820225f8e03a0f6aa54fb7074629affb9913edfd502b7daf50afc1c85b47084 SHA512 84c4492731d85e0c642f3ab3c42dc6edb632c9db9214ac480afd1169c28379f243a2aee8fc9603ffeda5fcd8911d33683c3db54b8f115160372878cd3dcb8f47
 DIST libkscreen-5.26.5.tar.xz 106028 BLAKE2B 67601a61a7fdb41c42b3840de29de295482eed942e3ae17a044d29a53821ebb7f5e831ca01c246d8a3f720a27d14d0580203979c5e73e3c624a416cfce458f0b SHA512 a67d1c3a9671380ff1fd0549819a599ac65f9654940a9c18b0695b070eccb9ac153e0ab81ba32e4786913fed8c64ae1754ef275e5f913c1fb221ac9ad8620d10
 DIST libkscreen-5.27.4.tar.xz 114760 BLAKE2B f59ec5e2e8266dbea3a9b13f9ebe80cc79231e204124e13a71f11b5e164c468de653ec241bc114e4a964dee3ce4f6cdcb9edce6538502c83370e324b64d3ea1e SHA512 2696e462ba6619842eebe08a0c3a72525241795462dccb4e693a18336a4fd2e4f6209fd73e3317392556a83b047191673e6d639cb2d777e7ee29e186ead1ee16
 EBUILD libkscreen-5.26.5.ebuild 878 BLAKE2B 0e7004bd0d4fb16f44600c201c96c13b5f26d7403cf3ab9e518d3f8e853956c2b4bcb935ac24580329e631a10be9d5ff60540d3ba0393e1177d58a100b73a18f SHA512 e621abe7d313f2b4c646dfa7afcc673a5786524c7563e89894be6bab508858abd2cade49e5eec14ed617de72732f607598e5974c155357d5555245ee2ad2596d
-EBUILD libkscreen-5.27.4-r1.ebuild 932 BLAKE2B e095108f30b35faada2a70226f187589c0953babf17da7863416073b302c4ff8ff9cec2a97439ab295914ef493316d0271ac1299fb7f7185590d8d45c4d1b4e4 SHA512 de5cd40618d384370df30ba7a52556d5b27cb1a1ef68370b0690e865a686183205cc5160421eaa784770ea282b25ebf8380896566809f15ac8e08df8a70ee89c
+EBUILD libkscreen-5.27.4-r2.ebuild 1007 BLAKE2B 2e6d93d709eae162f1232c210841c44a9cf39afec71d0b6599b4798c9984090bd6e72b1eda313bbeeab2542f33be5c931fc2821f70fd16da90c00b0ce05df406 SHA512 5597dc1920c5c45596e5ce8258a52ae059310745d8218e881bf53fee8774f62743f2b4433071ddcd09a2b8da99f380c91bbaa68d50ec158461ae7b5f0ed770a0
 MISC metadata.xml 406 BLAKE2B f47c4d7eab804ce88be47f9723f0610045c62b51883ad7877b00388cff9c2a6cd1e72afa24076c1c9affae154d6cc881f33eab04b862c4e40f708fde341a4883 SHA512 47370335bdf14118dacfa8189bcafd2089a2ec131c62d2c07a21ea4db32d837de1f5765be2907fd709b263f5fd3c3b2c5f12da1646ad5d9ff6d2b9ea9f99ebf7
diff --git a/kde-plasma/libkscreen/files/libkscreen-5.27.4-cleanup-dpms-obj-in-destructor.patch b/kde-plasma/libkscreen/files/libkscreen-5.27.4-cleanup-dpms-obj-in-destructor.patch
new file mode 100644
index 000000000000..35f0c088d7b3
--- /dev/null
+++ b/kde-plasma/libkscreen/files/libkscreen-5.27.4-cleanup-dpms-obj-in-destructor.patch
@@ -0,0 +1,29 @@
+From 771d68f6dd9d5ecd0a867280aae02fec1fae3fbe Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Thu, 2 Mar 2023 11:55:27 +0000
+Subject: [PATCH] Cleanup dpms object in destructor
+
+(cherry picked from commit 00d8e90f821123f04fcb7ea39724a1f221a76f37)
+---
+ src/libdpms/waylanddpmshelper.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/libdpms/waylanddpmshelper.cpp b/src/libdpms/waylanddpmshelper.cpp
+index 454d5272..e671b1fe 100644
+--- a/src/libdpms/waylanddpmshelper.cpp
++++ b/src/libdpms/waylanddpmshelper.cpp
+@@ -26,6 +26,11 @@ public:
+     {
+     }
+ 
++    ~Dpms()
++    {
++        release();
++    }
++
+     bool isSupported() const
+     {
+         return m_supported;
+-- 
+GitLab
+
diff --git a/kde-plasma/libkscreen/libkscreen-5.27.4-r1.ebuild b/kde-plasma/libkscreen/libkscreen-5.27.4-r2.ebuild
index c481da498507..aac088840e41 100644
--- a/kde-plasma/libkscreen/libkscreen-5.27.4-r1.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.27.4-r2.ebuild
@@ -40,4 +40,7 @@ BDEPEND="
 	dev-util/wayland-scanner
 "
 
-PATCHES=( "${FILESDIR}/${P}-clear-edid.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-clear-edid.patch"
+	"${FILESDIR}/${P}-cleanup-dpms-obj-in-destructor.patch" # KDE-bug 466181
+)