[Pkg-gnupg-commit] [gpgme] 48/53: drop upstream patches
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Mon Oct 24 19:26:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch experimental
in repository gpgme.
commit 6edef395bce03493261ee464e8ac6f79057a41f0
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Wed Oct 19 23:59:56 2016 -0400
drop upstream patches
---
.../patches/0001-avoid-identifying-as-beta.patch | 4 +-
...-Fix-minor-errors-in-I-O-callback-example.patch | 72 --
...003-tests-Fix-select-usage-in-t-eventloop.patch | 37 -
...gpg-Add-option-exit-on-status-write-error.patch | 32 -
.../0005-tests-Add-test-for-cancellation.patch | 312 -----
...ll-cmake-files-without-executable-bit-set.patch | 49 -
...ntation-reproducible-by-omitting-HTML_TIM.patch | 22 -
debian/patches/0008-python-Include-config.h.patch | 123 --
.../0009-python-Correctly-translate-off_t.patch | 64 -
...0010-python-Correctly-translate-to-size_t.patch | 52 -
...thon-Get-rid-of-the-last-C-style-comments.patch | 77 --
...core-New-helper-function-_gpgme_strconcat.patch | 222 ----
...core-Fix-error-checking-in-_gpgme_mkstemp.patch | 34 -
debian/patches/0014-cpp-qt-Include-config.h.patch | 1245 --------------------
debian/patches/series | 13 -
15 files changed, 2 insertions(+), 2356 deletions(-)
diff --git a/debian/patches/0001-avoid-identifying-as-beta.patch b/debian/patches/0001-avoid-identifying-as-beta.patch
index 340988a..e1e1899 100644
--- a/debian/patches/0001-avoid-identifying-as-beta.patch
+++ b/debian/patches/0001-avoid-identifying-as-beta.patch
@@ -11,10 +11,10 @@ This patch avoids that situation.
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
-index c9d16af..1a8d33a 100644
+index 6580b7c..16950e8 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -37,13 +37,10 @@ m4_define(mym4_version_micro, [0])
+@@ -37,13 +37,10 @@ m4_define(mym4_version_micro, [1])
# processing is done by autoconf and not during the configure run.
m4_define(mym4_version,
[mym4_version_major.mym4_version_minor.mym4_version_micro])
diff --git a/debian/patches/0002-doc-Fix-minor-errors-in-I-O-callback-example.patch b/debian/patches/0002-doc-Fix-minor-errors-in-I-O-callback-example.patch
deleted file mode 100644
index b4be7ed..0000000
--- a/debian/patches/0002-doc-Fix-minor-errors-in-I-O-callback-example.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From: Daiki Ueno <ueno at gnu.org>
-Date: Tue, 9 Feb 2016 17:03:50 +0900
-Subject: doc: Fix minor errors in I/O callback example
-
-* gpgme.texi (I/O Callback Example): Fix typos, add timeout to select,
-and initialize mutex as recursive.
-
-Signed-off-by: Daiki Ueno <ueno at gnu.org>
----
- doc/gpgme.texi | 22 +++++++++++++++++-----
- 1 file changed, 17 insertions(+), 5 deletions(-)
-
-diff --git a/doc/gpgme.texi b/doc/gpgme.texi
-index ec7ebb7..6d6d692 100644
---- a/doc/gpgme.texi
-+++ b/doc/gpgme.texi
-@@ -6016,6 +6016,7 @@ do_select (struct event_loop *loop)
- fd_set wfds;
- int i, n;
- int any = 0;
-+ struct timeval tv;
- struct one_fd *fdlist = loop->fds;
-
- pthread_mutex_lock (&loop->lock);
-@@ -6024,11 +6025,14 @@ do_select (struct event_loop *loop)
- for (i = 0; i < MAX_FDS; i++)
- if (fdlist[i].fd != -1)
- FD_SET (fdlist[i].fd, fdlist[i].dir ? &rfds : &wfds);
-- pthread_mutex_unlock (&loop->unlock);
-+ pthread_mutex_unlock (&loop->lock);
-+
-+ tv.tv_sec = 0;
-+ tv.tv_usec = 1000;
-
- do
- @{
-- n = select (FD_SETSIZE, &rfds, &wfds, NULL, 0);
-+ n = select (FD_SETSIZE, &rfds, &wfds, NULL, &tv);
- @}
- while (n < 0 && errno == EINTR);
-
-@@ -6082,6 +6086,7 @@ main (int argc, char *argv[])
- gpgme_error_t err;
- gpgme_data_t sig, text;
- int i;
-+ pthread_mutexattr_t attr;
- struct gpgme_io_cbs io_cbs =
- @{
- add_io_cb,
-@@ -6091,12 +6096,19 @@ main (int argc, char *argv[])
- &result
- @};
-
-- init_gpgme (void);
-+ init_gpgme ();
-
- /* Initialize the loop structure. */
-- pthread_mutex_init (&loop.lock, NULL);
-+
-+ /* The mutex must be recursive, since remove_io_cb (which acquires a
-+ lock) can be called while holding a lock acquired in do_select. */
-+ pthread_mutexattr_init (&attr);
-+ pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
-+ pthread_mutex_init (&loop.lock, &attr);
-+ pthread_mutexattr_destroy (&attr);
-+
- for (i = 0; i < MAX_FDS; i++)
-- loop->fds[i].fd = -1;
-+ loop.fds[i].fd = -1;
-
- /* Initialize the result structure. */
- result.done = 0;
diff --git a/debian/patches/0003-tests-Fix-select-usage-in-t-eventloop.patch b/debian/patches/0003-tests-Fix-select-usage-in-t-eventloop.patch
deleted file mode 100644
index 21d1eb3..0000000
--- a/debian/patches/0003-tests-Fix-select-usage-in-t-eventloop.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Daiki Ueno <ueno at gnu.org>
-Date: Tue, 9 Feb 2016 17:03:51 +0900
-Subject: tests: Fix select usage in t-eventloop
-
-* tests/gpg/t-eventloop.c (do_select): Supply timeout value to select.
-
-Signed-off-by: Daiki Ueno <ueno at gnu.org>
----
- tests/gpg/t-eventloop.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/tests/gpg/t-eventloop.c b/tests/gpg/t-eventloop.c
-index 74af35f..2d3df41 100644
---- a/tests/gpg/t-eventloop.c
-+++ b/tests/gpg/t-eventloop.c
-@@ -111,6 +111,7 @@ do_select (void)
- fd_set wfds;
- int i, n;
- int any = 0;
-+ struct timeval tv;
-
- FD_ZERO (&rfds);
- FD_ZERO (&wfds);
-@@ -118,9 +119,12 @@ do_select (void)
- if (fdlist[i].fd != -1)
- FD_SET (fdlist[i].fd, fdlist[i].dir ? &rfds : &wfds);
-
-+ tv.tv_sec = 0;
-+ tv.tv_usec = 1000;
-+
- do
- {
-- n = select (FD_SETSIZE, &rfds, &wfds, NULL, 0);
-+ n = select (FD_SETSIZE, &rfds, &wfds, NULL, &tv);
- }
- while (n < 0 && errno == EINTR);
-
diff --git a/debian/patches/0004-gpg-Add-option-exit-on-status-write-error.patch b/debian/patches/0004-gpg-Add-option-exit-on-status-write-error.patch
deleted file mode 100644
index 0fb701b..0000000
--- a/debian/patches/0004-gpg-Add-option-exit-on-status-write-error.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Daiki Ueno <ueno at gnu.org>
-Date: Tue, 9 Feb 2016 17:03:53 +0900
-Subject: gpg: Add option --exit-on-status-write-error
-
-* src/engine-gpg.c (gpg_new): Add --exit-on-status-write-error if the
-engine version is latest enough to expect progress output from gpg.
-
---
-GnuPG-bug-id: 1415
-Signed-off-by: Daiki Ueno <ueno at gnu.org>
-
-Changed the version test from the patch to use the newer
-have_gpg_version.
-
-Signed-off-by: Werner Koch <wk at gnupg.org>
----
- src/engine-gpg.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/engine-gpg.c b/src/engine-gpg.c
-index 8bb348f..3f1d34d 100644
---- a/src/engine-gpg.c
-+++ b/src/engine-gpg.c
-@@ -544,6 +544,8 @@ gpg_new (void **engine, const char *file_name, const char *home_dir,
- rc = add_arg (gpg, "utf8");
- if (!rc)
- rc = add_arg (gpg, "--enable-progress-filter");
-+ if (!rc && have_gpg_version (gpg, "2.1.11"))
-+ rc = add_arg (gpg, "--exit-on-status-write-error");
- if (rc)
- goto leave;
-
diff --git a/debian/patches/0005-tests-Add-test-for-cancellation.patch b/debian/patches/0005-tests-Add-test-for-cancellation.patch
deleted file mode 100644
index b0cd003..0000000
--- a/debian/patches/0005-tests-Add-test-for-cancellation.patch
+++ /dev/null
@@ -1,312 +0,0 @@
-From: Daiki Ueno <ueno at gnu.org>
-Date: Tue, 9 Feb 2016 17:03:54 +0900
-Subject: tests: Add test for cancellation
-
-* tests/gpg/t-cancel.c: New file.
-* tests/gpg/Makefile.am (tests_skipped): New variable, default to
-t-genkey and t-cancel.
-(noinst_PROGRAMS): Add $(tests_skipped).
-* tests/gpg/.gitignore: Add t-cancel.
-
-Signed-off-by: Daiki Ueno <ueno at gnu.org>
----
- tests/gpg/Makefile.am | 12 ++-
- tests/gpg/t-cancel.c | 265 ++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 275 insertions(+), 2 deletions(-)
- create mode 100644 tests/gpg/t-cancel.c
-
-diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
-index 9877843..2538f63 100644
---- a/tests/gpg/Makefile.am
-+++ b/tests/gpg/Makefile.am
-@@ -62,9 +62,17 @@ AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
- AM_LDFLAGS = -no-install
- LDADD = ../../src/libgpgme.la
- t_thread1_LDADD = ../../src/libgpgme-pthread.la -lpthread
-+t_cancel_LDADD = ../../src/libgpgme-pthread.la -lpthread
-+
-+# We don't run t-genkey and t-cancel in the test suite, because it
-+# takes too long
-+tests_skipped = t-genkey
-+if !HAVE_W32_SYSTEM
-+tests_skipped += t-cancel
-+endif
-+
-+noinst_PROGRAMS = $(c_tests) $(tests_skipped)
-
--# We don't run t-genkey in the test suite, because it takes too long
--noinst_PROGRAMS = $(c_tests) t-genkey
-
- clean-local:
- -$(top_srcdir)/tests/start-stop-agent --stop
-diff --git a/tests/gpg/t-cancel.c b/tests/gpg/t-cancel.c
-new file mode 100644
-index 0000000..af98af9
---- /dev/null
-+++ b/tests/gpg/t-cancel.c
-@@ -0,0 +1,265 @@
-+/* t-thread-cancel.c - Regression test.
-+ Copyright (C) 2000 Werner Koch (dd9jn)
-+ Copyright (C) 2001, 2003, 2004 g10 Code GmbH
-+
-+ This file is part of GPGME.
-+
-+ GPGME is free software; you can redistribute it and/or modify it
-+ under the terms of the GNU Lesser General Public License as
-+ published by the Free Software Foundation; either version 2.1 of
-+ the License, or (at your option) any later version.
-+
-+ GPGME is distributed in the hope that it will be useful, but
-+ WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with this program; if not, write to the Free Software
-+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+ 02111-1307, USA. */
-+
-+/* We need to include config.h so that we know whether we are building
-+ with large file system (LFS) support. */
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <assert.h>
-+#include <limits.h>
-+#include <ctype.h>
-+#include <errno.h>
-+#include <unistd.h>
-+#include <pthread.h>
-+
-+#include <gpgme.h>
-+
-+#include "t-support.h"
-+
-+struct op_result
-+{
-+ int done;
-+ gpgme_error_t err;
-+};
-+
-+static struct op_result op_result;
-+
-+struct one_fd
-+{
-+ int fd;
-+ int dir;
-+ gpgme_io_cb_t fnc;
-+ void *fnc_data;
-+};
-+
-+#define FDLIST_MAX 32
-+static struct one_fd fdlist[FDLIST_MAX];
-+
-+static pthread_mutex_t lock;
-+
-+static gpgme_error_t
-+add_io_cb (void *data, int fd, int dir, gpgme_io_cb_t fnc, void *fnc_data,
-+ void **r_tag)
-+{
-+ struct one_fd *fds = data;
-+ int i;
-+
-+ pthread_mutex_lock (&lock);
-+ for (i = 0; i < FDLIST_MAX; i++)
-+ {
-+ if (fds[i].fd == -1)
-+ {
-+ fds[i].fd = fd;
-+ fds[i].dir = dir;
-+ fds[i].fnc = fnc;
-+ fds[i].fnc_data = fnc_data;
-+ break;
-+ }
-+ }
-+ pthread_mutex_unlock (&lock);
-+ if (i == FDLIST_MAX)
-+ return gpgme_err_make (GPG_ERR_SOURCE_USER_1, GPG_ERR_GENERAL);
-+ *r_tag = &fds[i];
-+ return 0;
-+}
-+
-+static void
-+remove_io_cb (void *tag)
-+{
-+ struct one_fd *fd = tag;
-+
-+ pthread_mutex_lock (&lock);
-+ fd->fd = -1;
-+ pthread_mutex_unlock (&lock);
-+}
-+
-+static void
-+io_event (void *data, gpgme_event_io_t type, void *type_data)
-+{
-+ struct op_result *result = data;
-+
-+ if (type == GPGME_EVENT_DONE)
-+ {
-+ result->done = 1;
-+ result->err = * (gpgme_error_t *) type_data;
-+ }
-+}
-+
-+
-+static int
-+do_select (void)
-+{
-+ fd_set rfds;
-+ fd_set wfds;
-+ int i, n;
-+ int any = 0;
-+ struct timeval tv;
-+
-+ pthread_mutex_lock (&lock);
-+ FD_ZERO (&rfds);
-+ FD_ZERO (&wfds);
-+ for (i = 0; i < FDLIST_MAX; i++)
-+ if (fdlist[i].fd != -1)
-+ FD_SET (fdlist[i].fd, fdlist[i].dir ? &rfds : &wfds);
-+ pthread_mutex_unlock (&lock);
-+
-+ tv.tv_sec = 0;
-+ tv.tv_usec = 1000;
-+
-+ do
-+ {
-+ n = select (FD_SETSIZE, &rfds, &wfds, NULL, &tv);
-+ }
-+ while (n < 0 && errno == EINTR);
-+
-+ if (n < 0)
-+ return n; /* Error or timeout. */
-+
-+ pthread_mutex_lock (&lock);
-+ for (i = 0; i < FDLIST_MAX && n; i++)
-+ {
-+ if (fdlist[i].fd != -1)
-+ {
-+ if (FD_ISSET (fdlist[i].fd, fdlist[i].dir ? &rfds : &wfds))
-+ {
-+ assert (n);
-+ n--;
-+ any = 1;
-+ (*fdlist[i].fnc) (fdlist[i].fnc_data, fdlist[i].fd);
-+ }
-+ }
-+ }
-+ pthread_mutex_unlock (&lock);
-+ return any;
-+}
-+
-+static int
-+my_wait (void)
-+{
-+ int n;
-+
-+ do
-+ {
-+ n = do_select ();
-+ }
-+ while (n >= 0 && !op_result.done);
-+ return 0;
-+}
-+
-+
-+static struct gpgme_io_cbs io_cbs =
-+ {
-+ add_io_cb,
-+ fdlist,
-+ remove_io_cb,
-+ io_event,
-+ &op_result
-+ };
-+
-+
-+static void *
-+thread_cancel (void *data)
-+{
-+ gpgme_ctx_t ctx = data;
-+ gpgme_error_t err;
-+
-+ usleep (100000);
-+ err = gpgme_cancel (ctx);
-+ fail_if_err (err);
-+
-+ return NULL;
-+}
-+
-+int
-+main (void)
-+{
-+ gpgme_ctx_t ctx;
-+ gpgme_error_t err;
-+ gpgme_engine_info_t info;
-+ int i;
-+ pthread_mutexattr_t attr;
-+ pthread_t tcancel;
-+ const char *parms = "<GnupgKeyParms format=\"internal\">\n"
-+ "Key-Type: RSA\n"
-+ "Key-Length: 2048\n"
-+ "Subkey-Type: RSA\n"
-+ "Subkey-Length: 2048\n"
-+ "Name-Real: Joe Tester\n"
-+ "Name-Comment: (pp=abc)\n"
-+ "Name-Email: joe at foo.bar\n"
-+ "Expire-Date: 0\n"
-+ "Passphrase: abc\n"
-+ "</GnupgKeyParms>\n";
-+
-+ init_gpgme (GPGME_PROTOCOL_OpenPGP);
-+
-+ err = gpgme_get_engine_info (&info);
-+ fail_if_err (err);
-+
-+ /* The mutex must be recursive, since remove_io_cb (which acquires a
-+ lock) can be called while holding a lock acquired in do_select. */
-+ pthread_mutexattr_init (&attr);
-+ pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
-+ pthread_mutex_init (&lock, &attr);
-+ pthread_mutexattr_destroy (&attr);
-+
-+ for (i = 0; i < FDLIST_MAX; i++)
-+ fdlist[i].fd = -1;
-+
-+ err = gpgme_new (&ctx);
-+ fail_if_err (err);
-+ gpgme_set_armor (ctx, 1);
-+ gpgme_set_io_cbs (ctx, &io_cbs);
-+ op_result.done = 0;
-+
-+ pthread_create (&tcancel, NULL, thread_cancel, ctx);
-+
-+ err = gpgme_op_genkey_start (ctx, parms, NULL, NULL);
-+ fail_if_err (err);
-+
-+ my_wait ();
-+
-+ pthread_join (tcancel, NULL);
-+
-+ if (op_result.err)
-+ {
-+ if (gpgme_err_code (op_result.err) == GPG_ERR_CANCELED)
-+ fputs ("Successfully cancelled\n", stdout);
-+ else
-+ {
-+ fprintf (stderr,
-+ "%s:%i: Operation finished with unexpected error: %s\n",
-+ __FILE__, __LINE__, gpgme_strerror (op_result.err));
-+ exit (1);
-+ }
-+ }
-+ else
-+ fputs ("Successfully finished before cancellation\n", stdout);
-+
-+ gpgme_release (ctx);
-+
-+ return 0;
-+}
diff --git a/debian/patches/0006-install-cmake-files-without-executable-bit-set.patch b/debian/patches/0006-install-cmake-files-without-executable-bit-set.patch
deleted file mode 100644
index 6c74ce6..0000000
--- a/debian/patches/0006-install-cmake-files-without-executable-bit-set.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-Date: Wed, 12 Oct 2016 06:08:46 -0400
-Subject: install cmake files without executable bit set
-
-cmake is exciting but it's not *that* exciting, and besides lintian
-complains:
-
-W: libgpgme-dev: executable-not-elf-or-script
- usr/lib/x86_64-linux-gnu/cmake/Gpgmepp/QGpgmeConfig.cmake
-
-none of the other cmake files on a debian system appear to be intalled
-with executable provisiona either.
----
- lang/cpp/src/Makefile.am | 4 ++--
- lang/qt/src/Makefile.am | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lang/cpp/src/Makefile.am b/lang/cpp/src/Makefile.am
-index e65a875..0165074 100644
---- a/lang/cpp/src/Makefile.am
-+++ b/lang/cpp/src/Makefile.am
-@@ -82,9 +82,9 @@ GpgmeppConfig.cmake: GpgmeppConfig.cmake.in
-
- install-cmake-files: GpgmeppConfig.cmake GpgmeppConfigVersion.cmake
- -$(INSTALL) -d $(DESTDIR)$(libdir)/cmake/Gpgmepp
-- $(INSTALL) GpgmeppConfig.cmake \
-+ $(INSTALL) -m 644 GpgmeppConfig.cmake \
- $(DESTDIR)$(libdir)/cmake/Gpgmepp/GpgmeppConfig.cmake
-- $(INSTALL) GpgmeppConfigVersion.cmake \
-+ $(INSTALL) -m 644 GpgmeppConfigVersion.cmake \
- $(DESTDIR)$(libdir)/cmake/Gpgmepp/GpgmeppConfigVersion.cmake
-
- uninstall-cmake-files:
-diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am
-index c15da18..1ae596a 100644
---- a/lang/qt/src/Makefile.am
-+++ b/lang/qt/src/Makefile.am
-@@ -232,9 +232,9 @@ $(camelcase_headers): Makefile.am
-
- install-cmake-files: QGpgmeConfig.cmake QGpgmeConfigVersion.cmake
- -$(INSTALL) -d $(DESTDIR)$(libdir)/cmake/Gpgmepp
-- $(INSTALL) QGpgmeConfig.cmake \
-+ $(INSTALL) -m 644 QGpgmeConfig.cmake \
- $(DESTDIR)$(libdir)/cmake/Gpgmepp/QGpgmeConfig.cmake
-- $(INSTALL) QGpgmeConfigVersion.cmake \
-+ $(INSTALL) -m 644 QGpgmeConfigVersion.cmake \
- $(DESTDIR)$(libdir)/cmake/Gpgmepp/QGpgmeConfigVersion.cmake
-
- uninstall-cmake-files:
diff --git a/debian/patches/0007-make-documentation-reproducible-by-omitting-HTML_TIM.patch b/debian/patches/0007-make-documentation-reproducible-by-omitting-HTML_TIM.patch
deleted file mode 100644
index 8b520b7..0000000
--- a/debian/patches/0007-make-documentation-reproducible-by-omitting-HTML_TIM.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-Date: Wed, 12 Oct 2016 19:05:42 -0400
-Subject: make documentation reproducible by omitting HTML_TIMESTAMP
-
-we want the same docs to come out each time we run the build process.
----
- lang/qt/doc/Doxyfile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lang/qt/doc/Doxyfile.in b/lang/qt/doc/Doxyfile.in
-index 5d94f90..577f845 100644
---- a/lang/qt/doc/Doxyfile.in
-+++ b/lang/qt/doc/Doxyfile.in
-@@ -1147,7 +1147,7 @@ HTML_COLORSTYLE_GAMMA = 80
- # The default value is: YES.
- # This tag requires that the tag GENERATE_HTML is set to YES.
-
--HTML_TIMESTAMP = YES
-+HTML_TIMESTAMP = NO
-
- # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
- # documentation will contain sections that can be hidden and shown after the
diff --git a/debian/patches/0008-python-Include-config.h.patch b/debian/patches/0008-python-Include-config.h.patch
deleted file mode 100644
index da7db35..0000000
--- a/debian/patches/0008-python-Include-config.h.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From: Justus Winter <justus at g10code.com>
-Date: Mon, 26 Sep 2016 11:35:40 +0200
-Subject: 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 <justus at g10code.com>
----
- 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 <gpgme.h>
- %}
-
-@@ -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 <assert.h>
- #include <stdio.h>
- #include <gpgme.h>
-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 <gpgme.h>
- #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')
-
diff --git a/debian/patches/0009-python-Correctly-translate-off_t.patch b/debian/patches/0009-python-Correctly-translate-off_t.patch
deleted file mode 100644
index 2680ef0..0000000
--- a/debian/patches/0009-python-Correctly-translate-off_t.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From: Justus Winter <justus at g10code.com>
-Date: Mon, 26 Sep 2016 13:04:35 +0200
-Subject: python: Correctly translate off_t.
-
-* lang/python/gpgme.i: Improve int/long translations, correctly handle
-off_t with large file support.
-
-Signed-off-by: Justus Winter <justus at g10code.com>
----
- lang/python/gpgme.i | 39 ++++++++++++++++++++++++++++++++++-----
- 1 file changed, 34 insertions(+), 5 deletions(-)
-
-diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i
-index a4672e1..934ebea 100644
---- a/lang/python/gpgme.i
-+++ b/lang/python/gpgme.i
-@@ -291,13 +291,42 @@
-
- /* SWIG has problems interpreting ssize_t, off_t or gpgme_error_t in
- gpgme.h. */
--/* XXX: This is wrong at least for off_t if compiled with LFS. */
--%typemap(out) ssize_t, off_t, gpgme_error_t, gpgme_err_code_t, gpgme_err_source_t, gpg_error_t {
-+%typemap(out) ssize_t, gpgme_error_t, gpgme_err_code_t, gpgme_err_source_t, gpg_error_t {
- $result = PyLong_FromLong($1);
- }
--/* XXX: This is wrong at least for off_t if compiled with LFS. */
--%typemap(in) ssize_t, off_t, gpgme_error_t, gpgme_err_code_t, gpgme_err_source_t, gpg_error_t {
-- $1 = PyLong_AsLong($input);
-+
-+%typemap(in) ssize_t, gpgme_error_t, gpgme_err_code_t, gpgme_err_source_t, gpg_error_t {
-+ if (PyLong_Check($input))
-+ $1 = PyLong_AsLong($input);
-+#if PY_MAJOR_VERSION < 3
-+ else if (PyInt_Check($input))
-+ $1 = PyInt_AsLong($input);
-+#endif
-+ else
-+ PyErr_SetString(PyExc_TypeError, "Numeric argument expected");
-+}
-+
-+%typemap(out) off_t {
-+#if _FILE_OFFSET_BITS == 64
-+ $result = PyLong_FromLongLong($1);
-+#else
-+ $result = PyLong_FromLong($1);
-+#endif
-+}
-+
-+%typemap(in) off_t {
-+ if (PyLong_Check($input))
-+#if _FILE_OFFSET_BITS == 64
-+ $1 = PyLong_AsLongLong($input);
-+#else
-+ $1 = PyLong_AsLong($input);
-+#endif
-+#if PY_MAJOR_VERSION < 3
-+ else if (PyInt_Check($input))
-+ $1 = PyInt_AsLong($input);
-+#endif
-+ else
-+ PyErr_SetString(PyExc_TypeError, "Numeric argument expected");
- }
-
- // Those are for gpgme_data_read() and gpgme_strerror_r()
diff --git a/debian/patches/0010-python-Correctly-translate-to-size_t.patch b/debian/patches/0010-python-Correctly-translate-to-size_t.patch
deleted file mode 100644
index 99f3c45..0000000
--- a/debian/patches/0010-python-Correctly-translate-to-size_t.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Justus Winter <justus at g10code.com>
-Date: Mon, 26 Sep 2016 13:16:59 +0200
-Subject: python: Correctly translate to size_t.
-
-* lang/python/gpgme.i: Correctly translate Python number to size_t.
-
-Signed-off-by: Justus Winter <justus at g10code.com>
----
- lang/python/gpgme.i | 29 ++++++++++++++++++++++-------
- 1 file changed, 22 insertions(+), 7 deletions(-)
-
-diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i
-index 934ebea..04257fd 100644
---- a/lang/python/gpgme.i
-+++ b/lang/python/gpgme.i
-@@ -329,14 +329,29 @@
- PyErr_SetString(PyExc_TypeError, "Numeric argument expected");
- }
-
--// Those are for gpgme_data_read() and gpgme_strerror_r()
-+/* Those are for gpgme_data_read() and gpgme_strerror_r(). */
- %typemap(in) (void *buffer, size_t size), (char *buf, size_t buflen) {
-- $2 = PyLong_AsLong($input);
-- if ($2 < 0) {
-- PyErr_SetString(PyExc_ValueError, "Positive integer expected");
-- return NULL;
-- }
-- $1 = ($1_ltype) malloc($2+1);
-+ {
-+ long tmp$argnum;
-+ if (PyLong_Check($input))
-+ tmp$argnum = PyLong_AsLong($input);
-+#if PY_MAJOR_VERSION < 3
-+ else if (PyInt_Check($input))
-+ tmp$argnum = PyInt_AsLong($input);
-+#endif
-+ else
-+ {
-+ PyErr_SetString(PyExc_TypeError, "Numeric argument expected");
-+ return NULL;
-+ }
-+
-+ if (tmp$argnum < 0) {
-+ PyErr_SetString(PyExc_ValueError, "Positive integer expected");
-+ return NULL;
-+ }
-+ $2 = (size_t) tmp$argnum;
-+ $1 = ($1_ltype) malloc($2+1);
-+ }
- }
- %typemap(argout) (void *buffer, size_t size), (char *buf, size_t buflen) {
- Py_XDECREF($result); /* Blow away any previous result */
diff --git a/debian/patches/0011-python-Get-rid-of-the-last-C-style-comments.patch b/debian/patches/0011-python-Get-rid-of-the-last-C-style-comments.patch
deleted file mode 100644
index 3843818..0000000
--- a/debian/patches/0011-python-Get-rid-of-the-last-C-style-comments.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From: Justus Winter <justus at g10code.com>
-Date: Mon, 26 Sep 2016 16:45:21 +0200
-Subject: python: Get rid of the last C++-style comments.
-
---
-Signed-off-by: Justus Winter <justus at g10code.com>
----
- lang/python/gpgme.i | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i
-index 04257fd..eaeb4f8 100644
---- a/lang/python/gpgme.i
-+++ b/lang/python/gpgme.i
-@@ -110,7 +110,7 @@
- Py_XDECREF(pyVector$argnum[i]);
- }
-
--// Release returned buffers as necessary.
-+/* Release returned buffers as necessary. */
- %typemap(newfree) char * "free($1);";
- %newobject gpgme_data_release_and_get_mem;
-
-@@ -133,7 +133,7 @@
- /* input = $input, 1 = $1, 1_descriptor = $1_descriptor */
- /* &1_descriptor = $&1_descriptor *1_descriptor = $*1_descriptor */
-
-- // Following code is from swig's python.swg
-+ /* Following code is from swig's python.swg. */
- if ((SWIG_ConvertPtr(pypointer,(void **) &$1[i], $*1_descriptor,SWIG_POINTER_EXCEPTION | $disown )) == -1) {
- Py_DECREF(pypointer);
- return NULL;
-@@ -147,7 +147,7 @@
- if ($1) free($1);
- }
-
--// Special handling for references to our objects.
-+/* Special handling for references to our objects. */
- %typemap(in) gpgme_data_t DATAIN (gpgme_data_t wrapper = NULL,
- PyObject *bytesio = NULL,
- Py_buffer view, int have_view = 0) {
-@@ -167,7 +167,7 @@
-
- /* input = $input, 1 = $1, 1_descriptor = $1_descriptor */
-
-- // Following code is from swig's python.swg
-+ /* Following code is from swig's python.swg. */
-
- if ((SWIG_ConvertPtr(pypointer,(void **) &$1, $1_descriptor,
- SWIG_POINTER_EXCEPTION | $disown )) == -1) {
-@@ -401,7 +401,7 @@
- Py_XDECREF(encodedInput$argnum);
- }
-
--// Make types containing 'next' field to be lists
-+/* Make types containing 'next' field to be lists. */
- %ignore next;
- %typemap(out) gpgme_sig_notation_t, gpgme_subkey_t,
- gpgme_key_sig_t, gpgme_user_id_t, gpgme_invalid_key_t,
-@@ -631,7 +631,7 @@ struct _gpgme_sig_notation
-
- %include "errors.i"
-
--// Generating and handling pointers-to-pointers.
-+/* Generating and handling pointers-to-pointers. */
-
- %pointer_functions(gpgme_ctx_t, gpgme_ctx_t_p);
- %pointer_functions(gpgme_data_t, gpgme_data_t_p);
-@@ -640,7 +640,7 @@ struct _gpgme_sig_notation
- %pointer_functions(gpgme_trust_item_t, gpgme_trust_item_t_p);
- %pointer_functions(gpgme_engine_info_t, gpgme_engine_info_t_p);
-
--// Helper functions.
-+/* Helper functions. */
-
- %{
- #include <stdio.h>
diff --git a/debian/patches/0012-core-New-helper-function-_gpgme_strconcat.patch b/debian/patches/0012-core-New-helper-function-_gpgme_strconcat.patch
deleted file mode 100644
index 5970d70..0000000
--- a/debian/patches/0012-core-New-helper-function-_gpgme_strconcat.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-From: Werner Koch <wk at gnupg.org>
-Date: Thu, 22 Sep 2016 12:41:55 +0200
-Subject: core: New helper function _gpgme_strconcat.
-
-* src/conversion.c: Include stdarg.h.
-(do_strconcat): New.
-(_gpgme_strconcat): New.
-* src/util.h: Provide fallback for GPGRT_ATTR_SENTINEL.
-(_gpgme_strconcat): New with sentinel.
-
-* src/w32-util.c (find_program_in_dir): Replace malloc and stpcpy by
-_gpgme_strconcat.
-(find_program_at_standard_place): Ditto.
-(_gpgme_set_default_gpg_name): Ditto.
-(_gpgme_set_default_gpgconf_name): Ditto.
-(_gpgme_mkstemp): Ditto.
-(_gpgme_set_override_inst_dir): Repalce malloc and strcpy by strdup.
---
-
-The function has been taken from gnupg/common/stringhelp.c and license
-changed to LPGLv2.1+. I am the original author of that code.
-
-Signed-off-by: Werner Koch <wk at gnupg.org>
----
- src/conversion.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/util.h | 10 ++++++++++
- src/w32-util.c | 35 +++++++++++------------------------
- 3 files changed, 77 insertions(+), 24 deletions(-)
-
-diff --git a/src/conversion.c b/src/conversion.c
-index 3df8fe5..6dfabe7 100644
---- a/src/conversion.c
-+++ b/src/conversion.c
-@@ -31,6 +31,7 @@
- #endif
- #include <time.h>
- #include <errno.h>
-+#include <stdarg.h>
-
- #include "gpgme.h"
- #include "util.h"
-@@ -42,6 +43,61 @@
-
-
-
-+static char *
-+do_strconcat (const char *s1, va_list arg_ptr)
-+{
-+ const char *argv[16];
-+ size_t argc;
-+ size_t needed;
-+ char *buffer, *p;
-+
-+ argc = 0;
-+ argv[argc++] = s1;
-+ needed = strlen (s1);
-+ while (((argv[argc] = va_arg (arg_ptr, const char *))))
-+ {
-+ needed += strlen (argv[argc]);
-+ if (argc >= DIM (argv)-1)
-+ {
-+ gpg_err_set_errno (EINVAL);
-+ return NULL;
-+ }
-+ argc++;
-+ }
-+ needed++;
-+ buffer = malloc (needed);
-+ if (buffer)
-+ {
-+ for (p = buffer, argc=0; argv[argc]; argc++)
-+ p = stpcpy (p, argv[argc]);
-+ }
-+ return buffer;
-+}
-+
-+
-+/* Concatenate the string S1 with all the following strings up to a
-+ * NULL. Returns a malloced buffer with the new string or NULL on a
-+ malloc error or if too many arguments are given. */
-+char *
-+_gpgme_strconcat (const char *s1, ...)
-+{
-+ va_list arg_ptr;
-+ char *result;
-+
-+ if (!s1)
-+ result = strdup ("");
-+ else
-+ {
-+ va_start (arg_ptr, s1);
-+ result = do_strconcat (s1, arg_ptr);
-+ va_end (arg_ptr);
-+ }
-+ return result;
-+}
-+
-+
-+
-+
- /* Convert two hexadecimal digits from STR to the value they
- represent. Returns -1 if one of the characters is not a
- hexadecimal digit. */
-diff --git a/src/util.h b/src/util.h
-index 88e7750..1474b41 100644
---- a/src/util.h
-+++ b/src/util.h
-@@ -49,6 +49,10 @@
- # define GPG_ERR_FALSE 256
- #endif
-
-+#ifndef GPGRT_ATTR_SENTINEL
-+# define GPGRT_ATTR_SENTINEL(a) /* */
-+#endif
-+
-
-
- /*-- {posix,w32}-util.c --*/
-@@ -102,6 +106,12 @@ int _gpgme_ttyname_r (int fd, char *buf, size_t buflen);
-
-
- /*-- conversion.c --*/
-+
-+/* Concatenate the string S1 with all the following strings up to a
-+ NULL. Returns a malloced buffer with the new string or NULL on a
-+ malloc error or if too many arguments are given. */
-+char *_gpgme_strconcat (const char *s1, ...) GPGRT_ATTR_SENTINEL(0);
-+
- /* Convert two hexadecimal digits from STR to the value they
- represent. Returns -1 if one of the characters is not a
- hexadecimal digit. */
-diff --git a/src/w32-util.c b/src/w32-util.c
-index 0086fe3..edac750 100644
---- a/src/w32-util.c
-+++ b/src/w32-util.c
-@@ -388,11 +388,10 @@ find_program_in_dir (const char *dir, const char *name)
- {
- char *result;
-
-- result = malloc (strlen (dir) + 1 + strlen (name) + 1);
-+ result = _gpgme_strconcat (dir, "\\", strlen (name), NULL);
- if (!result)
- return NULL;
-
-- strcpy (stpcpy (stpcpy (result, dir), "\\"), name);
- if (access (result, F_OK))
- {
- free (result);
-@@ -417,15 +416,11 @@ find_program_at_standard_place (const char *name)
- if (SHGetSpecialFolderPathA (NULL, path, CSIDL_PROGRAM_FILES, 0)
- || SHGetSpecialFolderPathA (NULL, path, CSIDL_PROGRAM_FILESX86, 0))
- {
-- result = malloc (strlen (path) + 1 + strlen (name) + 1);
-- if (result)
-+ result = _gpgme_strconcat (path, "\\", name, NULL);
-+ if (result && access (result, F_OK))
- {
-- strcpy (stpcpy (stpcpy (result, path), "\\"), name);
-- if (access (result, F_OK))
-- {
-- free (result);
-- result = NULL;
-- }
-+ free (result);
-+ result = NULL;
- }
- }
- return result;
-@@ -439,12 +434,9 @@ _gpgme_set_default_gpg_name (const char *name)
- {
- if (!default_gpg_name)
- {
-- default_gpg_name = malloc (strlen (name) + 5);
-+ default_gpg_name = _gpgme_strconcat (name, ".exe", NULL);
- if (default_gpg_name)
-- {
-- strcpy (stpcpy (default_gpg_name, name), ".exe");
-- replace_slashes (default_gpg_name);
-- }
-+ replace_slashes (default_gpg_name);
- }
- return !default_gpg_name;
- }
-@@ -456,12 +448,9 @@ _gpgme_set_default_gpgconf_name (const char *name)
- {
- if (!default_gpgconf_name)
- {
-- default_gpgconf_name = malloc (strlen (name) + 5);
-+ default_gpgconf_name = _gpgme_strconcat (name, ".exe", NULL);
- if (default_gpgconf_name)
-- {
-- strcpy (stpcpy (default_gpgconf_name, name), ".exe");
-- replace_slashes (default_gpgconf_name);
-- }
-+ replace_slashes (default_gpgconf_name);
- }
- return !default_gpgconf_name;
- }
-@@ -474,10 +463,9 @@ _gpgme_set_override_inst_dir (const char *dir)
- {
- if (!override_inst_dir)
- {
-- override_inst_dir = malloc (strlen (dir) + 1);
-+ override_inst_dir = strdup (dir);
- if (override_inst_dir)
- {
-- strcpy (override_inst_dir, dir);
- replace_slashes (override_inst_dir);
- /* Remove a trailing slash. */
- if (*override_inst_dir
-@@ -762,10 +750,9 @@ _gpgme_mkstemp (int *fd, char **name)
- }
- }
-
-- tmpname = malloc (strlen (tmp) + 13 + 1);
-+ tmpname = _gpgme_strconcat (tmp, "\\gpgme-XXXXXX", NULL);
- if (!tmpname)
- return -1;
-- strcpy (stpcpy (tmpname, tmp), "\\gpgme-XXXXXX");
- *fd = my_mkstemp (tmpname);
- if (fd < 0)
- {
diff --git a/debian/patches/0013-core-Fix-error-checking-in-_gpgme_mkstemp.patch b/debian/patches/0013-core-Fix-error-checking-in-_gpgme_mkstemp.patch
deleted file mode 100644
index 7388cd9..0000000
--- a/debian/patches/0013-core-Fix-error-checking-in-_gpgme_mkstemp.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Werner Koch <wk at gnupg.org>
-Date: Thu, 22 Sep 2016 12:46:06 +0200
-Subject: core: Fix error checking in _gpgme_mkstemp.
-
-* src/w32-util.c (_gpgme_mkstemp): Fix error checking.
-(dlopen): Mark FLAGS as unused.
-
-Signed-off-by: Werner Koch <wk at gnupg.org>
----
- src/w32-util.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/w32-util.c b/src/w32-util.c
-index edac750..9d42139 100644
---- a/src/w32-util.c
-+++ b/src/w32-util.c
-@@ -98,6 +98,8 @@ static GPG_ERR_INLINE void *
- dlopen (const char * name, int flag)
- {
- void * hd = LoadLibrary (name);
-+
-+ (void)flag;
- return hd;
- }
-
-@@ -754,7 +756,7 @@ _gpgme_mkstemp (int *fd, char **name)
- if (!tmpname)
- return -1;
- *fd = my_mkstemp (tmpname);
-- if (fd < 0)
-+ if (*fd < 0)
- {
- free (tmpname);
- return -1;
diff --git a/debian/patches/0014-cpp-qt-Include-config.h.patch b/debian/patches/0014-cpp-qt-Include-config.h.patch
deleted file mode 100644
index 28fc9be..0000000
--- a/debian/patches/0014-cpp-qt-Include-config.h.patch
+++ /dev/null
@@ -1,1245 +0,0 @@
-From: Andre Heinecke <aheinecke at intevation.de>
-Date: Fri, 23 Sep 2016 15:22:29 +0200
-Subject: 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 | 39 +++++++++++++++++++++++
- lang/cpp/src/context_qt.cpp | 39 +++++++++++++++++++++++
- 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, 346 insertions(+)
- create mode 100644 lang/cpp/src/context_glib.cpp
- create mode 100644 lang/cpp/src/context_qt.cpp
-
-diff --git a/lang/cpp/src/callbacks.cpp b/lang/cpp/src/callbacks.cpp
-index 4b4dd80..3631c53 100644
---- a/lang/cpp/src/callbacks.cpp
-+++ b/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"
-
-diff --git a/lang/cpp/src/configuration.cpp b/lang/cpp/src/configuration.cpp
-index 7ef2883..293746a 100644
---- a/lang/cpp/src/configuration.cpp
-+++ b/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"
-diff --git a/lang/cpp/src/context.cpp b/lang/cpp/src/context.cpp
-index 00f397b..d516737 100644
---- a/lang/cpp/src/context.cpp
-+++ b/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>
-diff --git a/lang/cpp/src/context_glib.cpp b/lang/cpp/src/context_glib.cpp
-new file mode 100644
-index 0000000..14093bf
---- /dev/null
-+++ b/lang/cpp/src/context_glib.cpp
-@@ -0,0 +1,39 @@
-+/*
-+ context_glib.cpp - wraps a gpgme key context, gpgme-glib-specific functions
-+ Copyright (C) 2007 Klarälvdalens Datakonsult AB
-+
-+ This file is part of GPGME++.
-+
-+ GPGME++ is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Library General Public
-+ License as published by the Free Software Foundation; either
-+ version 2 of the License, or (at your option) any later version.
-+
-+ GPGME++ is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU Library General Public License for more details.
-+
-+ You should have received a copy of the GNU Library General Public License
-+ along with GPGME++; see the file COPYING.LIB. If not, write to the
-+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ Boston, MA 02110-1301, USA.
-+*/
-+
-+#ifdef HAVE_CONFIG_H
-+ #include "config.h"
-+#endif
-+
-+#include <global.h>
-+
-+extern "C" GIOChannel *gpgme_get_fdptr(int);
-+
-+GIOChannel *GpgME::getGIOChannel(int fd)
-+{
-+ return gpgme_get_fdptr(fd);
-+}
-+
-+QIODevice *GpgME::getQIODevice(int fd)
-+{
-+ return 0;
-+}
-diff --git a/lang/cpp/src/context_qt.cpp b/lang/cpp/src/context_qt.cpp
-new file mode 100644
-index 0000000..5d716c5
---- /dev/null
-+++ b/lang/cpp/src/context_qt.cpp
-@@ -0,0 +1,39 @@
-+/*
-+ context_qt.cpp - wraps a gpgme key context, gpgme-qt-specific functions
-+ Copyright (C) 2007 Klarälvdalens Datakonsult AB
-+
-+ This file is part of GPGME++.
-+
-+ GPGME++ is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Library General Public
-+ License as published by the Free Software Foundation; either
-+ version 2 of the License, or (at your option) any later version.
-+
-+ GPGME++ is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU Library General Public License for more details.
-+
-+ You should have received a copy of the GNU Library General Public License
-+ along with GPGME++; see the file COPYING.LIB. If not, write to the
-+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ Boston, MA 02110-1301, USA.
-+*/
-+
-+#ifdef HAVE_CONFIG_H
-+ #include "config.h"
-+#endif
-+
-+#include <global.h>
-+
-+extern "C" QIODevice *gpgme_get_fdptr(int);
-+
-+GIOChannel *GpgME::getGIOChannel(int)
-+{
-+ return 0;
-+}
-+
-+QIODevice *GpgME::getQIODevice(int fd)
-+{
-+ return gpgme_get_fdptr(fd);
-+}
-diff --git a/lang/cpp/src/context_vanilla.cpp b/lang/cpp/src/context_vanilla.cpp
-index 984d41b..77a488a 100644
---- a/lang/cpp/src/context_vanilla.cpp
-+++ b/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)
-diff --git a/lang/cpp/src/data.cpp b/lang/cpp/src/data.cpp
-index 9527b2f..84ed336 100644
---- a/lang/cpp/src/data.cpp
-+++ b/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>
-diff --git a/lang/cpp/src/decryptionresult.cpp b/lang/cpp/src/decryptionresult.cpp
-index 78a2b1b..f59d24c 100644
---- a/lang/cpp/src/decryptionresult.cpp
-+++ b/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"
-diff --git a/lang/cpp/src/defaultassuantransaction.cpp b/lang/cpp/src/defaultassuantransaction.cpp
-index 5bcf970..549092d 100644
---- a/lang/cpp/src/defaultassuantransaction.cpp
-+++ b/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"
-diff --git a/lang/cpp/src/editinteractor.cpp b/lang/cpp/src/editinteractor.cpp
-index 07dc26d..31591fa 100644
---- a/lang/cpp/src/editinteractor.cpp
-+++ b/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"
-diff --git a/lang/cpp/src/encryptionresult.cpp b/lang/cpp/src/encryptionresult.cpp
-index c4e7df5..b4298d7 100644
---- a/lang/cpp/src/encryptionresult.cpp
-+++ b/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"
-diff --git a/lang/cpp/src/engineinfo.cpp b/lang/cpp/src/engineinfo.cpp
-index c3b3e04..763aab9 100644
---- a/lang/cpp/src/engineinfo.cpp
-+++ b/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>
-diff --git a/lang/cpp/src/eventloopinteractor.cpp b/lang/cpp/src/eventloopinteractor.cpp
-index 7ec258c..7faa50c 100644
---- a/lang/cpp/src/eventloopinteractor.cpp
-+++ b/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>
-diff --git a/lang/cpp/src/exception.cpp b/lang/cpp/src/exception.cpp
-index c687024..cf42f91 100644
---- a/lang/cpp/src/exception.cpp
-+++ b/lang/cpp/src/exception.cpp
-@@ -21,6 +21,10 @@
- */
-
- // -*- c++ -*-
-+#ifdef HAVE_CONFIG_H
-+ #include "config.h"
-+#endif
-+
- #include "exception.h"
-
- #include <gpgme.h>
-diff --git a/lang/cpp/src/gpgadduserideditinteractor.cpp b/lang/cpp/src/gpgadduserideditinteractor.cpp
-index 43c8592..f7851a5 100644
---- a/lang/cpp/src/gpgadduserideditinteractor.cpp
-+++ b/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"
-diff --git a/lang/cpp/src/gpgagentgetinfoassuantransaction.cpp b/lang/cpp/src/gpgagentgetinfoassuantransaction.cpp
-index 4739aa2..4b30b31 100644
---- a/lang/cpp/src/gpgagentgetinfoassuantransaction.cpp
-+++ b/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"
-diff --git a/lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp b/lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp
-index 8af897c..5e8ba80 100644
---- a/lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp
-+++ b/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"
-
-diff --git a/lang/cpp/src/gpgsetownertrusteditinteractor.cpp b/lang/cpp/src/gpgsetownertrusteditinteractor.cpp
-index 15b1269..581605f 100644
---- a/lang/cpp/src/gpgsetownertrusteditinteractor.cpp
-+++ b/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"
-
-diff --git a/lang/cpp/src/gpgsignkeyeditinteractor.cpp b/lang/cpp/src/gpgsignkeyeditinteractor.cpp
-index fded90f..7effc64 100644
---- a/lang/cpp/src/gpgsignkeyeditinteractor.cpp
-+++ b/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"
-diff --git a/lang/cpp/src/importresult.cpp b/lang/cpp/src/importresult.cpp
-index 97e8239..4329fc0 100644
---- a/lang/cpp/src/importresult.cpp
-+++ b/lang/cpp/src/importresult.cpp
-@@ -21,6 +21,10 @@
- */
-
-
-+#ifdef HAVE_CONFIG_H
-+ #include "config.h"
-+#endif
-+
- #include <importresult.h>
- #include "result_p.h"
-
-diff --git a/lang/cpp/src/key.cpp b/lang/cpp/src/key.cpp
-index cfa1ba3..ea22862 100644
---- a/lang/cpp/src/key.cpp
-+++ b/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"
-diff --git a/lang/cpp/src/keygenerationresult.cpp b/lang/cpp/src/keygenerationresult.cpp
-index 7837e20..52d5222 100644
---- a/lang/cpp/src/keygenerationresult.cpp
-+++ b/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"
-
-diff --git a/lang/cpp/src/keylistresult.cpp b/lang/cpp/src/keylistresult.cpp
-index 4512d3b..e6fb77f 100644
---- a/lang/cpp/src/keylistresult.cpp
-+++ b/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"
-
-diff --git a/lang/cpp/src/scdgetinfoassuantransaction.cpp b/lang/cpp/src/scdgetinfoassuantransaction.cpp
-index 073d772..fb59bcc 100644
---- a/lang/cpp/src/scdgetinfoassuantransaction.cpp
-+++ b/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"
-diff --git a/lang/cpp/src/signingresult.cpp b/lang/cpp/src/signingresult.cpp
-index 4f2ef72..3252c03 100644
---- a/lang/cpp/src/signingresult.cpp
-+++ b/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"
-diff --git a/lang/cpp/src/tofuinfo.cpp b/lang/cpp/src/tofuinfo.cpp
-index bb67fc8..1372316 100644
---- a/lang/cpp/src/tofuinfo.cpp
-+++ b/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>
-diff --git a/lang/cpp/src/trustitem.cpp b/lang/cpp/src/trustitem.cpp
-index fc7e4a6..0565030 100644
---- a/lang/cpp/src/trustitem.cpp
-+++ b/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>
-diff --git a/lang/cpp/src/verificationresult.cpp b/lang/cpp/src/verificationresult.cpp
-index c62625d..be33ca2 100644
---- a/lang/cpp/src/verificationresult.cpp
-+++ b/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"
-diff --git a/lang/cpp/src/vfsmountresult.cpp b/lang/cpp/src/vfsmountresult.cpp
-index c9fdd5e..d3607d1 100644
---- a/lang/cpp/src/vfsmountresult.cpp
-+++ b/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"
-
-diff --git a/lang/qt/src/dataprovider.cpp b/lang/qt/src/dataprovider.cpp
-index 533b67d..df56133 100644
---- a/lang/qt/src/dataprovider.cpp
-+++ b/lang/qt/src/dataprovider.cpp
-@@ -21,6 +21,10 @@
-
- // -*- c++ -*-
-
-+#ifdef HAVE_CONFIG_H
-+ #include "config.h"
-+#endif
-+
- #include <dataprovider.h>
-
- #include <error.h>
-diff --git a/lang/qt/src/defaultkeygenerationjob.cpp b/lang/qt/src/defaultkeygenerationjob.cpp
-index 8257a72..d26e824 100644
---- a/lang/qt/src/defaultkeygenerationjob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/gpgme_backend_debug.cpp b/lang/qt/src/gpgme_backend_debug.cpp
-index 6dfb313..6efe932 100644
---- a/lang/qt/src/gpgme_backend_debug.cpp
-+++ b/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"
-
-
-diff --git a/lang/qt/src/job.cpp b/lang/qt/src/job.cpp
-index 8936ea5..38dbc99 100644
---- a/lang/qt/src/job.cpp
-+++ b/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"
-diff --git a/lang/qt/src/qgpgmeadduseridjob.cpp b/lang/qt/src/qgpgmeadduseridjob.cpp
-index eb3bfab..4fc80d1 100644
---- a/lang/qt/src/qgpgmeadduseridjob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/qgpgmebackend.cpp b/lang/qt/src/qgpgmebackend.cpp
-index 797e58a..f06244b 100644
---- a/lang/qt/src/qgpgmebackend.cpp
-+++ b/lang/qt/src/qgpgmebackend.cpp
-@@ -31,6 +31,10 @@
- your version.
- */
-
-+#ifdef HAVE_CONFIG_H
-+ #include "config.h"
-+#endif
-+
- #include "qgpgmebackend.h"
-
-
-diff --git a/lang/qt/src/qgpgmechangeexpiryjob.cpp b/lang/qt/src/qgpgmechangeexpiryjob.cpp
-index 43ceee3..cf417ab 100644
---- a/lang/qt/src/qgpgmechangeexpiryjob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/qgpgmechangeownertrustjob.cpp b/lang/qt/src/qgpgmechangeownertrustjob.cpp
-index 55131d9..d9a613f 100644
---- a/lang/qt/src/qgpgmechangeownertrustjob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/qgpgmechangepasswdjob.cpp b/lang/qt/src/qgpgmechangepasswdjob.cpp
-index 0aec927..b04273c 100644
---- a/lang/qt/src/qgpgmechangepasswdjob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/qgpgmedecryptjob.cpp b/lang/qt/src/qgpgmedecryptjob.cpp
-index 7116449..449e9aa 100644
---- a/lang/qt/src/qgpgmedecryptjob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/qgpgmedecryptverifyjob.cpp b/lang/qt/src/qgpgmedecryptverifyjob.cpp
-index d46a9b5..e6d3ff2 100644
---- a/lang/qt/src/qgpgmedecryptverifyjob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/qgpgmedeletejob.cpp b/lang/qt/src/qgpgmedeletejob.cpp
-index 323aec4..9145298 100644
---- a/lang/qt/src/qgpgmedeletejob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/qgpgmedownloadjob.cpp b/lang/qt/src/qgpgmedownloadjob.cpp
-index 48cc907..b0dca56 100644
---- a/lang/qt/src/qgpgmedownloadjob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/qgpgmeencryptjob.cpp b/lang/qt/src/qgpgmeencryptjob.cpp
-index 82c8ed8..d13acab 100644
---- a/lang/qt/src/qgpgmeencryptjob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/qgpgmeexportjob.cpp b/lang/qt/src/qgpgmeexportjob.cpp
-index dfc5fc9..e6073f0 100644
---- a/lang/qt/src/qgpgmeexportjob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp b/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp
-index 0f19679..acefbb2 100644
---- a/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/qgpgmeimportjob.cpp b/lang/qt/src/qgpgmeimportjob.cpp
-index f125b12..dcabad3 100644
---- a/lang/qt/src/qgpgmeimportjob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/qgpgmekeyformailboxjob.cpp b/lang/qt/src/qgpgmekeyformailboxjob.cpp
-index 803d0e6..7054c78 100644
---- a/lang/qt/src/qgpgmekeyformailboxjob.cpp
-+++ b/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"
-
-diff --git a/lang/qt/src/qgpgmekeygenerationjob.cpp b/lang/qt/src/qgpgmekeygenerationjob.cpp
-index cba6b76..31f3342 100644
---- a/lang/qt/src/qgpgmekeygenerationjob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/qgpgmekeylistjob.cpp b/lang/qt/src/qgpgmekeylistjob.cpp
-index 1169c46..887a902 100644
---- a/lang/qt/src/qgpgmekeylistjob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/qgpgmelistallkeysjob.cpp b/lang/qt/src/qgpgmelistallkeysjob.cpp
-index fd8bfc3..7ba8bc9 100644
---- a/lang/qt/src/qgpgmelistallkeysjob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/qgpgmenewcryptoconfig.cpp b/lang/qt/src/qgpgmenewcryptoconfig.cpp
-index 7303f10..62566d5 100644
---- a/lang/qt/src/qgpgmenewcryptoconfig.cpp
-+++ b/lang/qt/src/qgpgmenewcryptoconfig.cpp
-@@ -31,6 +31,10 @@
- your version.
- */
-
-+#ifdef HAVE_CONFIG_H
-+ #include "config.h"
-+#endif
-+
- #include "qgpgmenewcryptoconfig.h"
-
- #include <QDebug>
-diff --git a/lang/qt/src/qgpgmerefreshkeysjob.cpp b/lang/qt/src/qgpgmerefreshkeysjob.cpp
-index 3d221f6..93ac63a 100644
---- a/lang/qt/src/qgpgmerefreshkeysjob.cpp
-+++ b/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>
-diff --git a/lang/qt/src/qgpgmesecretkeyexportjob.cpp b/lang/qt/src/qgpgmesecretkeyexportjob.cpp
-index f4ec698..d740852 100644
---- a/lang/qt/src/qgpgmesecretkeyexportjob.cpp
-+++ b/lang/qt/src/qgpgmesecretkeyexportjob.cpp
-@@ -31,6 +31,10 @@
- your version.
- */
-
-+#ifdef HAVE_CONFIG_H
-+ #include "config.h"
-+#endif
-+
- #include "qgpgmesecretkeyexportjob.h"
-
- #include <QDebug>
-diff --git a/lang/qt/src/qgpgmesignencryptjob.cpp b/lang/qt/src/qgpgmesignencryptjob.cpp
-index d2e45b1..9dcc619 100644
---- a/lang/qt/src/qgpgmesignencryptjob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/qgpgmesignjob.cpp b/lang/qt/src/qgpgmesignjob.cpp
-index 4e2312b..e165f52 100644
---- a/lang/qt/src/qgpgmesignjob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/qgpgmesignkeyjob.cpp b/lang/qt/src/qgpgmesignkeyjob.cpp
-index e6c1478..27aff5e 100644
---- a/lang/qt/src/qgpgmesignkeyjob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/qgpgmetofupolicyjob.cpp b/lang/qt/src/qgpgmetofupolicyjob.cpp
-index a24c946..34630a1 100644
---- a/lang/qt/src/qgpgmetofupolicyjob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/qgpgmeverifydetachedjob.cpp b/lang/qt/src/qgpgmeverifydetachedjob.cpp
-index 8efef05..ee74861 100644
---- a/lang/qt/src/qgpgmeverifydetachedjob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/qgpgmeverifyopaquejob.cpp b/lang/qt/src/qgpgmeverifyopaquejob.cpp
-index b513f82..aea406a 100644
---- a/lang/qt/src/qgpgmeverifyopaquejob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/qgpgmewkspublishjob.cpp b/lang/qt/src/qgpgmewkspublishjob.cpp
-index 8f97cb5..96f5a1d 100644
---- a/lang/qt/src/qgpgmewkspublishjob.cpp
-+++ b/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"
-diff --git a/lang/qt/src/threadedjobmixin.cpp b/lang/qt/src/threadedjobmixin.cpp
-index cd6ab5f..66d21fb 100644
---- a/lang/qt/src/threadedjobmixin.cpp
-+++ b/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"
-diff --git a/lang/qt/tests/run-keyformailboxjob.cpp b/lang/qt/tests/run-keyformailboxjob.cpp
-index 9ac7668..73bedbd 100644
---- a/lang/qt/tests/run-keyformailboxjob.cpp
-+++ b/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"
-diff --git a/lang/qt/tests/t-encrypt.cpp b/lang/qt/tests/t-encrypt.cpp
-index 3d4cfa9..bc6b878 100644
---- a/lang/qt/tests/t-encrypt.cpp
-+++ b/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>
-diff --git a/lang/qt/tests/t-keylist.cpp b/lang/qt/tests/t-keylist.cpp
-index 767c96b..2578576 100644
---- a/lang/qt/tests/t-keylist.cpp
-+++ b/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>
-diff --git a/lang/qt/tests/t-keylocate.cpp b/lang/qt/tests/t-keylocate.cpp
-index e75f24d..63cb836 100644
---- a/lang/qt/tests/t-keylocate.cpp
-+++ b/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>
-diff --git a/lang/qt/tests/t-ownertrust.cpp b/lang/qt/tests/t-ownertrust.cpp
-index b9efffd..db863b2 100644
---- a/lang/qt/tests/t-ownertrust.cpp
-+++ b/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>
-diff --git a/lang/qt/tests/t-support.cpp b/lang/qt/tests/t-support.cpp
-index 86372f7..857d0a3 100644
---- a/lang/qt/tests/t-support.cpp
-+++ b/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>
-diff --git a/lang/qt/tests/t-tofuinfo.cpp b/lang/qt/tests/t-tofuinfo.cpp
-index d76ff7b..2c87e4a 100644
---- a/lang/qt/tests/t-tofuinfo.cpp
-+++ b/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>
-diff --git a/lang/qt/tests/t-wkspublish.cpp b/lang/qt/tests/t-wkspublish.cpp
-index 17d3447..4558fdc 100644
---- a/lang/qt/tests/t-wkspublish.cpp
-+++ b/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>
diff --git a/debian/patches/series b/debian/patches/series
index 9d1077a..a45150a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,14 +1 @@
0001-avoid-identifying-as-beta.patch
-0007-make-documentation-reproducible-by-omitting-HTML_TIM.patch
-0002-doc-Fix-minor-errors-in-I-O-callback-example.patch
-0003-tests-Fix-select-usage-in-t-eventloop.patch
-0004-gpg-Add-option-exit-on-status-write-error.patch
-0005-tests-Add-test-for-cancellation.patch
-0006-install-cmake-files-without-executable-bit-set.patch
-0008-python-Include-config.h.patch
-0009-python-Correctly-translate-off_t.patch
-0010-python-Correctly-translate-to-size_t.patch
-0011-python-Get-rid-of-the-last-C-style-comments.patch
-0012-core-New-helper-function-_gpgme_strconcat.patch
-0013-core-Fix-error-checking-in-_gpgme_mkstemp.patch
-0014-cpp-qt-Include-config.h.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git
More information about the Pkg-gnupg-commit
mailing list