Merge pull request #16885 from Rmys/master

kde ver. bump
2025-06-18 18:25:05 +03:00
parent 69ae4c02c9 49c83ba141
commit e31f19ea3a
2 changed files with 28 additions and 1 deletions
@@ -0,0 +1,27 @@
+diff -Nuar a/src/crypto/signencrypttask.cpp b/src/crypto/signencrypttask.cpp
+--- a/src/crypto/signencrypttask.cpp	2025-06-03 06:22:18.000000000 +0300
+++ b/src/crypto/signencrypttask.cpp	2025-06-18 18:21:33.732008467 +0300
+@@ -27,6 +27,7 @@
+ #include <QGpgME/SignEncryptArchiveJob>
+ #include <QGpgME/SignEncryptJob>
+ #include <QGpgME/SignJob>
+#include <qgpgme/qgpgme_version.h>
+ 
+ #include <gpgme++/encryptionresult.h>
+ #include <gpgme++/key.h>
+@@ -1009,9 +1010,15 @@
+                             m_output.label,
+                             !m_sresult.isNull(),
+                             !m_eresult.isNull(),
+#if QGPGME_VERSION >= QT_VERSION_CHECK(2, 0, 0)
+                            m_sresult.error().isError(),
+                            m_eresult.error().isError(),
+                            m_sresult.error().isError() ? m_sresult.error() : m_eresult.error());
+#else
+                             m_sresult.error(),
+                             m_eresult.error(),
+                             m_sresult.error().code() ? m_sresult.error() : m_eresult.error());
+#endif
+ }
+ 
+ QString SignEncryptFilesResult::details() const
@@ -49,7 +49,7 @@
      <Dependency versionFrom="25.04.2">kmailtransport-devel</Dependency>
    </BuildDependencies>
    <Patches>
-      <!--Patch>qt5.patch</Patch-->
+      <Patch>gpgme.patch</Patch>
    </Patches>
  </Source>
  <Package>