From bd0960cda8a66b843035935c7caa9f20b38b4d0d Mon Sep 17 00:00:00 2001
From: Bernhard Kaindl <43588962+bernhardkaindl@users.noreply.github.com>
Date: Mon, 29 Nov 2021 16:43:12 +0100
Subject: gpgme: Add 0.16.0 and address test suite issues (#27604)

A part of the gpgme testsuite by default even runs during normal
make and make install phases, creating a public keyring in ~/.gnupg.
Prevent this and avoid build failures in containers due to another
problem of the test suite and fix a test case of the new 0.16.0 release.
---
 var/spack/repos/builtin/packages/gpgme/package.py | 31 ++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/var/spack/repos/builtin/packages/gpgme/package.py b/var/spack/repos/builtin/packages/gpgme/package.py
index 7d0695cc28..8522c04552 100644
--- a/var/spack/repos/builtin/packages/gpgme/package.py
+++ b/var/spack/repos/builtin/packages/gpgme/package.py
@@ -11,12 +11,20 @@ class Gpgme(AutotoolsPackage):
        functions from programming languages."""
 
     homepage = "https://www.gnupg.org/software/gpgme/index.html"
-    url      = "https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.12.0.tar.bz2"
+    url      = "https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.16.0.tar.bz2"
 
     executables = ['^gpgme-config$']
 
+    version('1.16.0', sha256='6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0')
     version('1.12.0', sha256='b4dc951c3743a60e2e120a77892e9e864fb936b2e58e7c77e8581f4d050e8cd8')
 
+    # https://dev.gnupg.org/T5509 - New test t-edit-sign test crashes with GCC 11.1.0
+    patch(
+        'https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=81a33ea5e1b86d586b956e893a5b25c4cd41c969;hp=e8e055e682f8994d62012574e1c8d862ca72a35d',
+        sha256='b934e3cb0b3408ad27990d97b594c89801a4748294e2eb5804a455a312821411',
+        when='@1.16.0',
+    )
+
     depends_on('gnupg', type='build')
     depends_on('libgpg-error', type='build')
     depends_on('libassuan', type='build')
@@ -24,3 +32,24 @@ class Gpgme(AutotoolsPackage):
     @classmethod
     def determine_version(cls, exe):
         return Executable(exe)('--version', output=str, error=str).rstrip()
+
+    def configure_args(self):
+        """Fix the build when incompatible Qt libraries are installed on the host"""
+        return ['--enable-languages=cpp']
+
+    def setup_build_environment(self, env):
+        """Build tests create a public keyring in ~/.gnupg if $HOME is not redirected"""
+        if self.run_tests:
+            env.set('HOME', self.build_directory)
+            env.prepend_path('LD_LIBRARY_PATH', self.spec['libgpg-error'].prefix.lib)
+
+    @property
+    def make_tests(self):
+        """Use the Makefile's tests variable to control if the build tests shall run"""
+        return 'tests=tests' if self.run_tests else 'tests='
+
+    def build(self, spec, prefix):
+        make(self.make_tests)
+
+    def install(self, spec, prefix):
+        make(self.make_tests, 'install')
-- 
cgit v1.2.3-70-g09d2