gentoo auto-resync : 17:04:2024 - 12:04:27

3 files changed, 2 insertions, 52 deletions

diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 92b628b5cfa6..3a4877b18ce3 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -3,9 +3,8 @@ AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e
 AUX kde-r1.pam 162 BLAKE2B 737f0d766f91111460f49a08d02de36683ada6f6d17e874f59e63153ee512cfcc2de8d9e28cb3531d23c847584d24d9105b24e73e3e72149fb130d3e60ef0cde SHA512 212b9e89137b5191742d8b76a815c12fb99d4b7b05886ccd02066db879474a059636f01f27554abdecb4952624e32db7310dd7ec6d4e4e2b649e9141108c228a
 AUX kde-smartcard.pam 365 BLAKE2B bc84ba04c913c6116f8b482bd2d898f2e15a428aaa73af67a4003f56632883b484d9e1aaa962456baa7723022e700b39917b96577b69e54a9b731fb03aec752a SHA512 aa71785128d12058dc202b07ad0982e33242aae200acb7376ef581267b08b79df022fd5e57eece6d6c01690c8ddcac467f60df64c386f444cf3dae8f48c23925
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
-AUX kscreenlocker-6.0.3-fix-lockscreen-race.patch 1724 BLAKE2B 328accf7d22bd8220b264d2fa657bc868f54aeb02034822746485f8d6c55502ebb7f891ed335c28ad74cd3b00a5213507a660a85ca9404f467dd02c990b4de3d SHA512 c0bc91c0dced7f60139a594ba0ac9aeda4652a101b98b769bc6e81d02a845da3bc69bb6cb1df9d363979fa4c03d7c984c29914222de85d53d9c86fe41b2ebace
 DIST kscreenlocker-5.27.11.tar.xz 160796 BLAKE2B 6ab6060ee7ce2b01a0a29f6d0aebbaba052fabaa6c229e92603b52d32ea473c438b8647cc2f2bdbf48edfa98c05aa7e22ce0b75964d9a8ab6d914c32254fdfcb SHA512 cfaaa6242253f6c511f645bb7f9023328a5d5bb58616284f85db949da969e04303f4e0e28283a08ed0fb02845840be67a76785d4b4596ef057ec7069cda92a3a
-DIST kscreenlocker-6.0.3.tar.xz 164472 BLAKE2B 42078471727ff669af3d929a425d7df8b4f929d4b228c9966e2b1f09485d155937961c99fb76aa838c15e31d98c10b655416297c290bec559ab3cb825f8817ab SHA512 9f4aac85e958fdbca268e14fc60b766968d0b0ae7a657a9b07270177e6c48820910a086bb8ee03d77d09018b7e7a08580e6f2a16ea561e77d540178d4214e21b
+DIST kscreenlocker-6.0.4.tar.xz 164520 BLAKE2B 4c31ff447374c1506e578c6524825da98c98a2cb0dd7ab5ba8edd39d1688d94de5385bd5bf39db292bea8a8bc76f56ae95c86bfeacc4d1a222eb4dbf993c1ba5 SHA512 a5f01c8d1c976584546dacdb9d0f18ee8b59bf3e00caf01a6de294d1998eaf0806e551650d0528a3b3d4f65954fc7edadd808ba75b5b7d7060646058ab8d34cf
 EBUILD kscreenlocker-5.27.11.ebuild 2061 BLAKE2B 7e76232c2f9af8e914a307b6f4eb541f20d64972e02c64c0965bc6dff4cc3dc7038dd06f6e26be1d9936992916ea752a5b7865086f4f46bfe7b97694b3c54e92 SHA512 705595b760b43962a4e479d3f2902eb612773cf34f76f1f52960b41f0c87f584dcccd19592caf36f2ee2c98a464cb7d029aec6bce43cc293d6d6503f6212b557
