Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qtkeychain-qt5 for openSUSE:Factory checked in at 2024-03-15 20:28:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qtkeychain-qt5 (Old) and /work/SRC/openSUSE:Factory/.qtkeychain-qt5.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qtkeychain-qt5" Fri Mar 15 20:28:24 2024 rev:16 rq:1157032 version:0.14.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qtkeychain-qt5/qtkeychain-qt5.changes 2023-08-11 15:55:10.247633128 +0200 +++ /work/SRC/openSUSE:Factory/.qtkeychain-qt5.new.1905/qtkeychain-qt5.changes 2024-03-15 20:28:59.179010071 +0100 @@ -1,0 +2,6 @@ +Mon Mar 11 20:59:15 UTC 2024 - Christophe Marin <[email protected]> + +- Update to 0.14.2 + * Add support for KWallet 6 + +------------------------------------------------------------------- Old: ---- qtkeychain-qt5-0.14.1.tar.gz New: ---- qtkeychain-qt5-0.14.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtkeychain-qt5.spec ++++++ --- /var/tmp/diff_new_pack.bUsKaO/_old 2024-03-15 20:28:59.979039538 +0100 +++ /var/tmp/diff_new_pack.bUsKaO/_new 2024-03-15 20:28:59.983039685 +0100 @@ -18,7 +18,7 @@ %define sover 1 Name: qtkeychain-qt5 -Version: 0.14.1 +Version: 0.14.2 Release: 0 Summary: A password store library License: BSD-2-Clause qtkeychain-qt6.spec: same change ++++++ qtkeychain-qt5-0.14.1.tar.gz -> qtkeychain-qt5-0.14.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtkeychain-0.14.1/CMakeLists.txt new/qtkeychain-0.14.2/CMakeLists.txt --- old/qtkeychain-0.14.1/CMakeLists.txt 2023-06-01 13:38:35.000000000 +0200 +++ new/qtkeychain-0.14.2/CMakeLists.txt 2023-12-17 08:52:04.000000000 +0100 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16) -set(QTKEYCHAIN_VERSION 0.14.1) +set(QTKEYCHAIN_VERSION 0.14.2) set(QTKEYCHAIN_SOVERSION 1) project(qtkeychain VERSION ${QTKEYCHAIN_VERSION} LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtkeychain-0.14.1/ChangeLog new/qtkeychain-0.14.2/ChangeLog --- old/qtkeychain-0.14.1/ChangeLog 2023-06-01 13:38:35.000000000 +0200 +++ new/qtkeychain-0.14.2/ChangeLog 2023-12-17 08:52:04.000000000 +0100 @@ -1,6 +1,10 @@ ChangeLog ========= +version 0.14.2 (release 2023-12-17) + + - Add support for KWallet 6 (Volker Krause <[email protected]>) + version 0.14.1 (release 2023-06-01) - Export QKeychain::isAvailable() to make it usable in a shared build (Volker Krause <[email protected]>) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtkeychain-0.14.1/keychain_unix.cpp new/qtkeychain-0.14.2/keychain_unix.cpp --- old/qtkeychain-0.14.1/keychain_unix.cpp 2023-06-01 13:38:35.000000000 +0200 +++ new/qtkeychain-0.14.2/keychain_unix.cpp 2023-12-17 08:52:04.000000000 +0100 @@ -19,24 +19,35 @@ Backend_LibSecretKeyring, Backend_GnomeKeyring, Backend_Kwallet4, - Backend_Kwallet5 + Backend_Kwallet5, + Backend_Kwallet6, }; enum DesktopEnvironment { DesktopEnv_Gnome, DesktopEnv_Kde4, DesktopEnv_Plasma5, + DesktopEnv_Plasma6, DesktopEnv_Unity, DesktopEnv_Xfce, DesktopEnv_Other }; +static constexpr const char KWALLET6_DBUS_IFACE[] = "org.kde.kwalletd6"; +static constexpr const char KWALLET6_DBUS_PATH[] = "/modules/kwalletd6"; +static constexpr const char KWALLET5_DBUS_IFACE[] = "org.kde.kwalletd5"; +static constexpr const char KWALLET5_DBUS_PATH[] = "/modules/kwalletd5"; +static constexpr const char KWALLET4_DBUS_IFACE[] = "org.kde.kwalletd"; +static constexpr const char KWALLET4_DBUS_PATH[] = "/modules/kwalletd"; + // the following detection algorithm is derived from chromium, // licensed under BSD, see base/nix/xdg_util.cc static DesktopEnvironment getKdeVersion() { QByteArray value = qgetenv("KDE_SESSION_VERSION"); - if ( value == "5" ) { + if ( value == "6" ) { + return DesktopEnv_Plasma6; + } else if ( value == "5" ) { return DesktopEnv_Plasma5; } else if (value == "4" ) { return DesktopEnv_Kde4; @@ -78,14 +89,14 @@ return DesktopEnv_Other; } -static bool isKwallet5Available() +static bool isKwalletAvailable(const char *dbusIface, const char *dbusPath) { if (!QDBusConnection::sessionBus().isConnected()) return false; org::kde::KWallet iface( - QLatin1String("org.kde.kwalletd5"), - QLatin1String("/modules/kwalletd5"), + QLatin1String(dbusIface), + QLatin1String(dbusPath), QDBusConnection::sessionBus()); // At this point iface.isValid() can return false even though the @@ -118,7 +129,7 @@ return Backend_Kwallet4; case DesktopEnv_Plasma5: - if (isKwallet5Available()) { + if (isKwalletAvailable(KWALLET5_DBUS_IFACE, KWALLET5_DBUS_PATH)) { return Backend_Kwallet5; } if (LibSecretKeyring::isAvailable()) { @@ -130,6 +141,19 @@ // During startup the keychain backend might just not have started yet return Backend_Kwallet5; + case DesktopEnv_Plasma6: + if (isKwalletAvailable(KWALLET6_DBUS_IFACE, KWALLET6_DBUS_PATH)) { + return Backend_Kwallet6; + } + if (LibSecretKeyring::isAvailable()) { + return Backend_LibSecretKeyring; + } + if (GnomeKeyring::isAvailable()) { + return Backend_GnomeKeyring; + } + // During startup the keychain backend might just not have started yet + return Backend_Kwallet6; + case DesktopEnv_Gnome: case DesktopEnv_Unity: case DesktopEnv_Xfce: @@ -141,7 +165,10 @@ if (GnomeKeyring::isAvailable()) { return Backend_GnomeKeyring; } - if (isKwallet5Available()) { + if (isKwalletAvailable(KWALLET6_DBUS_IFACE, KWALLET6_DBUS_PATH)) { + return Backend_Kwallet6; + } + if (isKwalletAvailable(KWALLET5_DBUS_IFACE, KWALLET5_DBUS_PATH)) { return Backend_Kwallet5; } // During startup the keychain backend might just not have started yet @@ -198,10 +225,13 @@ break; case Backend_Kwallet4: - kwalletReadPasswordScheduledStartImpl("org.kde.kwalletd", "/modules/kwalletd", this); + kwalletReadPasswordScheduledStartImpl(KWALLET4_DBUS_IFACE, KWALLET4_DBUS_PATH, this); break; case Backend_Kwallet5: - kwalletReadPasswordScheduledStartImpl("org.kde.kwalletd5", "/modules/kwalletd5", this); + kwalletReadPasswordScheduledStartImpl(KWALLET5_DBUS_IFACE, KWALLET5_DBUS_PATH, this); + break; + case Backend_Kwallet6: + kwalletReadPasswordScheduledStartImpl(KWALLET6_DBUS_IFACE, KWALLET6_DBUS_PATH, this); break; } } @@ -454,10 +484,13 @@ break; case Backend_Kwallet4: - kwalletWritePasswordScheduledStart("org.kde.kwalletd", "/modules/kwalletd", this); + kwalletWritePasswordScheduledStart(KWALLET4_DBUS_IFACE, KWALLET4_DBUS_PATH, this); break; case Backend_Kwallet5: - kwalletWritePasswordScheduledStart("org.kde.kwalletd5", "/modules/kwalletd5", this); + kwalletWritePasswordScheduledStart(KWALLET5_DBUS_IFACE, KWALLET5_DBUS_PATH, this); + break; + case Backend_Kwallet6: + kwalletWritePasswordScheduledStart(KWALLET6_DBUS_IFACE, KWALLET6_DBUS_PATH, this); break; } } @@ -562,10 +595,13 @@ break; case Backend_Kwallet4: - kwalletWritePasswordScheduledStart("org.kde.kwalletd", "/modules/kwalletd", this); + kwalletWritePasswordScheduledStart(KWALLET4_DBUS_IFACE, KWALLET4_DBUS_PATH, this); break; case Backend_Kwallet5: - kwalletWritePasswordScheduledStart("org.kde.kwalletd5", "/modules/kwalletd5", this); + kwalletWritePasswordScheduledStart(KWALLET5_DBUS_IFACE, KWALLET5_DBUS_PATH, this); + break; + case Backend_Kwallet6: + kwalletWritePasswordScheduledStart(KWALLET6_DBUS_IFACE, KWALLET6_DBUS_PATH, this); break; } } @@ -591,5 +627,7 @@ bool QKeychain::isAvailable() { - return LibSecretKeyring::isAvailable() || GnomeKeyring::isAvailable() || isKwallet5Available(); + return LibSecretKeyring::isAvailable() || GnomeKeyring::isAvailable() + || isKwalletAvailable(KWALLET6_DBUS_IFACE, KWALLET6_DBUS_PATH) + || isKwalletAvailable(KWALLET5_DBUS_IFACE, KWALLET5_DBUS_PATH); }
