[git] GPGME - branch, master, updated. gpgme-1.10.0-157-geee68c1

[by Werner Koch]

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  eee68c1b13fbe21c123f469712817e0c81f16383 (commit)
      from  c7bb12da5297a7e188766d9759f700dd771faff8 (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 eee68c1b13fbe21c123f469712817e0c81f16383
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Mar 23 12:36:19 2018 +0100

    build: Allow building with released libgpg-error.
    
    * src/gpgme-json.c (add_base64_to_object): Return an error if building
    with an older libgpg-error.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/gpgme-json.c b/src/gpgme-json.c
index 6ba79e5..09b34bb 100644
--- a/src/gpgme-json.c
+++ b/src/gpgme-json.c
@@ -147,6 +147,9 @@ xjson_AddBoolToObject (cjson_t object, const char *name, int abool)
 static gpg_error_t
 add_base64_to_object (cjson_t object, const char *name, gpgme_data_t data)
 {
+#if GPGRT_VERSION_NUMBER < 0x011d00 /* 1.29 */
+  return gpg_error (GPG_ERR_NOT_SUPPORTED);
+#else
   gpg_err_code_t err;
   estream_t fp = NULL;
   gpgrt_b64state_t state = NULL;
@@ -220,6 +223,7 @@ add_base64_to_object (cjson_t object, const char *name, gpgme_data_t data)
   es_fclose (fp);
   gpgme_data_release (data);
   return err;
+#endif
 }
 
 

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

Summary of changes:
 src/gpgme-json.c | 4 ++++
 1 file changed, 4 insertions(+)


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