-EBUILD kscreenlocker-6.0.3-r1.ebuild 1984 BLAKE2B 2ac2ad264596e0c802fb8bc78bab313153938e3b2cecc27e2892eac0587f8fff12c335325f7283ee8bf9ccba6438d39fcb5be3c5531bd6319cb97f7f3d96be7d SHA512 482f618290fbefc8277992c16eab0405ba06cb75facc7e00544662dbb3b23629f6a9dc716d7dc8b6e8d74363538b17c7a7feb47c13d81d59297516c985bdcd44
+EBUILD kscreenlocker-6.0.4.ebuild 1926 BLAKE2B c964c9190189e14b47346c5468c74b61349dc87891954bed246e3f090f577262b777819a25f9be8e467854ed1d6806447fbc115bf741046dda58789a9425ae86 SHA512 5af2e1c5ce7290ff48e5324f9a3fcd05149f51644ab4cc72d38c9dadb3cfe8ca615aef8f7f8a2a18852c4cf0bb76fdf1493cf1fae55a0b3dfadea0e8546c536a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kscreenlocker/files/kscreenlocker-6.0.3-fix-lockscreen-race.patch b/kde-plasma/kscreenlocker/files/kscreenlocker-6.0.3-fix-lockscreen-race.patch
deleted file mode 100644
index 45976e0e1a14..000000000000
--- a/kde-plasma/kscreenlocker/files/kscreenlocker-6.0.3-fix-lockscreen-race.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3105518ec3bc3ac88374e2c3b204f23feda91b5b Mon Sep 17 00:00:00 2001
-From: Dmitriy Konev <ddkonev@gmail.com>
-Date: Sun, 18 Jun 2023 16:42:56 +0300
-Subject: [PATCH] Prevent finishing greeter by unhandled signals
-
-We have time gap between main() start and KSignalHandler registration
-in which signals will close greeter
-
-First this bug tried to fix in commit c63287ca1250d60f61c4429cbeb0215f5c3bebde
-but placing KSignalHandler registration at start of main() is bad idea
-because it broke mechanism for handling signals at all
-and this behaviour was fixed in commit 448df7517021b9c2e68de161008ebc180363abed
-by moving handlers bellow
-for this reason we have this time gap
----
- greeter/main.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/greeter/main.cpp b/greeter/main.cpp
-index bf95cd1e..0693646e 100644
---- a/greeter/main.cpp
-+++ b/greeter/main.cpp
-@@ -57,6 +57,12 @@ static void signalHandler(int signum)
- 
- int main(int argc, char *argv[])
- {
-+    sigset_t blockedSignals;
-+    sigemptyset(&blockedSignals);
-+    sigaddset(&blockedSignals, SIGTERM);
-+    sigaddset(&blockedSignals, SIGUSR1);
-+    pthread_sigmask(SIG_BLOCK, &blockedSignals, NULL);
-+
-     LayerShellQt::Shell::useLayerShell();
- 
-     // disable ptrace on the greeter
-@@ -101,6 +107,8 @@ int main(int argc, char *argv[])
-     // only connect signal handler once we can actual handle the signal properly
-     QObject::connect(KSignalHandler::self(), &KSignalHandler::signalReceived, &app, &signalHandler);
- 
-+    pthread_sigmask(SIG_UNBLOCK, &blockedSignals, NULL);
-+
-     app.setQuitOnLastWindowClosed(false);
-     app.setQuitLockEnabled(false);
-     QCoreApplication::setApplicationName(QStringLiteral("kscreenlocker_greet"));
--- 
-GitLab
-
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-6.0.3-r1.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-6.0.4.ebuild
index ba8ff49e64d2..671e7ee625cc 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-6.0.3-r1.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-6.0.4.ebuild
@@ -58,8 +58,6 @@ BDEPEND="
 "
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*"
 
-PATCHES=( "${FILESDIR}/${P}-fix-lockscreen-race.patch" )
-
 src_prepare() {
 	ecm_src_prepare
 	use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests