[git] GPGME - branch, master, updated. gpgme-1.6.0-321-g8a39a59

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  8a39a595eb802b80a6ad756b0ee8939e9733e86f (commit)
       via  e3a4697894cc5a93c295e84bb10c743bc7fdc87e (commit)
      from  05570bd3d05fb3d7934c1122f0d5ef5fdbaa7974 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8a39a595eb802b80a6ad756b0ee8939e9733e86f
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Sep 5 10:44:41 2016 +0200

    qt: Add missing header redirection
    
    * lang/qt/src/keyformailboxjob.h,
    lang/qt/src/qgpgmekeyformailboxjob.h: Fix includes.
    
    --
    This ensures that when building qgpgme you do not need an installed
    gpgme++.

diff --git a/lang/qt/src/keyformailboxjob.h b/lang/qt/src/keyformailboxjob.h
index 9e76df5..d8b6c6b 100644
--- a/lang/qt/src/keyformailboxjob.h
+++ b/lang/qt/src/keyformailboxjob.h
@@ -36,7 +36,12 @@
 
 #include "job.h"
 
-#include <gpgme++/key.h>
+#ifdef BUILDING_QGPGME
+# include "key.h"
+#else
+# include <gpgme++/key.h>
+#endif
+
 namespace GpgME
 {
 class Error;
diff --git a/lang/qt/src/qgpgmekeyformailboxjob.h b/lang/qt/src/qgpgmekeyformailboxjob.h
index 02a16d3..8ac2c1f 100644
--- a/lang/qt/src/qgpgmekeyformailboxjob.h
+++ b/lang/qt/src/qgpgmekeyformailboxjob.h
@@ -38,8 +38,13 @@
 
 #include "threadedjobmixin.h"
 
-#include <gpgme++/keylistresult.h>
-#include <gpgme++/key.h>
+#ifdef BUILDING_QGPGME
+# include "keylistresult.h"
+# include "key.h"
+#else
+# include <gpgme++/keylistresult.h>
+# include <gpgme++/key.h>
+#endif
 
 namespace QGpgME
 {

commit e3a4697894cc5a93c295e84bb10c743bc7fdc87e
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Sep 5 10:42:02 2016 +0200

    qt: Include cpp before core directory
    
    * lang/qt/src/Makefile.am (AM_CPPFLAGS): Include cpp before core.
    
    --
    Both core and cpp have headers that have the same names, this
    can lead to the wrong headers beeing included when qt bindings
    are built.

diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am
index 59206ed..f63b295 100644
--- a/lang/qt/src/Makefile.am
+++ b/lang/qt/src/Makefile.am
@@ -199,7 +199,7 @@ nodist_include_HEADERS = qgpgme_version.h
 
 libqgpgme_la_SOURCES = $(qgpgme_sources) $(qgpgme_headers) $(private_qgpgme_headers)
 
-AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/lang/cpp/src \
+AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \
               @GPGME_QT_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \
               -DBUILDING_QGPGME
 

-----------------------------------------------------------------------

Summary of changes:
 lang/qt/src/Makefile.am              | 2 +-
 lang/qt/src/keyformailboxjob.h       | 7 ++++++-
 lang/qt/src/qgpgmekeyformailboxjob.h | 9 +++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org