[neon/kde/kwin/Neon/stable] debian/patches: Revert "backport patch as per recomends of kde-distro's list"
Carlos De Maine
null at kde.org
Wed Dec 24 01:13:53 GMT 2025
Git commit 9c4151b19fac6326fa91b6af191ef7664a3f0570 by Carlos De Maine.
Committed on 24/12/2025 at 01:13.
Pushed by carlosdem into branch 'Neon/stable'.
Revert "backport patch as per recomends of kde-distro's list"
This reverts commit 47cb441254e38b3c28b1a54f273b657a51a96f0b.
(cherry picked from commit b4fb63ef923192eb2c8492e287cb2802cd366e0c)
D +0 -80 debian/patches/ef4504320de2c3a7c7aebcf083d75db361f802ae.diff
D +0 -1 debian/patches/series
https://invent.kde.org/neon/kde/kwin/-/commit/9c4151b19fac6326fa91b6af191ef7664a3f0570
diff --git a/debian/patches/ef4504320de2c3a7c7aebcf083d75db361f802ae.diff b/debian/patches/ef4504320de2c3a7c7aebcf083d75db361f802ae.diff
deleted file mode 100644
index f536bf5..0000000
--- a/debian/patches/ef4504320de2c3a7c7aebcf083d75db361f802ae.diff
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/src/core/session_consolekit.cpp b/src/core/session_consolekit.cpp
-index 0200407e63d7cefffb6ab8f34a4c6f26846ac00a..c0e8449f8a2a47e3e54475fccb50f573346e0ede 100644
---- a/src/core/session_consolekit.cpp
-+++ b/src/core/session_consolekit.cpp
-@@ -239,7 +239,7 @@ FileDescriptor ConsoleKitSession::delaySleep(const QString &reason)
- return FileDescriptor{};
- }
- const QDBusUnixFileDescriptor descriptor = reply.arguments().constFirst().value<QDBusUnixFileDescriptor>();
-- return FileDescriptor{descriptor.fileDescriptor()};
-+ return FileDescriptor{fcntl(descriptor.fileDescriptor(), F_DUPFD_CLOEXEC, 0)};
- }
-
- ConsoleKitSession::ConsoleKitSession(const QString &sessionPath)
-diff --git a/src/core/session_logind.cpp b/src/core/session_logind.cpp
-index 978c410cfeae8b91336f035b99ae11764faec498..5f6541c289b5fa263a3534821ec9c3b33490005b 100644
---- a/src/core/session_logind.cpp
-+++ b/src/core/session_logind.cpp
-@@ -237,7 +237,7 @@ FileDescriptor LogindSession::delaySleep(const QString &reason)
- return FileDescriptor{};
- }
- const QDBusUnixFileDescriptor descriptor = reply.arguments().constFirst().value<QDBusUnixFileDescriptor>();
-- return FileDescriptor{descriptor.fileDescriptor()};
-+ return FileDescriptor(fcntl(descriptor.fileDescriptor(), F_DUPFD_CLOEXEC, 0));
- }
-
- LogindSession::LogindSession(const QString &sessionPath)
-diff --git a/src/utils/filedescriptor.cpp b/src/utils/filedescriptor.cpp
-index d60c429e446c041a46d8c91adca20eba316fa71c..f76f07aad1ac227a96ef307c4cdab783414648fe 100644
---- a/src/utils/filedescriptor.cpp
-+++ b/src/utils/filedescriptor.cpp
-@@ -7,6 +7,7 @@
- SPDX-License-Identifier: GPL-2.0-or-later
- */
- #include "filedescriptor.h"
-+#include "common.h"
-
- #include <fcntl.h>
- #include <sys/poll.h>
-@@ -29,7 +30,12 @@ FileDescriptor::FileDescriptor(FileDescriptor &&other)
- FileDescriptor &FileDescriptor::operator=(FileDescriptor &&other)
- {
- if (m_fd != -1) {
-- ::close(m_fd);
-+ const int err = ::close(m_fd);
-+ if (Q_UNLIKELY(err != 0)) {
-+ // If this failed, we've either closed the fd somewhere else, or we end up
-+ // leaking this fd here. Either way, there's some significant bug!
-+ qCCritical(KWIN_CORE, "::close() failed: %s", strerror(errno));
-+ }
- }
- m_fd = std::exchange(other.m_fd, -1);
- return *this;
-@@ -38,7 +44,12 @@ FileDescriptor &FileDescriptor::operator=(FileDescriptor &&other)
- FileDescriptor::~FileDescriptor()
- {
- if (m_fd != -1) {
-- ::close(m_fd);
-+ const int err = ::close(m_fd);
-+ if (Q_UNLIKELY(err != 0)) {
-+ // If this failed, we've either closed the fd somewhere else, or we end up
-+ // leaking this fd here. Either way, there's some significant bug!
-+ qCCritical(KWIN_CORE, "::close() failed: %s", strerror(errno));
-+ }
- }
- }
-
-@@ -60,7 +71,12 @@ int FileDescriptor::take()
- void FileDescriptor::reset()
- {
- if (m_fd != -1) {
-- ::close(m_fd);
-+ const int err = ::close(m_fd);
-+ if (Q_UNLIKELY(err != 0)) {
-+ // If this failed, we've either closed the fd somewhere else, or we end up
-+ // leaking this fd here. Either way, there's some significant bug!
-+ qCCritical(KWIN_CORE, "::close() failed: %s", strerror(errno));
-+ }
- m_fd = -1;
- }
- }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8a61467..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-ef4504320de2c3a7c7aebcf083d75db361f802ae.diff
More information about the Neon-commits
mailing list