Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kleopatra for openSUSE:Factory checked in at 2022-08-24 15:10:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kleopatra (Old) and /work/SRC/openSUSE:Factory/.kleopatra.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kleopatra" Wed Aug 24 15:10:22 2022 rev:72 rq:998687 version:22.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kleopatra/kleopatra.changes 2022-08-19 17:52:27.687595223 +0200 +++ /work/SRC/openSUSE:Factory/.kleopatra.new.2083/kleopatra.changes 2022-08-24 15:10:25.340448978 +0200 @@ -1,0 +2,6 @@ +Mon Aug 22 15:38:16 UTC 2022 - Fabian Vogt <fab...@ritter-vogt.de> + +- Add patch to fix build with newer gpgme: + * 0001-Use-ReceiveKeysJob-for-refreshing-OpenPGP-keys.patch + +------------------------------------------------------------------- New: ---- 0001-Use-ReceiveKeysJob-for-refreshing-OpenPGP-keys.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kleopatra.spec ++++++ --- /var/tmp/diff_new_pack.I9eAcf/_old 2022-08-24 15:10:25.816450049 +0200 +++ /var/tmp/diff_new_pack.I9eAcf/_new 2022-08-24 15:10:25.820450058 +0200 @@ -1,7 +1,7 @@ # # spec file for package kleopatra # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,6 +31,8 @@ Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif +# PATCH-FIX-UPSTREAM +Patch1: 0001-Use-ReceiveKeysJob-for-refreshing-OpenPGP-keys.patch BuildRequires: extra-cmake-modules # c++-20 required %if 0%{?suse_version} == 1500 ++++++ 0001-Use-ReceiveKeysJob-for-refreshing-OpenPGP-keys.patch ++++++ >From 87d8b00d4b2286489d5fadc9cfa07f1d721cdfe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <d...@ingo-kloecker.de> Date: Thu, 4 Aug 2022 12:24:25 +0200 Subject: [PATCH] Use ReceiveKeysJob for refreshing OpenPGP keys This refreshes the OpenPGP key from the configured key server. GnuPG-bug-id: 5903 --- src/commands/refreshcertificatecommand.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/commands/refreshcertificatecommand.cpp b/src/commands/refreshcertificatecommand.cpp index 226d791f..6a88bbf4 100644 --- a/src/commands/refreshcertificatecommand.cpp +++ b/src/commands/refreshcertificatecommand.cpp @@ -19,7 +19,7 @@ #include <QGpgME/Protocol> #ifdef QGPGME_SUPPORTS_KEY_REFRESH #include <QGpgME/RefreshKeysJob> -#include <QGpgME/RefreshOpenPGPKeysJob> +#include <QGpgME/ReceiveKeysJob> #endif #include <gpgme++/importresult.h> @@ -44,7 +44,7 @@ public: void cancel(); #ifdef QGPGME_SUPPORTS_KEY_REFRESH - std::unique_ptr<QGpgME::RefreshOpenPGPKeysJob> startOpenPGPJob(); + std::unique_ptr<QGpgME::ReceiveKeysJob> startOpenPGPJob(); std::unique_ptr<QGpgME::RefreshKeysJob> startSMIMEJob(); #endif void onOpenPGPJobResult(const ImportResult &result); @@ -136,19 +136,19 @@ void RefreshCertificateCommand::Private::cancel() } #ifdef QGPGME_SUPPORTS_KEY_REFRESH -std::unique_ptr<QGpgME::RefreshOpenPGPKeysJob> RefreshCertificateCommand::Private::startOpenPGPJob() +std::unique_ptr<QGpgME::ReceiveKeysJob> RefreshCertificateCommand::Private::startOpenPGPJob() { - std::unique_ptr<QGpgME::RefreshOpenPGPKeysJob> refreshJob{QGpgME::openpgp()->refreshOpenPGPKeysJob()}; + std::unique_ptr<QGpgME::ReceiveKeysJob> refreshJob{QGpgME::openpgp()->receiveKeysJob()}; Q_ASSERT(refreshJob); - connect(refreshJob.get(), &QGpgME::RefreshOpenPGPKeysJob::result, + connect(refreshJob.get(), &QGpgME::ReceiveKeysJob::result, q, [this](const GpgME::ImportResult &result) { onOpenPGPJobResult(result); }); connect(refreshJob.get(), &QGpgME::Job::progress, q, &Command::progress); - const GpgME::Error err = refreshJob->start({key}); + const GpgME::Error err = refreshJob->start({QString::fromLatin1(key.primaryFingerprint())}); if (err) { showError(err); return {}; -- 2.37.2
