From 06de03e5c0a9c4af7cfea794216b6a0faa7a74a31f9333f65c2fb8b3e368a455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 19 Oct 2016 09:36:02 +0000 Subject: [PATCH] Accepting request 436111 from home:luca_b:branches:Base:System - New upstream release 1.7.1 * Fixed problems with the new language bindings. * New helper function gpgme_addrspec_from_uid. * Use option --exit-on-status-write-error with newer gpg versions. * qt: Missed API from the Qt Binding inclusion has been added again. * qt: abstractimportjob.h is now installed to that ImportJobs can be used again. * qt: Fixed spelling error in API (startReceive). * Interface changes relative to the 1.7.0 release: gpgme_addrspec_from_uid NEW. qt: WksPublishJob::startRecieve RENAMED to ::startReceive. qt: MultiDeleteJob NEW. qt: AbstractImportJob NEW. qt: SpecialJob NEW. cpp: Signature::key(bool, bool) NEW. cpp: UserID::addrSpecFromString(const char*) NEW. cpp: UserID::addrSpec() NEW. - Drop conflict (handled on kdepimlibs4 side) - Drop upstreamed patches: * gpgme-1.7.0-nonvoid-returns.patch * gpgme-1.7.0-cpp-qt-Include-config.h.patch * gpgme-1.7.0-python-Include-config.h.patch OBS-URL: https://build.opensuse.org/request/show/436111 OBS-URL: https://build.opensuse.org/package/show/Base:System/gpgme?expand=0&rev=71 --- baselibs.conf | 2 +- gpgme-1.7.0-cpp-qt-Include-config.h.patch | 1154 --------------------- gpgme-1.7.0-nonvoid-returns.patch | 68 -- gpgme-1.7.0-python-Include-config.h.patch | 127 --- gpgme-1.7.0.tar.bz2 | 3 - gpgme-1.7.0.tar.bz2.sig | Bin 287 -> 0 bytes gpgme-1.7.1.tar.bz2 | 3 + gpgme-1.7.1.tar.bz2.sig | Bin 0 -> 287 bytes gpgme.changes | 27 + gpgme.spec | 23 +- 10 files changed, 38 insertions(+), 1369 deletions(-) delete mode 100644 gpgme-1.7.0-cpp-qt-Include-config.h.patch delete mode 100644 gpgme-1.7.0-nonvoid-returns.patch delete mode 100644 gpgme-1.7.0-python-Include-config.h.patch delete mode 100644 gpgme-1.7.0.tar.bz2 delete mode 100644 gpgme-1.7.0.tar.bz2.sig create mode 100644 gpgme-1.7.1.tar.bz2 create mode 100644 gpgme-1.7.1.tar.bz2.sig diff --git a/baselibs.conf b/baselibs.conf index e00dce4..8f1a8a1 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,3 @@ libgpgme11 libgpgmepp6 -libqgpgme6 +libqgpgme7 diff --git a/gpgme-1.7.0-cpp-qt-Include-config.h.patch b/gpgme-1.7.0-cpp-qt-Include-config.h.patch deleted file mode 100644 index 89ab59c..0000000 --- a/gpgme-1.7.0-cpp-qt-Include-config.h.patch +++ /dev/null @@ -1,1154 +0,0 @@ -From a142f187b7ddb2728ec3e1743da4a0c4538ab40a Mon Sep 17 00:00:00 2001 -From: Andre Heinecke -Date: Fri, 23 Sep 2016 15:22:29 +0200 -Subject: [PATCH] cpp, qt: Include config.h - -lang/cpp/src/callbacks.cpp, -lang/cpp/src/configuration.cpp, -lang/cpp/src/context.cpp, -lang/cpp/src/context_glib.cpp, -lang/cpp/src/context_qt.cpp, -lang/cpp/src/context_vanilla.cpp, -lang/cpp/src/data.cpp, -lang/cpp/src/decryptionresult.cpp, -lang/cpp/src/defaultassuantransaction.cpp, -lang/cpp/src/editinteractor.cpp, -lang/cpp/src/encryptionresult.cpp, -lang/cpp/src/engineinfo.cpp, -lang/cpp/src/eventloopinteractor.cpp, -lang/cpp/src/exception.cpp, -lang/cpp/src/gpgadduserideditinteractor.cpp, -lang/cpp/src/gpgagentgetinfoassuantransaction.cpp, -lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp, -lang/cpp/src/gpgsetownertrusteditinteractor.cpp, -lang/cpp/src/gpgsignkeyeditinteractor.cpp, -lang/cpp/src/importresult.cpp, -lang/cpp/src/key.cpp, -lang/cpp/src/keygenerationresult.cpp, -lang/cpp/src/keylistresult.cpp, -lang/cpp/src/scdgetinfoassuantransaction.cpp, -lang/cpp/src/signingresult.cpp, -lang/cpp/src/tofuinfo.cpp, -lang/cpp/src/trustitem.cpp, -lang/cpp/src/verificationresult.cpp, -lang/cpp/src/vfsmountresult.cpp, -lang/qt/src/dataprovider.cpp, -lang/qt/src/defaultkeygenerationjob.cpp, -lang/qt/src/gpgme_backend_debug.cpp, -lang/qt/src/job.cpp, -lang/qt/src/qgpgmeadduseridjob.cpp, -lang/qt/src/qgpgmebackend.cpp, -lang/qt/src/qgpgmechangeexpiryjob.cpp, -lang/qt/src/qgpgmechangeownertrustjob.cpp, -lang/qt/src/qgpgmechangepasswdjob.cpp, -lang/qt/src/qgpgmedecryptjob.cpp, -lang/qt/src/qgpgmedecryptverifyjob.cpp, -lang/qt/src/qgpgmedeletejob.cpp, -lang/qt/src/qgpgmedownloadjob.cpp, -lang/qt/src/qgpgmeencryptjob.cpp, -lang/qt/src/qgpgmeexportjob.cpp, -lang/qt/src/qgpgmeimportfromkeyserverjob.cpp, -lang/qt/src/qgpgmeimportjob.cpp, -lang/qt/src/qgpgmekeyformailboxjob.cpp, -lang/qt/src/qgpgmekeygenerationjob.cpp, -lang/qt/src/qgpgmekeylistjob.cpp, -lang/qt/src/qgpgmelistallkeysjob.cpp, -lang/qt/src/qgpgmenewcryptoconfig.cpp, -lang/qt/src/qgpgmerefreshkeysjob.cpp, -lang/qt/src/qgpgmesecretkeyexportjob.cpp, -lang/qt/src/qgpgmesignencryptjob.cpp, -lang/qt/src/qgpgmesignjob.cpp, -lang/qt/src/qgpgmesignkeyjob.cpp, -lang/qt/src/qgpgmetofupolicyjob.cpp, -lang/qt/src/qgpgmeverifydetachedjob.cpp, -lang/qt/src/qgpgmeverifyopaquejob.cpp, -lang/qt/src/qgpgmewkspublishjob.cpp, -lang/qt/src/threadedjobmixin.cpp, -lang/qt/tests/run-keyformailboxjob.cpp, -lang/qt/tests/t-encrypt.cpp, -lang/qt/tests/t-keylist.cpp, -lang/qt/tests/t-keylocate.cpp, -lang/qt/tests/t-ownertrust.cpp, -lang/qt/tests/t-support.cpp, -lang/qt/tests/t-tofuinfo.cpp, -lang/qt/tests/t-wkspublish.cpp: Include config.h - --- -This fixes problems with mismatching definitions. Most -notably _FILE_OFFSET_BITS is now always set correctly. ---- - lang/cpp/src/callbacks.cpp | 4 ++++ - lang/cpp/src/configuration.cpp | 4 ++++ - lang/cpp/src/context.cpp | 4 ++++ - lang/cpp/src/context_glib.cpp | 4 ++++ - lang/cpp/src/context_qt.cpp | 4 ++++ - lang/cpp/src/context_vanilla.cpp | 4 ++++ - lang/cpp/src/data.cpp | 4 ++++ - lang/cpp/src/decryptionresult.cpp | 4 ++++ - lang/cpp/src/defaultassuantransaction.cpp | 4 ++++ - lang/cpp/src/editinteractor.cpp | 4 ++++ - lang/cpp/src/encryptionresult.cpp | 4 ++++ - lang/cpp/src/engineinfo.cpp | 4 ++++ - lang/cpp/src/eventloopinteractor.cpp | 4 ++++ - lang/cpp/src/exception.cpp | 4 ++++ - lang/cpp/src/gpgadduserideditinteractor.cpp | 4 ++++ - lang/cpp/src/gpgagentgetinfoassuantransaction.cpp | 4 ++++ - lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp | 4 ++++ - lang/cpp/src/gpgsetownertrusteditinteractor.cpp | 4 ++++ - lang/cpp/src/gpgsignkeyeditinteractor.cpp | 4 ++++ - lang/cpp/src/importresult.cpp | 4 ++++ - lang/cpp/src/key.cpp | 4 ++++ - lang/cpp/src/keygenerationresult.cpp | 4 ++++ - lang/cpp/src/keylistresult.cpp | 4 ++++ - lang/cpp/src/scdgetinfoassuantransaction.cpp | 4 ++++ - lang/cpp/src/signingresult.cpp | 4 ++++ - lang/cpp/src/tofuinfo.cpp | 4 ++++ - lang/cpp/src/trustitem.cpp | 4 ++++ - lang/cpp/src/verificationresult.cpp | 4 ++++ - lang/cpp/src/vfsmountresult.cpp | 4 ++++ - lang/qt/src/dataprovider.cpp | 4 ++++ - lang/qt/src/defaultkeygenerationjob.cpp | 4 ++++ - lang/qt/src/gpgme_backend_debug.cpp | 4 ++++ - lang/qt/src/job.cpp | 4 ++++ - lang/qt/src/qgpgmeadduseridjob.cpp | 4 ++++ - lang/qt/src/qgpgmebackend.cpp | 4 ++++ - lang/qt/src/qgpgmechangeexpiryjob.cpp | 4 ++++ - lang/qt/src/qgpgmechangeownertrustjob.cpp | 4 ++++ - lang/qt/src/qgpgmechangepasswdjob.cpp | 4 ++++ - lang/qt/src/qgpgmedecryptjob.cpp | 4 ++++ - lang/qt/src/qgpgmedecryptverifyjob.cpp | 4 ++++ - lang/qt/src/qgpgmedeletejob.cpp | 4 ++++ - lang/qt/src/qgpgmedownloadjob.cpp | 4 ++++ - lang/qt/src/qgpgmeencryptjob.cpp | 4 ++++ - lang/qt/src/qgpgmeexportjob.cpp | 4 ++++ - lang/qt/src/qgpgmeimportfromkeyserverjob.cpp | 4 ++++ - lang/qt/src/qgpgmeimportjob.cpp | 4 ++++ - lang/qt/src/qgpgmekeyformailboxjob.cpp | 4 ++++ - lang/qt/src/qgpgmekeygenerationjob.cpp | 4 ++++ - lang/qt/src/qgpgmekeylistjob.cpp | 4 ++++ - lang/qt/src/qgpgmelistallkeysjob.cpp | 4 ++++ - lang/qt/src/qgpgmenewcryptoconfig.cpp | 4 ++++ - lang/qt/src/qgpgmerefreshkeysjob.cpp | 4 ++++ - lang/qt/src/qgpgmesecretkeyexportjob.cpp | 4 ++++ - lang/qt/src/qgpgmesignencryptjob.cpp | 4 ++++ - lang/qt/src/qgpgmesignjob.cpp | 4 ++++ - lang/qt/src/qgpgmesignkeyjob.cpp | 4 ++++ - lang/qt/src/qgpgmetofupolicyjob.cpp | 4 ++++ - lang/qt/src/qgpgmeverifydetachedjob.cpp | 4 ++++ - lang/qt/src/qgpgmeverifyopaquejob.cpp | 4 ++++ - lang/qt/src/qgpgmewkspublishjob.cpp | 4 ++++ - lang/qt/src/threadedjobmixin.cpp | 4 ++++ - lang/qt/tests/run-keyformailboxjob.cpp | 4 ++++ - lang/qt/tests/t-encrypt.cpp | 4 ++++ - lang/qt/tests/t-keylist.cpp | 4 ++++ - lang/qt/tests/t-keylocate.cpp | 4 ++++ - lang/qt/tests/t-ownertrust.cpp | 4 ++++ - lang/qt/tests/t-support.cpp | 4 ++++ - lang/qt/tests/t-tofuinfo.cpp | 4 ++++ - lang/qt/tests/t-wkspublish.cpp | 4 ++++ - 69 files changed, 276 insertions(+) - -Index: gpgme-1.7.0/lang/cpp/src/callbacks.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/callbacks.cpp -+++ gpgme-1.7.0/lang/cpp/src/callbacks.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "callbacks.h" - #include "util.h" - -Index: gpgme-1.7.0/lang/cpp/src/configuration.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/configuration.cpp -+++ gpgme-1.7.0/lang/cpp/src/configuration.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "configuration.h" - #include "error.h" - #include "util.h" -Index: gpgme-1.7.0/lang/cpp/src/context.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/context.cpp -+++ gpgme-1.7.0/lang/cpp/src/context.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include - #include - #include -Index: gpgme-1.7.0/lang/cpp/src/context_vanilla.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/context_vanilla.cpp -+++ gpgme-1.7.0/lang/cpp/src/context_vanilla.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include - - GIOChannel *GpgME::getGIOChannel(int) -Index: gpgme-1.7.0/lang/cpp/src/data.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/data.cpp -+++ gpgme-1.7.0/lang/cpp/src/data.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "data_p.h" - #include - #include -Index: gpgme-1.7.0/lang/cpp/src/decryptionresult.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/decryptionresult.cpp -+++ gpgme-1.7.0/lang/cpp/src/decryptionresult.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include - #include "result_p.h" - #include "util.h" -Index: gpgme-1.7.0/lang/cpp/src/defaultassuantransaction.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/defaultassuantransaction.cpp -+++ gpgme-1.7.0/lang/cpp/src/defaultassuantransaction.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "defaultassuantransaction.h" - #include "error.h" - #include "data.h" -Index: gpgme-1.7.0/lang/cpp/src/editinteractor.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/editinteractor.cpp -+++ gpgme-1.7.0/lang/cpp/src/editinteractor.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "editinteractor.h" - #include "callbacks.h" - #include "error.h" -Index: gpgme-1.7.0/lang/cpp/src/encryptionresult.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/encryptionresult.cpp -+++ gpgme-1.7.0/lang/cpp/src/encryptionresult.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include - #include "result_p.h" - #include "util.h" -Index: gpgme-1.7.0/lang/cpp/src/engineinfo.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/engineinfo.cpp -+++ gpgme-1.7.0/lang/cpp/src/engineinfo.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "engineinfo.h" - - #include -Index: gpgme-1.7.0/lang/cpp/src/eventloopinteractor.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/eventloopinteractor.cpp -+++ gpgme-1.7.0/lang/cpp/src/eventloopinteractor.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include - - #include -Index: gpgme-1.7.0/lang/cpp/src/exception.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/exception.cpp -+++ gpgme-1.7.0/lang/cpp/src/exception.cpp -@@ -21,6 +21,10 @@ - */ - - // -*- c++ -*- -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "exception.h" - - #include -Index: gpgme-1.7.0/lang/cpp/src/gpgadduserideditinteractor.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/gpgadduserideditinteractor.cpp -+++ gpgme-1.7.0/lang/cpp/src/gpgadduserideditinteractor.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "gpgadduserideditinteractor.h" - - #include "error.h" -Index: gpgme-1.7.0/lang/cpp/src/gpgagentgetinfoassuantransaction.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/gpgagentgetinfoassuantransaction.cpp -+++ gpgme-1.7.0/lang/cpp/src/gpgagentgetinfoassuantransaction.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "gpgagentgetinfoassuantransaction.h" - #include "error.h" - #include "data.h" -Index: gpgme-1.7.0/lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp -+++ gpgme-1.7.0/lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "gpgsetexpirytimeeditinteractor.h" - #include "error.h" - -Index: gpgme-1.7.0/lang/cpp/src/gpgsetownertrusteditinteractor.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/gpgsetownertrusteditinteractor.cpp -+++ gpgme-1.7.0/lang/cpp/src/gpgsetownertrusteditinteractor.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "gpgsetownertrusteditinteractor.h" - #include "error.h" - -Index: gpgme-1.7.0/lang/cpp/src/gpgsignkeyeditinteractor.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/gpgsignkeyeditinteractor.cpp -+++ gpgme-1.7.0/lang/cpp/src/gpgsignkeyeditinteractor.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "gpgsignkeyeditinteractor.h" - #include "error.h" - #include "key.h" -Index: gpgme-1.7.0/lang/cpp/src/importresult.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/importresult.cpp -+++ gpgme-1.7.0/lang/cpp/src/importresult.cpp -@@ -21,6 +21,10 @@ - */ - - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include - #include "result_p.h" - -Index: gpgme-1.7.0/lang/cpp/src/key.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/key.cpp -+++ gpgme-1.7.0/lang/cpp/src/key.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include - - #include "util.h" -Index: gpgme-1.7.0/lang/cpp/src/keygenerationresult.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/keygenerationresult.cpp -+++ gpgme-1.7.0/lang/cpp/src/keygenerationresult.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include - #include "result_p.h" - -Index: gpgme-1.7.0/lang/cpp/src/keylistresult.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/keylistresult.cpp -+++ gpgme-1.7.0/lang/cpp/src/keylistresult.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include - #include "result_p.h" - -Index: gpgme-1.7.0/lang/cpp/src/scdgetinfoassuantransaction.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/scdgetinfoassuantransaction.cpp -+++ gpgme-1.7.0/lang/cpp/src/scdgetinfoassuantransaction.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "scdgetinfoassuantransaction.h" - #include "error.h" - #include "data.h" -Index: gpgme-1.7.0/lang/cpp/src/signingresult.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/signingresult.cpp -+++ gpgme-1.7.0/lang/cpp/src/signingresult.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include - #include "result_p.h" - #include "util.h" -Index: gpgme-1.7.0/lang/cpp/src/tofuinfo.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/tofuinfo.cpp -+++ gpgme-1.7.0/lang/cpp/src/tofuinfo.cpp -@@ -19,6 +19,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "tofuinfo.h" - - #include -Index: gpgme-1.7.0/lang/cpp/src/trustitem.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/trustitem.cpp -+++ gpgme-1.7.0/lang/cpp/src/trustitem.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include - - #include -Index: gpgme-1.7.0/lang/cpp/src/verificationresult.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/verificationresult.cpp -+++ gpgme-1.7.0/lang/cpp/src/verificationresult.cpp -@@ -20,6 +20,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include - #include - #include "result_p.h" -Index: gpgme-1.7.0/lang/cpp/src/vfsmountresult.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/cpp/src/vfsmountresult.cpp -+++ gpgme-1.7.0/lang/cpp/src/vfsmountresult.cpp -@@ -21,6 +21,10 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include - #include "result_p.h" - -Index: gpgme-1.7.0/lang/qt/src/dataprovider.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/dataprovider.cpp -+++ gpgme-1.7.0/lang/qt/src/dataprovider.cpp -@@ -21,6 +21,10 @@ - - // -*- c++ -*- - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include - - #include -Index: gpgme-1.7.0/lang/qt/src/defaultkeygenerationjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/defaultkeygenerationjob.cpp -+++ gpgme-1.7.0/lang/qt/src/defaultkeygenerationjob.cpp -@@ -28,6 +28,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "defaultkeygenerationjob.h" - #include "protocol.h" - #include "keygenerationjob.h" -Index: gpgme-1.7.0/lang/qt/src/gpgme_backend_debug.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/gpgme_backend_debug.cpp -+++ gpgme-1.7.0/lang/qt/src/gpgme_backend_debug.cpp -@@ -1,5 +1,9 @@ - // This file is autogenerated by CMake: DO NOT EDIT - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "gpgme_backend_debug.h" - - -Index: gpgme-1.7.0/lang/qt/src/job.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/job.cpp -+++ gpgme-1.7.0/lang/qt/src/job.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "job.h" - - #include "keylistjob.h" -Index: gpgme-1.7.0/lang/qt/src/qgpgmeadduseridjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmeadduseridjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmeadduseridjob.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmeadduseridjob.h" - - #include "dataprovider.h" -Index: gpgme-1.7.0/lang/qt/src/qgpgmebackend.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmebackend.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmebackend.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmebackend.h" - - -Index: gpgme-1.7.0/lang/qt/src/qgpgmechangeexpiryjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmechangeexpiryjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmechangeexpiryjob.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmechangeexpiryjob.h" - - #include "dataprovider.h" -Index: gpgme-1.7.0/lang/qt/src/qgpgmechangeownertrustjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmechangeownertrustjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmechangeownertrustjob.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmechangeownertrustjob.h" - - #include "dataprovider.h" -Index: gpgme-1.7.0/lang/qt/src/qgpgmechangepasswdjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmechangepasswdjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmechangepasswdjob.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmechangepasswdjob.h" - - #include "dataprovider.h" -Index: gpgme-1.7.0/lang/qt/src/qgpgmedecryptjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmedecryptjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmedecryptjob.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmedecryptjob.h" - - #include "dataprovider.h" -Index: gpgme-1.7.0/lang/qt/src/qgpgmedecryptverifyjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmedecryptverifyjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmedecryptverifyjob.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmedecryptverifyjob.h" - - #include "dataprovider.h" -Index: gpgme-1.7.0/lang/qt/src/qgpgmedeletejob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmedeletejob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmedeletejob.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmedeletejob.h" - - #include "context.h" -Index: gpgme-1.7.0/lang/qt/src/qgpgmedownloadjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmedownloadjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmedownloadjob.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmedownloadjob.h" - - #include "dataprovider.h" -Index: gpgme-1.7.0/lang/qt/src/qgpgmeencryptjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmeencryptjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmeencryptjob.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmeencryptjob.h" - - #include "dataprovider.h" -Index: gpgme-1.7.0/lang/qt/src/qgpgmeexportjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmeexportjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmeexportjob.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmeexportjob.h" - - #include "dataprovider.h" -Index: gpgme-1.7.0/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmeimportfromkeyserverjob.h" - - #include "dataprovider.h" -Index: gpgme-1.7.0/lang/qt/src/qgpgmeimportjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmeimportjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmeimportjob.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmeimportjob.h" - - #include "dataprovider.h" -Index: gpgme-1.7.0/lang/qt/src/qgpgmekeyformailboxjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmekeyformailboxjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmekeyformailboxjob.cpp -@@ -30,6 +30,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmekeyformailboxjob.h" - #include "qgpgmekeylistjob.h" - -Index: gpgme-1.7.0/lang/qt/src/qgpgmekeygenerationjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmekeygenerationjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmekeygenerationjob.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmekeygenerationjob.h" - - #include "dataprovider.h" -Index: gpgme-1.7.0/lang/qt/src/qgpgmekeylistjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmekeylistjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmekeylistjob.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmekeylistjob.h" - - #include "key.h" -Index: gpgme-1.7.0/lang/qt/src/qgpgmelistallkeysjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmelistallkeysjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmelistallkeysjob.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmelistallkeysjob.h" - - #include "key.h" -Index: gpgme-1.7.0/lang/qt/src/qgpgmenewcryptoconfig.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmenewcryptoconfig.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmenewcryptoconfig.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmenewcryptoconfig.h" - - #include -Index: gpgme-1.7.0/lang/qt/src/qgpgmerefreshkeysjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmerefreshkeysjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmerefreshkeysjob.cpp -@@ -33,6 +33,10 @@ - - #define MAX_CMD_LENGTH 32768 - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmerefreshkeysjob.h" - - #include -Index: gpgme-1.7.0/lang/qt/src/qgpgmesecretkeyexportjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmesecretkeyexportjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmesecretkeyexportjob.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmesecretkeyexportjob.h" - - #include -Index: gpgme-1.7.0/lang/qt/src/qgpgmesignencryptjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmesignencryptjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmesignencryptjob.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmesignencryptjob.h" - - #include "dataprovider.h" -Index: gpgme-1.7.0/lang/qt/src/qgpgmesignjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmesignjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmesignjob.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmesignjob.h" - - #include "dataprovider.h" -Index: gpgme-1.7.0/lang/qt/src/qgpgmesignkeyjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmesignkeyjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmesignkeyjob.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmesignkeyjob.h" - - #include "dataprovider.h" -Index: gpgme-1.7.0/lang/qt/src/qgpgmetofupolicyjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmetofupolicyjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmetofupolicyjob.cpp -@@ -28,6 +28,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmetofupolicyjob.h" - - #include "context.h" -Index: gpgme-1.7.0/lang/qt/src/qgpgmeverifydetachedjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmeverifydetachedjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmeverifydetachedjob.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmeverifydetachedjob.h" - - #include "dataprovider.h" -Index: gpgme-1.7.0/lang/qt/src/qgpgmeverifyopaquejob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmeverifyopaquejob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmeverifyopaquejob.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmeverifyopaquejob.h" - - #include "dataprovider.h" -Index: gpgme-1.7.0/lang/qt/src/qgpgmewkspublishjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/qgpgmewkspublishjob.cpp -+++ gpgme-1.7.0/lang/qt/src/qgpgmewkspublishjob.cpp -@@ -28,6 +28,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "qgpgmewkspublishjob.h" - - #include "context.h" -Index: gpgme-1.7.0/lang/qt/src/threadedjobmixin.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/src/threadedjobmixin.cpp -+++ gpgme-1.7.0/lang/qt/src/threadedjobmixin.cpp -@@ -31,6 +31,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "threadedjobmixin.h" - - #include "dataprovider.h" -Index: gpgme-1.7.0/lang/qt/tests/run-keyformailboxjob.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/tests/run-keyformailboxjob.cpp -+++ gpgme-1.7.0/lang/qt/tests/run-keyformailboxjob.cpp -@@ -29,6 +29,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "keyformailboxjob.h" - #include "keylistjob.h" - #include "protocol.h" -Index: gpgme-1.7.0/lang/qt/tests/t-encrypt.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/tests/t-encrypt.cpp -+++ gpgme-1.7.0/lang/qt/tests/t-encrypt.cpp -@@ -28,6 +28,10 @@ - you do not wish to do so, delete this exception statement from - your version. - */ -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include - #include - #include -Index: gpgme-1.7.0/lang/qt/tests/t-keylist.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/tests/t-keylist.cpp -+++ gpgme-1.7.0/lang/qt/tests/t-keylist.cpp -@@ -29,6 +29,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include - #include - #include -Index: gpgme-1.7.0/lang/qt/tests/t-keylocate.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/tests/t-keylocate.cpp -+++ gpgme-1.7.0/lang/qt/tests/t-keylocate.cpp -@@ -28,6 +28,10 @@ - you do not wish to do so, delete this exception statement from - your version. - */ -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include - #include - #include -Index: gpgme-1.7.0/lang/qt/tests/t-ownertrust.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/tests/t-ownertrust.cpp -+++ gpgme-1.7.0/lang/qt/tests/t-ownertrust.cpp -@@ -29,6 +29,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include - #include - #include -Index: gpgme-1.7.0/lang/qt/tests/t-support.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/tests/t-support.cpp -+++ gpgme-1.7.0/lang/qt/tests/t-support.cpp -@@ -29,6 +29,10 @@ - your version. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include "t-support.h" - - #include -Index: gpgme-1.7.0/lang/qt/tests/t-tofuinfo.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/tests/t-tofuinfo.cpp -+++ gpgme-1.7.0/lang/qt/tests/t-tofuinfo.cpp -@@ -28,6 +28,10 @@ - you do not wish to do so, delete this exception statement from - your version. - */ -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include - #include - #include -Index: gpgme-1.7.0/lang/qt/tests/t-wkspublish.cpp -=================================================================== ---- gpgme-1.7.0.orig/lang/qt/tests/t-wkspublish.cpp -+++ gpgme-1.7.0/lang/qt/tests/t-wkspublish.cpp -@@ -28,6 +28,10 @@ - you do not wish to do so, delete this exception statement from - your version. - */ -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include - #include - #include diff --git a/gpgme-1.7.0-nonvoid-returns.patch b/gpgme-1.7.0-nonvoid-returns.patch deleted file mode 100644 index 368145e..0000000 --- a/gpgme-1.7.0-nonvoid-returns.patch +++ /dev/null @@ -1,68 +0,0 @@ -From ae324b51ffa338b891387bff2657d60c1fd3ae40 Mon Sep 17 00:00:00 2001 -From: Andreas Stieger -Date: Wed, 21 Sep 2016 14:28:23 +0200 -Subject: [PATCH] cpp: Avoid missing returns in non-void functions - -* lang/cpp/src/context.cpp - (Context::signaturePolicyURL): return nullptr on default - (to_tofu_policy_t): add default case for unknown -* lang/cpp/src/key.cpp - (Key::primaryFingerprint): return nullptr on default -* lang/cpp/src/tofuinfo.cpp - (GpgME::TofuInfo::policy): add default case for unknown - -Signed-off-by: Andreas Stieger -Signed-off-by: Andre Heinecke ---- - lang/cpp/src/context.cpp | 2 ++ - lang/cpp/src/key.cpp | 1 + - lang/cpp/src/tofuinfo.cpp | 1 + - 3 files changed, 4 insertions(+) - -diff --git a/lang/cpp/src/context.cpp b/lang/cpp/src/context.cpp -index 00f397b..43a73b1 100644 ---- a/lang/cpp/src/context.cpp -+++ b/lang/cpp/src/context.cpp -@@ -1051,6 +1051,7 @@ const char *Context::signaturePolicyURL() const - return n->value; - } - } -+ return nullptr; - } - - Notation Context::signatureNotation(unsigned int idx) const -@@ -1344,6 +1345,7 @@ static gpgme_tofu_policy_t to_tofu_policy_t(unsigned int policy) - case TofuInfo::PolicyAsk: - return GPGME_TOFU_POLICY_ASK; - case TofuInfo::PolicyUnknown: -+ default: - return GPGME_TOFU_POLICY_UNKNOWN; - } - } -diff --git a/lang/cpp/src/key.cpp b/lang/cpp/src/key.cpp -index cfa1ba3..a56f77c 100644 ---- a/lang/cpp/src/key.cpp -+++ b/lang/cpp/src/key.cpp -@@ -273,6 +273,7 @@ const char *Key::primaryFingerprint() const - /* Return the first subkeys fingerprint */ - return key->subkeys->fpr; - } -+ return nullptr; - } - - unsigned int Key::keyListMode() const -diff --git a/lang/cpp/src/tofuinfo.cpp b/lang/cpp/src/tofuinfo.cpp -index bb67fc8..e661b3b 100644 ---- a/lang/cpp/src/tofuinfo.cpp -+++ b/lang/cpp/src/tofuinfo.cpp -@@ -109,6 +109,7 @@ GpgME::TofuInfo::Policy GpgME::TofuInfo::policy() const - case GPGME_TOFU_POLICY_ASK: - return PolicyAsk; - case GPGME_TOFU_POLICY_UNKNOWN: -+ default: - return PolicyUnknown; - } - } --- -2.6.6 - diff --git a/gpgme-1.7.0-python-Include-config.h.patch b/gpgme-1.7.0-python-Include-config.h.patch deleted file mode 100644 index 460db0e..0000000 --- a/gpgme-1.7.0-python-Include-config.h.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 3703a4723899d7563937b4b99f5bbe4dd8d3dfed Mon Sep 17 00:00:00 2001 -From: Justus Winter -Date: Mon, 26 Sep 2016 11:35:40 +0200 -Subject: [PATCH] python: Include 'config.h'. - -* lang/python/Makefile.am: Pass 'top_builddir' to 'setup.py'. -* lang/python/gpgme.i: Include 'config.h'. -* lang/python/helpers.c: Likewise. -* lang/python/helpers.h: Likewise. -* lang/python/setup.py.in: Make sure that 'config.h' can be found. --- -Fixes build on 32 bit platforms with large file support. - -Signed-off-by: Justus Winter ---- - lang/python/Makefile.am | 1 + - lang/python/gpgme.i | 8 ++++++++ - lang/python/helpers.c | 4 ++++ - lang/python/helpers.h | 4 ++++ - lang/python/setup.py.in | 7 ++++++- - 5 files changed, 23 insertions(+), 1 deletion(-) - -diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index 2271ce0..1d7aee8 100644 ---- a/lang/python/Makefile.am -+++ b/lang/python/Makefile.am -@@ -56,6 +56,7 @@ copystamp: $(COPY_FILES) $(COPY_FILES_PYME) - all-local: copystamp - for PYTHON in $(PYTHONS); do \ - CFLAGS="$(CFLAGS) -I$(top_srcdir)" \ -+ top_builddir="$(top_builddir)" \ - $$PYTHON setup.py build --verbose ; \ - done - -diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i -index 84addae..a4672e1 100644 ---- a/lang/python/gpgme.i -+++ b/lang/python/gpgme.i -@@ -547,6 +547,10 @@ - some structs, which we provide prior to including the version for - SWIG. */ - %{ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include - %} - -@@ -575,6 +579,10 @@ struct _gpgme_sig_notation - - /* Now include our local modified version. Any structs defined above - are ignored. */ -+#ifdef HAVE_CONFIG_H -+%include "config.h" -+#endif -+ - %include "gpgme.h" - - %include "errors.i" -diff --git a/lang/python/helpers.c b/lang/python/helpers.c -index f9aec91..3724752 100644 ---- a/lang/python/helpers.c -+++ b/lang/python/helpers.c -@@ -18,6 +18,10 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include - #include - #include -diff --git a/lang/python/helpers.h b/lang/python/helpers.h -index 9200f93..67d23b2 100644 ---- a/lang/python/helpers.h -+++ b/lang/python/helpers.h -@@ -18,6 +18,10 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include - #include "Python.h" - -diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in -index 31892c1..7af2d48 100755 ---- a/lang/python/setup.py.in -+++ b/lang/python/setup.py.in -@@ -28,6 +28,7 @@ gpg_error_config = ["gpg-error-config"] - gpgme_config_flags = ["--thread=pthread"] - gpgme_config = ["gpgme-config"] + gpgme_config_flags - gpgme_h = "" -+include_dirs = [os.getcwd()] - library_dirs = [] - in_tree = False - extra_swig_opts = [] -@@ -38,8 +39,13 @@ if os.path.exists("../../src/gpgme-config"): - in_tree = True - gpgme_config = ["../../src/gpgme-config"] + gpgme_config_flags - gpgme_h = "../../src/gpgme.h" -+ if 'top_builddir' in os.environ: -+ include_dirs.append(os.environ['top_builddir']) -+ # Make sure that SWIG finds config.h when processing gpgme.i. -+ extra_swig_opts.append("-I{0}".format(os.environ['top_builddir'])) - library_dirs = ["../../src/.libs"] # XXX uses libtool internals - extra_macros.update( -+ HAVE_CONFIG_H=1, - HAVE_DATA_H=1, - IN_TREE_BUILD=1, - ) -@@ -94,7 +100,6 @@ subprocess.check_call([sys.executable, "gpgme-h-clean.py", gpgme_h], - subprocess.check_call([sys.executable, "gpgme-h-clean.py", gpg_error_h], - stdout=open("errors.i", "w")) - --include_dirs = [os.getcwd()] - define_macros = [] - libs = getconfig('libs') - --- -2.10.0 - diff --git a/gpgme-1.7.0.tar.bz2 b/gpgme-1.7.0.tar.bz2 deleted file mode 100644 index dba9615..0000000 --- a/gpgme-1.7.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71f55fed0f2b3eaf7a606e59772aa645ce3ffff322d361ce359951b3f755cc48 -size 1281708 diff --git a/gpgme-1.7.0.tar.bz2.sig b/gpgme-1.7.0.tar.bz2.sig deleted file mode 100644 index 9026809faf8900c2706fe6e99b330a3df9a3826ee8cb03a1fed885590c57a587..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmV+)0pR|L0UQJX0SEvF1p-&%IN|^b2@oWkInqxh;pY2X>NS5^&;W6uC&)+5oE{us&QyE$bK1`NW6@NvV z!^p+rB?VVHkdU0Dwptjvrkl71I&g4qEoKSK*AG<_KWyvACU^RT6)9q9P1VX?Y(uvq zuklqBmPb4FFgp1F-mT3~aBNd{U0+T-bOlPRGKQma`out>4|3TB{iq&;R-W_~uc_%$ lI3|>$3QOdBM&0|)cQi=}clH)A>k&j>i3=d)c!!RW;{DBeTEY; z9K5b<(;Kw?wP_?v*_%>^tC+IhDw8!VV2}oth>>#kFMCs}8*Y}uI{k-v+W$$}a4eAtEyXs=Z5FTmy90K)TVoUS`k|ymJXNC<=p`JBtsj8hXNe^LW^Yj*$MI~Ay za?=eGbCtT^;=hPYGxN4AwHm-E85bcO*cPW1T^NZqnJA_a+jAAfiVC8 literal 0 HcmV?d00001 diff --git a/gpgme.changes b/gpgme.changes index b25e16d..e1e260c 100644 --- a/gpgme.changes +++ b/gpgme.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Tue Oct 18 20:38:59 UTC 2016 - lbeltrame@kde.org + +- New upstream release 1.7.1 + * Fixed problems with the new language bindings. + * New helper function gpgme_addrspec_from_uid. + * Use option --exit-on-status-write-error with newer gpg versions. + * qt: Missed API from the Qt Binding inclusion has + been added again. + * qt: abstractimportjob.h is now installed to that + ImportJobs can be used again. + * qt: Fixed spelling error in API (startReceive). + * Interface changes relative to the 1.7.0 release: + gpgme_addrspec_from_uid NEW. + qt: WksPublishJob::startRecieve RENAMED to ::startReceive. + qt: MultiDeleteJob NEW. + qt: AbstractImportJob NEW. + qt: SpecialJob NEW. + cpp: Signature::key(bool, bool) NEW. + cpp: UserID::addrSpecFromString(const char*) NEW. + cpp: UserID::addrSpec() NEW. +- Drop conflict (handled on kdepimlibs4 side) +- Drop upstreamed patches: + * gpgme-1.7.0-nonvoid-returns.patch + * gpgme-1.7.0-cpp-qt-Include-config.h.patch + * gpgme-1.7.0-python-Include-config.h.patch + ------------------------------------------------------------------- Wed Oct 12 22:09:27 UTC 2016 - lbeltrame@kde.org diff --git a/gpgme.spec b/gpgme.spec index c4af052..8c1fec0 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -21,7 +21,7 @@ %define with_python3 0 %define with_qt 1 Name: gpgme -Version: 1.7.0 +Version: 1.7.1 Release: 0 Summary: A Library Designed to Give Applications Easy Access to GnuPG License: LGPL-2.1+ and GPL-3.0+ @@ -33,9 +33,6 @@ Source2: baselibs.conf Source3: gpgme.keyring # used to have a fixed timestamp Source99: %{name}.changes -Patch0: gpgme-1.7.0-nonvoid-returns.patch -Patch1: gpgme-1.7.0-cpp-qt-Include-config.h.patch -Patch2: gpgme-1.7.0-python-Include-config.h.patch # for gpgme-1.7.0-python-Include-config.h.patch BuildRequires: automake >= 1.14 # @@ -154,9 +151,6 @@ Requires: glibc-devel Requires: libgpg-error-devel Requires: libgpgme-devel = %{version} Requires: libgpgmepp6 = %{version} -# GPGME++ originated from kdepimlibs, then became independent -# It's impossible to build kdepimlibs4 with GpGME++ 1.7: therefore, conflict. -Conflicts: kdepimlibs4-devel %requires_ge libassuan-devel %description -n libgpgmepp-devel @@ -228,12 +222,12 @@ This package contains the bindings to use the library from Python 3 applications %endif # with_python3 %if 0%{with_qt} -%package -n libqgpgme6 +%package -n libqgpgme7 Summary: A Library Designed to give Qt Applications easy Access to GnuPG Group: Development/Libraries/C and C++ Requires: gpg2 -%description -n libqgpgme6 +%description -n libqgpgme7 GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications. It provides a high-level Crypto API for encryption, decryption, signing, signature verification, and key @@ -256,7 +250,7 @@ Summary: A Library Designed to give C++ Qt Applications easy Access to Gn Group: Development/Libraries/C and C++ Requires: libgpgme-devel = %{version} Requires: libgpgmepp-devel = %{version} -Requires: libqgpgme6 = %{version} +Requires: libqgpgme7 = %{version} %description -n libqgpgme-devel GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG @@ -280,9 +274,6 @@ This package contains the bindings to use the library in Qt C++ applications. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build # for gpgme-1.7.0-python-Include-config.h.patch @@ -340,8 +331,8 @@ make %{?_smp_mflags} check %endif # with_cpp %if 0%{with_qt} -%post -n libqgpgme6 -p /sbin/ldconfig -%postun -n libqgpgme6 -p /sbin/ldconfig +%post -n libqgpgme7 -p /sbin/ldconfig +%postun -n libqgpgme7 -p /sbin/ldconfig %endif # with_qt %post @@ -401,7 +392,7 @@ make %{?_smp_mflags} check %endif # with_python3 %if 0%{with_qt} -%files -n libqgpgme6 +%files -n libqgpgme7 %defattr(-,root,root) %{_libdir}/libqgpgme.so.*