automatic version update by autodist [release 22.08.0-1mamba;Sat Aug 27 2022]
This commit is contained in:
parent
b8db48828b
commit
c62fbea250
61
kleopatra-22.08.0-libgpgme-1.18.0.patch
Normal file
61
kleopatra-22.08.0-libgpgme-1.18.0.patch
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
From 87d8b00d4b2286489d5fadc9cfa07f1d721cdfe3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@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 {};
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
%define majver %(echo %version | cut -d. -f1-2)
|
%define majver %(echo %version | cut -d. -f1-2)
|
||||||
|
|
||||||
Name: kleopatra
|
Name: kleopatra
|
||||||
Version: 22.04.3
|
Version: 22.08.0
|
||||||
Release: 1mamba
|
Release: 1mamba
|
||||||
Summary: KDE Frameworks 5 certificates manager
|
Summary: KDE Frameworks 5 certificates manager
|
||||||
Group: Graphical Desktop/Applications/Utilities
|
Group: Graphical Desktop/Applications/Utilities
|
||||||
@ -10,6 +10,7 @@ Distribution: openmamba
|
|||||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||||
URL: https://kde.org/
|
URL: https://kde.org/
|
||||||
Source: http://download.kde.org/stable/release-service/%{version}/src/kleopatra-%{version}.tar.xz
|
Source: http://download.kde.org/stable/release-service/%{version}/src/kleopatra-%{version}.tar.xz
|
||||||
|
Patch0: kleopatra-22.08.0-libgpgme-1.18.0.patch
|
||||||
License: GPL
|
License: GPL
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
BuildRequires: glibc-devel
|
BuildRequires: glibc-devel
|
||||||
@ -42,6 +43,7 @@ BuildRequires: qt5-qtbase-devel
|
|||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: rpm-macros-kde5
|
BuildRequires: rpm-macros-kde5
|
||||||
BuildRequires: extra-cmake-modules
|
BuildRequires: extra-cmake-modules
|
||||||
|
BuildRequires: libgpgme-devel >= 1:1.18.0
|
||||||
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
|
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -66,6 +68,7 @@ This package contains libraries and header files for developing applications tha
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1 -b .libgpgme-1.18.0
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake_kde5 -d build
|
%cmake_kde5 -d build
|
||||||
@ -95,7 +98,7 @@ This package contains libraries and header files for developing applications tha
|
|||||||
%dir %{_datadir}/kleopatra
|
%dir %{_datadir}/kleopatra
|
||||||
%dir %{_datadir}/kleopatra/pics
|
%dir %{_datadir}/kleopatra/pics
|
||||||
%{_datadir}/kleopatra/pics/*
|
%{_datadir}/kleopatra/pics/*
|
||||||
%{_datadir}/kservices5/kleopatra_*.desktop
|
#%{_datadir}/kservices5/kleopatra_*.desktop
|
||||||
%{_datadir}/kio/servicemenus/kleopatra_*.desktop
|
%{_datadir}/kio/servicemenus/kleopatra_*.desktop
|
||||||
%dir %{_datadir}/kwatchgnupg
|
%dir %{_datadir}/kwatchgnupg
|
||||||
%dir %{_datadir}/kwatchgnupg/pics
|
%dir %{_datadir}/kwatchgnupg/pics
|
||||||
@ -110,7 +113,7 @@ This package contains libraries and header files for developing applications tha
|
|||||||
%{_libdir}/libkleopatraclientcore.so.*
|
%{_libdir}/libkleopatraclientcore.so.*
|
||||||
%{_libdir}/libkleopatraclientgui.so
|
%{_libdir}/libkleopatraclientgui.so
|
||||||
%{_libdir}/libkleopatraclientgui.so.*
|
%{_libdir}/libkleopatraclientgui.so.*
|
||||||
%{_libdir}/qt5/plugins/pim/kcms/kleopatra/kleopatra_config_gnupgsystem.so
|
%{_libdir}/qt5/plugins/pim5/kcms/kleopatra/kleopatra_config_gnupgsystem.so
|
||||||
%doc LICENSES
|
%doc LICENSES
|
||||||
|
|
||||||
#%files -n lib%{name}-devel
|
#%files -n lib%{name}-devel
|
||||||
@ -123,6 +126,9 @@ This package contains libraries and header files for developing applications tha
|
|||||||
# %{_kde5_mkspecsdir}/qt_*.pri
|
# %{_kde5_mkspecsdir}/qt_*.pri
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Aug 27 2022 Automatic Build System <autodist@mambasoft.it> 22.08.0-1mamba
|
||||||
|
- automatic version update by autodist
|
||||||
|
|
||||||
* Fri Jul 08 2022 Automatic Build System <autodist@mambasoft.it> 22.04.3-1mamba
|
* Fri Jul 08 2022 Automatic Build System <autodist@mambasoft.it> 22.04.3-1mamba
|
||||||
- automatic version update by autodist
|
- automatic version update by autodist
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user