gpgme/gpgme-1.7.0-cpp-qt-Include-config.h.patch

1155 lines
33 KiB
Diff

From a142f187b7ddb2728ec3e1743da4a0c4538ab40a Mon Sep 17 00:00:00 2001
From: Andre Heinecke <aheinecke@intevation.de>
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 <context.h>
#include <eventloopinteractor.h>
#include <trustitem.h>
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 <global.h>
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 <error.h>
#include <interfaces/dataprovider.h>
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 <decryptionresult.h>
#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 <encryptionresult.h>
#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 <gpgme.h>
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 <eventloopinteractor.h>
#include <context.h>
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 <gpgme.h>
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 <importresult.h>
#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 <key.h>
#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 <keygenerationresult.h>
#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 <keylistresult.h>
#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 <signingresult.h>
#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 <istream>
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 <trustitem.h>
#include <gpgme.h>
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 <verificationresult.h>
#include <notation.h>
#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 <vfsmountresult.h>
#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 <dataprovider.h>
#include <error.h>
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 <QDebug>
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 <QDebug>
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 <QDebug>
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 <QDebug>
#include <QTest>
#include <QTemporaryDir>
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 <QDebug>
#include <QTest>
#include <QSignalSpy>
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 <QDebug>
#include <QTest>
#include <QSignalSpy>
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 <QDebug>
#include <QTest>
#include <QSignalSpy>
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 <QTest>
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 <QDebug>
#include <QTest>
#include <QTemporaryDir>
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 <QDebug>
#include <QTest>
#include <QSignalSpy>