Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package plasma-vault for openSUSE:Factory checked in at 2022-10-29 20:16:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma-vault (Old) and /work/SRC/openSUSE:Factory/.plasma-vault.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma-vault" Sat Oct 29 20:16:15 2022 rev:102 rq:1031879 version:5.26.2 Changes: -------- --- /work/SRC/openSUSE:Factory/plasma-vault/plasma-vault.changes 2022-10-20 11:11:25.931985714 +0200 +++ /work/SRC/openSUSE:Factory/.plasma-vault.new.2275/plasma-vault.changes 2022-10-29 20:17:29.878335728 +0200 @@ -1,0 +2,10 @@ +Wed Oct 26 14:16:33 UTC 2022 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to 5.26.2 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.26.2 +- Changes since 5.26.1: + * Fix crash in vault listing callback + +------------------------------------------------------------------- Old: ---- plasma-vault-5.26.1.tar.xz plasma-vault-5.26.1.tar.xz.sig New: ---- plasma-vault-5.26.2.tar.xz plasma-vault-5.26.2.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma-vault.spec ++++++ --- /var/tmp/diff_new_pack.yihPcc/_old 2022-10-29 20:17:30.486338967 +0200 +++ /var/tmp/diff_new_pack.yihPcc/_new 2022-10-29 20:17:30.498339031 +0200 @@ -19,7 +19,7 @@ %define kf5_version 5.98.0 %bcond_without released Name: plasma-vault -Version: 5.26.1 +Version: 5.26.2 Release: 0 Summary: Plasma applet and services for creating encrypted vaults License: GPL-2.0-or-later ++++++ plasma-vault-5.26.1.tar.xz -> plasma-vault-5.26.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-vault-5.26.1/CMakeLists.txt new/plasma-vault-5.26.2/CMakeLists.txt --- old/plasma-vault-5.26.1/CMakeLists.txt 2022-10-18 12:44:11.000000000 +0200 +++ new/plasma-vault-5.26.2/CMakeLists.txt 2022-10-26 12:15:19.000000000 +0200 @@ -4,7 +4,7 @@ project (PlasmaVault) -set(PROJECT_VERSION "5.26.1") +set(PROJECT_VERSION "5.26.2") set(PROJECT_VERSION_MAJOR 5) set(CMAKE_CXX_STANDARD 17) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-vault-5.26.1/asynqt/private/wrappers/dbus_p.h new/plasma-vault-5.26.2/asynqt/private/wrappers/dbus_p.h --- old/plasma-vault-5.26.1/asynqt/private/wrappers/dbus_p.h 2022-10-18 12:44:11.000000000 +0200 +++ new/plasma-vault-5.26.2/asynqt/private/wrappers/dbus_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,92 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2016 Ivan Cukic <ivan.cukic(at)kde.org> - * - * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL - */ - -// -// W A R N I N G -// ------------- -// -// This file is not part of the AsynQt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -namespace AsynQt -{ -namespace detail -{ -template<typename _Result> -class DBusCallFutureInterface : public QObject, public QFutureInterface<_Result> -{ -public: - DBusCallFutureInterface(QDBusPendingReply<_Result> reply) - : reply(reply) - { - } - - ~DBusCallFutureInterface() override - { - } - - void callFinished(); - - QFuture<_Result> start() - { - replyWatcher.reset(new QDBusPendingCallWatcher(reply)); - - QObject::connect( - replyWatcher.get(), - &QDBusPendingCallWatcher::finished, - replyWatcher.get(), - [this]() { - callFinished(); - }, - Qt::QueuedConnection); - - this->reportStarted(); - - if (reply.isFinished()) { - this->callFinished(); - } - - return this->future(); - } - -private: - QDBusPendingReply<_Result> reply; - std::unique_ptr<QDBusPendingCallWatcher> replyWatcher; -}; - -template<typename _Result> -void DBusCallFutureInterface<_Result>::callFinished() -{ - if (!reply.isError()) { - this->reportResult(reply.value()); - this->reportFinished(); - - } else { - this->reportCanceled(); - } - - deleteLater(); -} - -template<> -inline void DBusCallFutureInterface<void>::callFinished() -{ - if (!reply.isError()) { - this->reportFinished(); - - } else { - this->reportCanceled(); - } - - deleteLater(); -} - -} // namespace detail -} // namespace AsynQt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-vault-5.26.1/asynqt/wrappers/dbus.h new/plasma-vault-5.26.2/asynqt/wrappers/dbus.h --- old/plasma-vault-5.26.1/asynqt/wrappers/dbus.h 2022-10-18 12:44:11.000000000 +0200 +++ new/plasma-vault-5.26.2/asynqt/wrappers/dbus.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,64 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2016 Ivan Cukic <ivan.cukic(at)kde.org> - * - * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL - */ - -#ifndef ASYNQT_CONS_DBUSFUTURE_H -#define ASYNQT_CONS_DBUSFUTURE_H - -#include <QDBusAbstractInterface> -#include <QDBusPendingCallWatcher> -#include <QDBusPendingReply> - -#include <QFuture> -#include <QFutureInterface> -#include <QObject> - -#include <memory> - -#include "../private/wrappers/dbus_p.h" - -namespace AsynQt -{ -/** - * Creates a future from the specified dbus reply - */ -template<typename _Result> -QFuture<_Result> makeFuture(QDBusPendingReply<_Result> dbusReply) -{ - using namespace detail; - - return (new DBusCallFutureInterface<_Result>(dbusReply))->start(); -} - -namespace DBus -{ -/** - * Makes an asynchronous call to the specified DBus interface, - * and wraps the result in a future. - */ -template<typename _Result = void> -QFuture<_Result> asyncCall(QDBusAbstractInterface *interface, - const QString &method, - const QVariant &arg1 = QVariant(), - const QVariant &arg2 = QVariant(), - const QVariant &arg3 = QVariant(), - const QVariant &arg4 = QVariant(), - const QVariant &arg5 = QVariant(), - const QVariant &arg6 = QVariant(), - const QVariant &arg7 = QVariant(), - const QVariant &arg8 = QVariant()) -{ - using namespace detail; - - auto callFutureInterface = new DBusCallFutureInterface<_Result>(interface->asyncCall(method, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8)); - - return callFutureInterface->start(); -} - -} // namespace DBus - -} // namespace AsynQt - -#endif // ASYNQT_CONS_DBUSFUTURE_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-vault-5.26.1/common/org.kde.plasmavault.xml new/plasma-vault-5.26.2/common/org.kde.plasmavault.xml --- old/plasma-vault-5.26.1/common/org.kde.plasmavault.xml 2022-10-18 12:44:11.000000000 +0200 +++ new/plasma-vault-5.26.2/common/org.kde.plasmavault.xml 2022-10-26 12:15:19.000000000 +0200 @@ -1,36 +1,56 @@ <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";> <node> <interface name="org.kde.plasmavault"> - - <!-- signals --> <signal name="vaultAdded"> - <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="PlasmaVault::VaultInfo" /> - <arg name="vaultData" type="(sssq)" direction="out"/> + <arg name="vaultData" type="(sssqsasb)" direction="out"/> + <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="PlasmaVault::VaultInfo"/> + </signal> + <signal name="vaultRemoved"> + <arg name="device" type="s" direction="out"/> </signal> - <signal name="vaultChanged"> - <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="PlasmaVault::VaultInfo" /> - <arg name="vaultData" type="(sssq)" direction="out"/> + <arg name="vaultData" type="(sssqsasb)" direction="out"/> + <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="PlasmaVault::VaultInfo"/> </signal> - - <signal name="vaultRemoved"> - <arg name="vault" type="s" direction="out"/> + <signal name="hasOpenVaultsChanged"> + <arg name="hasOpenVaults" type="b" direction="out"/> </signal> - - <!-- functions --> <method name="requestNewVault"> </method> - + <method name="requestImportVault"> + </method> <method name="openVault"> - <arg name="vault" type="s" direction="in"/> + <arg name="device" type="s" direction="in"/> </method> - <method name="closeVault"> - <arg name="vault" type="s" direction="in"/> + <arg name="device" type="s" direction="in"/> + </method> + <method name="forceCloseVault"> + <arg name="device" type="s" direction="in"/> + </method> + <method name="configureVault"> + <arg name="device" type="s" direction="in"/> + </method> + <method name="openVaultInFileManager"> + <arg name="device" type="s" direction="in"/> + </method> + <method name="availableDevices"> + <arg type="a(sssqsasb)" direction="out"/> + <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="PlasmaVault::VaultInfoList"/> + </method> + <method name="hasOpenVaults"> + <arg type="b" direction="out"/> + </method> + <method name="closeAllVaults"> + </method> + <method name="forceCloseAllVaults"> + </method> + <method name="deleteVault"> + <arg name="device" type="s" direction="in"/> + <arg name="name" type="s" direction="in"/> </method> - <method name="updateStatus"> </method> - </interface> + </node> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-vault-5.26.1/plasma/vaultsmodel.cpp new/plasma-vault-5.26.2/plasma/vaultsmodel.cpp --- old/plasma-vault-5.26.1/plasma/vaultsmodel.cpp 2022-10-18 12:44:11.000000000 +0200 +++ new/plasma-vault-5.26.2/plasma/vaultsmodel.cpp 2022-10-26 12:15:19.000000000 +0200 @@ -6,15 +6,9 @@ #include "vaultsmodel.h" #include "vaultsmodel_p.h" - -#include <asynqt/operations/listen.h> -#include <asynqt/wrappers/dbus.h> - #include <QFileInfo> using namespace PlasmaVault; -using namespace AsynQt; -using namespace AsynQt::operators; VaultsModel::Private::Private(VaultsModel *parent) : service("org.kde.kded5", "/modules/plasmavault", QDBusConnection::sessionBus()) @@ -52,7 +46,14 @@ clearData(); // Asynchronously load the devices - DBus::asyncCall<VaultInfoList>(&service, "availableDevices") | onSuccess([this](const VaultInfoList &vaultList) { + QDBusPendingReply<VaultInfoList> reply = service.availableDevices(); + auto watcher = new QDBusPendingCallWatcher(reply); + connect(watcher, &QDBusPendingCallWatcher::finished, q, [this, reply, watcher] { + watcher->deleteLater(); + if (reply.isError()) { + return; + } + const VaultInfoList &vaultList = reply.value(); const int oldSize = vaultKeys.size(); q->beginResetModel(); @@ -282,7 +283,7 @@ if (!d->vaults.contains(device)) return; - DBus::asyncCall<>(&d->service, "openVault", device); + d->service.openVault(device); } void VaultsModel::close(const QString &device) @@ -290,7 +291,7 @@ if (!d->vaults.contains(device)) return; - DBus::asyncCall<>(&d->service, "closeVault", device); + d->service.closeVault(device); } void VaultsModel::toggle(const QString &device) @@ -311,7 +312,7 @@ if (!d->vaults.contains(device)) return; - DBus::asyncCall<>(&d->service, "forceCloseVault", device); + d->service.forceCloseVault(device); } void VaultsModel::configure(const QString &device) @@ -319,7 +320,7 @@ if (!d->vaults.contains(device)) return; - DBus::asyncCall<>(&d->service, "configureVault", device); + d->service.configureVault(device); } void VaultsModel::openInFileManager(const QString &device) @@ -327,12 +328,12 @@ if (!d->vaults.contains(device)) return; - DBus::asyncCall<>(&d->service, "openVaultInFileManager", device); + d->service.openVaultInFileManager(device); } void VaultsModel::requestNewVault() { - DBus::asyncCall<>(&d->service, "requestNewVault"); + d->service.requestNewVault(); } bool VaultsModel::isBusy() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-vault-5.26.1/po/zh_CN/plasmavault-kde.po new/plasma-vault-5.26.2/po/zh_CN/plasmavault-kde.po --- old/plasma-vault-5.26.1/po/zh_CN/plasmavault-kde.po 2022-10-18 12:44:33.000000000 +0200 +++ new/plasma-vault-5.26.2/po/zh_CN/plasmavault-kde.po 2022-10-26 12:15:39.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-03-31 00:45+0000\n" -"PO-Revision-Date: 2022-10-02 15:52\n" +"PO-Revision-Date: 2022-10-22 05:31\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n"
