[neon/kf6/kf6-kwallet/Neon/stable] debian/patches: Revert "dbus-fix.diff"

Carlos De Maine null at kde.org
Fri May 16 03:03:57 BST 2025


Git commit 020f545acf6ac71c240735aba6b860bf9f14ffd2 by Carlos De Maine.
Committed on 16/05/2025 at 02:03.
Pushed by carlosdem into branch 'Neon/stable'.

Revert "dbus-fix.diff"

This reverts commit 9db6f0b84db9e0dfc05fb70a2f5a2f7f503c5795

D  +0    -26   debian/patches/dbus-fix.diff
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/kf6/kf6-kwallet/-/commit/020f545acf6ac71c240735aba6b860bf9f14ffd2

diff --git a/debian/patches/dbus-fix.diff b/debian/patches/dbus-fix.diff
deleted file mode 100644
index 28ca9ac..0000000
--- a/debian/patches/dbus-fix.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/runtime/ksecretd/main.cpp b/src/runtime/ksecretd/main.cpp
-index df668a1dfbcaf021191df14368a18de934d48a0f..97dcf3c378a2ff59e3f807f525fbc59207b689bd 100644
---- a/src/runtime/ksecretd/main.cpp
-+++ b/src/runtime/ksecretd/main.cpp
-@@ -192,7 +192,7 @@ int main(int argc, char **argv)
-         /* Do not keep dbus-daemon waiting for the org.freedesktop.secrets if kwallet is disabled */
-         KWalletFreedesktopService(nullptr);
- 
--        return (0);
-+        return (-1);
-     }
- 
-     KSecretD secretd;
-diff --git a/src/runtime/kwalletd/main.cpp b/src/runtime/kwalletd/main.cpp
-index 03c9ceaf1ec9c24e728ad18778b84a492a3a729b..0682c7d52ca82a086022a5b3ed18ed5491188937 100644
---- a/src/runtime/kwalletd/main.cpp
-+++ b/src/runtime/kwalletd/main.cpp
-@@ -51,7 +51,7 @@ int main(int argc, char **argv)
-     if (!isWalletEnabled()) {
-         qCDebug(KWALLETD_LOG) << "kwallet is disabled!";
- 
--        return (0);
-+        return (-1);
-     }
- 
-     KDBusService dbusUniqueInstance(KDBusService::Unique);
diff --git a/debian/patches/series b/debian/patches/series
index 6aa58b6..b46ff50 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 blowfish_endianess.diff
-dbus-fix.diff
\ No newline at end of file


More information about the Neon-commits mailing list