[git] GPGME - branch, master, updated. gpgme-1.12.0-18-g9de1c96

[by Daniel Kahn Gillmor]

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  9de1c96ac3cf6fa126325002b61a1b606037ca88 (commit)
      from  12b0b5c8941b4ef9ec06002c868ba2bc09216674 (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 9de1c96ac3cf6fa126325002b61a1b606037ca88
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Oct 17 22:23:59 2018 -0400

    python: do not export HAVE_CXX11 definition
    
    * lang/python/gpgme.i: ignore HAVE_CXX11 in SWIG interface
    
    --
    
    If there are two distinct builds (a) and (b) of gpgme which both build
    python bindings, and build (a) also happens to build the C++ bindings,
    then the generated gpg/gpgme.py file from build (a) will not be usable
    with the .so generated in build (b), despite them being exactly the
    same, and having nothing to do with C++.
    
    In particular, it will fail with:
    
    -----------
      File "…/gpg/__init__.py", line 99, in <module>
        from . import core
      File "…/gpg/core.py", line 10, in <module>
        from . import gpgme
      File "…/gpg/gpgme.py", line 152, in <module>
        HAVE_CXX11 = _gpgme.HAVE_CXX11
    AttributeError: module 'gpg._gpgme' has no attribute 'HAVE_CXX11'
    -----------
    
    By asking SWIG to ignore this definition, we stabilize the generated
    .py and the .so, ensuring that they are more cleanly interoperable.

diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i
index f3d14a7..87371af 100644
--- a/lang/python/gpgme.i
+++ b/lang/python/gpgme.i
@@ -21,6 +21,10 @@
 %include "cpointer.i"
 %include "cstring.i"
 
+/* no need to record whether GPGME's c++ bindings were built
+   concurrently with the python bindings */
+%ignore HAVE_CXX11;
+
 %{
 /* We use public symbols (eg. "_obsolete_class") which are marked as
  * deprecated but we need to keep them.  Silence the warning.  */

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

Summary of changes:
 lang/python/gpgme.i | 4 ++++
 1 file changed, 4 insertions(+)


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