diff --git a/baselibs.conf b/baselibs.conf index f706a8a..e00dce4 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1,3 @@ libgpgme11 +libgpgmepp6 +libqgpgme6 diff --git a/gpgme-1.6.0.tar.bz2 b/gpgme-1.6.0.tar.bz2 deleted file mode 100644 index c89c2b3..0000000 --- a/gpgme-1.6.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d -size 983573 diff --git a/gpgme-1.6.0.tar.bz2.sig b/gpgme-1.6.0.tar.bz2.sig deleted file mode 100644 index e0d29e7..0000000 Binary files a/gpgme-1.6.0.tar.bz2.sig and /dev/null differ diff --git a/gpgme-1.7.0-cpp-qt-Include-config.h.patch b/gpgme-1.7.0-cpp-qt-Include-config.h.patch new file mode 100644 index 0000000..89ab59c --- /dev/null +++ b/gpgme-1.7.0-cpp-qt-Include-config.h.patch @@ -0,0 +1,1154 @@ +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 new file mode 100644 index 0000000..368145e --- /dev/null +++ b/gpgme-1.7.0-nonvoid-returns.patch @@ -0,0 +1,68 @@ +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 new file mode 100644 index 0000000..460db0e --- /dev/null +++ b/gpgme-1.7.0-python-Include-config.h.patch @@ -0,0 +1,127 @@ +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 new file mode 100644 index 0000000..dba9615 --- /dev/null +++ b/gpgme-1.7.0.tar.bz2 @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..9026809 Binary files /dev/null and b/gpgme-1.7.0.tar.bz2.sig differ diff --git a/gpgme.changes b/gpgme.changes index b843f93..b25e16d 100644 --- a/gpgme.changes +++ b/gpgme.changes @@ -1,3 +1,109 @@ +------------------------------------------------------------------- +Wed Oct 12 22:09:27 UTC 2016 - lbeltrame@kde.org + +- Switch on the Qt bindings +- Add missing buildrequires, files, and needed adjustments for the + Qt build + +------------------------------------------------------------------- +Tue Oct 11 18:11:33 UTC 2016 - lbeltrame@kde.org + +- Conflict libgpgmepp-devel with kdepimlibs4-devel as they both + install the same header (kdepimlibs4 for historical reasons) + +------------------------------------------------------------------- +Mon Sep 26 19:55:04 UTC 2016 - astieger@suse.com + + +- gpgme 1.7.0: + * Python2 bindings + * C++ bindings + * disabled: Python3, Qt-Framework API + * New functions gpgme_op_createkey and gpgme_op_createsubkey to make + key creation easier (requires GnuPG 2.1). + * New functions gpgme_op_adduid and gpgme_op_revuid to make user id + management easier (requires GnuPG 2.1). + * New function gpgme_op_keysign to make key signing easier (requires + GnuPG 2.1). + * New function gpgme_op_interact to replace the now deprecated + functions gpgme_op_edit and gpgme_op_card_edit. + * New function gpgme_pubkey_algo_string to convert a public key + algorithm into a GnuPG 2.1 style string. + * Support for GnuPG 2.1's TOFU trust model. + * Notation flags are now correctly set on verify. + * New global flag "require-gnupg" to set a minimal gnupg version. + * More supported items in gpgme_get_dirinfo. + * New function gpgme_data_set_flag and flag "size-hint". + * New function gpgme_set_ctx_flag and flags "full-status" and + "raw-description". + * Improved gpgme_data_identify to distinguish more file types. + * New flag GPGME_ENCRYPT_SYMMETRIC for gpgme_op_encrypt to allow + mixed public key and symmetric encryption. + * New field KEYGRIP in gpgme_subkey_t. New fields FPR in gpgme_key_t. + * New flag GPGME_DATA_ENCODING_MIME to declare that the encrypted or + signed data is a valid MIME part. This is to support future GnuPG + versions. + * Interface changes relative to the 1.6.0 release: + gpgme_pubkey_algo_string NEW. + GPGME_PK_EDDSA NEW. + gpgme_set_ctx_flag NEW. + gpgme_data_set_flag NEW. + gpgme_op_createkey NEW. + gpgme_op_createkey_start NEW. + gpgme_op_createsubkey NEW. + gpgme_op_createsubkey_start NEW. + gpgme_op_adduid_start NEW. + gpgme_op_adduid NEW. + gpgme_op_revuid_start NEW. + gpgme_op_revuid NEW. + gpgme_op_keysign_start NEW. + gpgme_op_keysign NEW. + gpgme_op_tofu_policy_start NEW. + gpgme_op_tofu_policy NEW. + gpgme_op_interact_start NEW. + gpgme_op_interact NEW. + gpgme_interact_cb_t NEW. + gpgme_op_edit_start DEPRECATED. + gpgme_op_edit DEPRECATED. + gpgme_op_card_edit_start DEPRECATED. + gpgme_op_card_edit DEPRECATED. + gpgme_edit_cb_t DEPRECATED. + gpgme_status_code_t DEPRECATED. + gpgme_genkey_result_t EXTENDED: New fields pubkey and seckey. + gpgme_signature_t EXTENDED: New field key. + gpgme_key_t EXTENDED: New field fpr. + gpgme_subkey_t EXTENDED: New field keygrip. + gpgme_user_id_t EXTENDED: New field tofu. + gpgme_tofu_policy_t NEW. + gpgme_tofu_info_t NEW. + GPGME_STATUS_KEY_CONSIDERED NEW. + GPGME_STATUS_TOFU_USER NEW. + GPGME_STATUS_TOFU_STATS NEW. + GPGME_STATUS_TOFU_STATS_LONG NEW. + GPGME_STATUS_NOTATION_FLAGS NEW. + GPGME_KEYLIST_MODE_WITH_TOFU NEW. + GPGME_DATA_TYPE_PGP_ENCRYPTED NEW. + GPGME_DATA_TYPE_PGP_SIGNATURE NEW. + GPGME_DATA_ENCODING_MIME NEW. + GPGME_ENCRYPT_SYMMETRIC NEW. + GPGME_CREATE_SIGN NEW. + GPGME_CREATE_ENCR NEW. + GPGME_CREATE_CERT NEW. + GPGME_CREATE_AUTH NEW. + GPGME_CREATE_NOPASSWD NEW. + GPGME_CREATE_SELFSIGNED NEW. + GPGME_CREATE_NOSTORE NEW. + GPGME_CREATE_WANTPUB NEW. + GPGME_CREATE_WANTSEC NEW. + GPGME_CREATE_FORCE NEW. + GPGME_KEYSIGN_LOCAL NEW. + GPGME_KEYSIGN_LFSEP NEW. + GPGME_INTERACT_CARD NEW. + * Add patches to fix build: + + 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 + ------------------------------------------------------------------- Fri Sep 11 06:07:58 UTC 2015 - astieger@suse.com diff --git a/gpgme.spec b/gpgme.spec index 9130711..c4af052 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -1,7 +1,7 @@ # # spec file for package gpgme # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,12 @@ # +%define with_cpp 1 +%define with_python2 1 +%define with_python3 0 +%define with_qt 1 Name: gpgme -Version: 1.6.0 +Version: 1.7.0 Release: 0 Summary: A Library Designed to Give Applications Easy Access to GnuPG License: LGPL-2.1+ and GPL-3.0+ @@ -29,12 +33,34 @@ 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 +# BuildRequires: gpg2 >= 2.0.10 BuildRequires: libassuan-devel >= 2.0.2 BuildRequires: libgpg-error-devel >= 1.11 +BuildRequires: pkgconfig Requires(post): %{install_info_prereq} Requires(preun): %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{with_python2} +BuildRequires: python-devel >= 2.7 +BuildRequires: swig +%endif # with_python2 +%if 0%{with_python3} +BuildRequires: python3-devel >= 3.4 +BuildRequires: swig +%endif # with_python3 +%if 0%{with_cpp} +BuildRequires: gcc-c++ +%endif # with_cpp +%if 0%{with_qt} +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Test) +%endif # with_qt %description GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG @@ -97,31 +123,226 @@ done at a central place and every application benefits from this. Authors of MUAs should especially consider using GPGME. Creating a set of standard widgets for common key selection tasks is even planned. +%if 0%{with_cpp} +%package -n libgpgmepp6 +Summary: A Library Designed to give C++ Applications easy Access to GnuPG +Group: Development/Libraries/C and C++ +Requires: gpg2 + +%description -n libgpgmepp6 +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 +management. Currently it uses GnuPG as its back-end, but the API is not +restricted to this engine. + +Who Should use GPGME? + +Because the direct use of GnuPG from an application can be a +complicated programming task, it is suggested that all software should +try to use GPGME instead. This way bug fixes or improvements can be +done at a central place and every application benefits from this. +Authors of MUAs should especially consider using GPGME. Creating a set +of standard widgets for common key selection tasks is even planned. + +This package contains the C++ bindings. + +%package -n libgpgmepp-devel +Summary: A Library Designed to give C++ Applications easy Access to GnuPG +Group: Development/Libraries/C and C++ +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 +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 +management. Currently it uses GnuPG as its back-end, but the API is not +restricted to this engine. + +Who Should use GPGME? + +Because the direct use of GnuPG from an application can be a +complicated programming task, it is suggested that all software should +try to use GPGME instead. This way bug fixes or improvements can be +done at a central place and every application benefits from this. +Authors of MUAs should especially consider using GPGME. Creating a set +of standard widgets for common key selection tasks is even planned. + +This package contains the bindings to use the library in C++ applications. + +%endif # with_cpp + +%if 0%{with_python2} +%package -n python-pyme +Summary: Access GnuPG from Python 2 made easy +Group: Development/Libraries/Python + +%description -n python-pyme +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 +management. Currently it uses GnuPG as its back-end, but the API is not +restricted to this engine. + +Who Should use GPGME? + +Because the direct use of GnuPG from an application can be a +complicated programming task, it is suggested that all software should +try to use GPGME instead. This way bug fixes or improvements can be +done at a central place and every application benefits from this. +Authors of MUAs should especially consider using GPGME. Creating a set +of standard widgets for common key selection tasks is even planned. + +This package contains the bindings to use the library from Python 2 applications. +%endif # with_python2 + +%if 0%{with_python3} +%package -n python3-pyme +Summary: Access GnuPG from Python 3 made easy +Group: Development/Libraries/Python + +%description -n python3-pyme +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 +management. Currently it uses GnuPG as its back-end, but the API is not +restricted to this engine. + +Who Should use GPGME? + +Because the direct use of GnuPG from an application can be a +complicated programming task, it is suggested that all software should +try to use GPGME instead. This way bug fixes or improvements can be +done at a central place and every application benefits from this. +Authors of MUAs should especially consider using GPGME. Creating a set +of standard widgets for common key selection tasks is even planned. + +This package contains the bindings to use the library from Python 3 applications. +%endif # with_python3 + +%if 0%{with_qt} +%package -n libqgpgme6 +Summary: A Library Designed to give Qt Applications easy Access to GnuPG +Group: Development/Libraries/C and C++ +Requires: gpg2 + +%description -n libqgpgme6 +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 +management. Currently it uses GnuPG as its back-end, but the API is not +restricted to this engine. + +Who Should use GPGME? + +Because the direct use of GnuPG from an application can be a +complicated programming task, it is suggested that all software should +try to use GPGME instead. This way bug fixes or improvements can be +done at a central place and every application benefits from this. +Authors of MUAs should especially consider using GPGME. Creating a set +of standard widgets for common key selection tasks is even planned. + +This package contains the Qt bindings. + +%package -n libqgpgme-devel +Summary: A Library Designed to give C++ Qt Applications easy Access to GnuPG +Group: Development/Libraries/C and C++ +Requires: libgpgme-devel = %{version} +Requires: libgpgmepp-devel = %{version} +Requires: libqgpgme6 = %{version} + +%description -n libqgpgme-devel +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 +management. Currently it uses GnuPG as its back-end, but the API is not +restricted to this engine. + +Who Should use GPGME? + +Because the direct use of GnuPG from an application can be a +complicated programming task, it is suggested that all software should +try to use GPGME instead. This way bug fixes or improvements can be +done at a central place and every application benefits from this. +Authors of MUAs should especially consider using GPGME. Creating a set +of standard widgets for common key selection tasks is even planned. + +This package contains the bindings to use the library in Qt C++ applications. + +%endif # with_qt + %prep %setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build +# for gpgme-1.7.0-python-Include-config.h.patch +./autogen.sh +# build_timestamp=$(date -u +%{Y}-%{m}-%{dT}%{H}:%{M}+0000 -r %{SOURCE99}) +languages="cl" +%if 0%{with_cpp} +languages="${languages} cpp" +%if %{with_qt} +languages="${languages} qt" +%endif # with_qt +%endif # with_cpp +%if 0%{with_python2} +languages="${languages} python2" +%endif # with_python2 +%if 0%{with_python3} +languages="${languages} python3" +%endif # with_python3 %configure \ --disable-static \ --disable-fd-passing \ + --enable-languages="${languages}" \ --enable-build-timestamp="${build_timestamp}" make %{?_smp_mflags} %install -%make_install -# Do this now to make /usr/lib/rpm/brp-chuck-la happy: +make %{?_smp_mflags} DESTDIR=%{buildroot} install find %{buildroot} -type f -name "*.la" -delete -print +%if 0%{with_cpp} +chmod -x %{buildroot}%{_libdir}/cmake/Gpgmepp/*.cmake +%endif # with_cpp +%if 0%{with_python2} +find %{buildroot}%{python_sitearch}/pyme3-*.egg-info -delete -print +find %{buildroot}%{python_sitearch}/pyme -type f -name "*.pyc" -delete -print +rm -v %{buildroot}%{python_sitelib}/pyme/install_files.txt +%endif # with_python2 +%if 0%{with_python3} +find %{buildroot}%{python3_sitearch}/pyme3-*.egg-info -delete -print +rm -v %{buildroot}%{python3_sitelib}/pyme/install_files.txt +find %{buildroot}%{python3_sitearch}/pyme -type f -name "*.pyc" -delete -print +%endif # with_python3 %check %if ! 0%{?qemu_user_space_build} -#make check +make %{?_smp_mflags} check %endif %post -n libgpgme11 -p /sbin/ldconfig - %postun -n libgpgme11 -p /sbin/ldconfig +%if 0%{with_cpp} +%post -n libgpgmepp6 -p /sbin/ldconfig +%postun -n libgpgmepp6 -p /sbin/ldconfig +%endif # with_cpp + +%if 0%{with_qt} +%post -n libqgpgme6 -p /sbin/ldconfig +%postun -n libqgpgme6 -p /sbin/ldconfig +%endif # with_qt %post %install_info --info-dir=%{_infodir} %{_infodir}/gpgme.info.gz @@ -131,7 +352,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %files %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog ChangeLog-2011 README NEWS THANKS TODO +%doc AUTHORS COPYING COPYING.LESSER ChangeLog ChangeLog-2011 README NEWS THANKS TODO VERSION %{_bindir}/gpgme-tool %{_datadir}/common-lisp %{_datadir}/common-lisp/source @@ -150,4 +371,49 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_datadir}/aclocal/gpgme.m4 %{_includedir}/gpgme.h +%if 0%{with_cpp} +%files -n libgpgmepp6 +%defattr(-,root,root) +%{_libdir}/libgpgmepp.so.* + +%files -n libgpgmepp-devel +%defattr(-,root,root) +%{_libdir}/libgpgmepp.so +%{_includedir}/gpgmepp_version.h +%{_includedir}/gpgme++ +%dir %{_libdir}/cmake +%dir %{_libdir}/cmake/Gpgmepp +%{_libdir}/cmake/Gpgmepp/GpgmeppConfig*.cmake +%endif # with_cpp + +%if 0%{with_python2} +%files -n python-pyme +%defattr(-,root,root) +%{python_sitelib}/pyme +%{python_sitearch}/pyme +%endif # with_python2 + +%if 0%{with_python3} +%files -n python3-pyme +%defattr(-,root,root) +%{python3_sitelib}/pyme +%{python3_sitearch}/pyme +%endif # with_python3 + +%if 0%{with_qt} +%files -n libqgpgme6 +%defattr(-,root,root) +%{_libdir}/libqgpgme.so.* + +%files -n libqgpgme-devel +%defattr(-,root,root) +%{_includedir}/qgpgme/ +%{_includedir}/QGpgME/ +%dir %{_libdir}/cmake +%dir %{_libdir}/cmake/Gpgmepp +%{_libdir}/cmake/Gpgmepp/QGpgmeConfig*.cmake +%{_includedir}/qgpgme_version.h +%{_libdir}/libqgpgme.so +%endif # with_qt + %changelog