[git] GPGME - branch, master, updated. gpgme-1.6.0-201-g4934893

[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  4934893e27a50f5715dcd4d2907ecbe629921b32 (commit)
       via  7a8c04f66d382dc49d962ad18c46d7ad332ccc0f (commit)
      from  49a6ee50587c9d4b6f07e60ce1a939c863e7f15c (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 4934893e27a50f5715dcd4d2907ecbe629921b32
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Jul 6 11:28:11 2016 +0200

    Qt: Fix include order when buildin test
    
    * lang/qt/tests/Makefile.am (AM_CPPFLAGS): Include cpp before
    gpgme src directory.
    
    --
    This fixes a problem where context.h would be picked up from gpgme/src
    instead of including the context.h from gpgme++.

diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index c228000..379abb3 100644
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@@ -34,10 +34,10 @@ LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgme.la \
         ../../../src/libgpgme.la @GPGME_QT_LIBS@ @GPG_ERROR_LIBS@ \
         @GPGME_QTTEST_LIBS@ -lstdc++
 
-AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@ \
-              @GPGME_QT_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \
-              @GPGME_QTTEST_CFLAGS@ -DBUILDING_QGPGME \
-              -I$(top_srcdir)/lang/cpp/src -I$(top_srcdir)/lang/qt/src \
+AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \
+              @GPG_ERROR_CFLAGS@ @GPGME_QT_CFLAGS@ @GPG_ERROR_CFLAGS@ \
+              @LIBASSUAN_CFLAGS@ @GPGME_QTTEST_CFLAGS@ -DBUILDING_QGPGME \
+              -I$(top_srcdir)/lang/qt/src \
               -DTOP_SRCDIR="$(top_srcdir)"
 
 check-local: ./pubring-stamp

commit 7a8c04f66d382dc49d962ad18c46d7ad332ccc0f
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Jul 6 11:22:10 2016 +0200

    Revert "Qt: More robust lookup of Cpp's context.h"
    
    * lang/qt/src/threadedjobmixin.h: Revert using full path
    for context.h
    
    --
    This reverts commit 47bfbc9026b49b9918359af5fcc1621aab0d1065 as
    it causes problems depending on the include path. The proper
    fix will be to ensure that cpp/src is included before gpgme/src.

diff --git a/lang/qt/src/threadedjobmixin.h b/lang/qt/src/threadedjobmixin.h
index b29b827..62d7f1c 100644
--- a/lang/qt/src/threadedjobmixin.h
+++ b/lang/qt/src/threadedjobmixin.h
@@ -41,7 +41,7 @@
 #include <QIODevice>
 
 #ifdef BUILDING_QGPGME
-# include "lang/cpp/src/context.h"
+# include "context.h"
 # include "interfaces/progressprovider.h"
 #else
 # include <gpgme++/context.h>

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

Summary of changes:
 lang/qt/src/threadedjobmixin.h | 2 +-
 lang/qt/tests/Makefile.am      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)


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