646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
27 lines
769 B
Diff
27 lines
769 B
Diff
From b05e301d1b264a5d8f07cb96e5edc243d99bff79 Mon Sep 17 00:00:00 2001
|
|
From: Antoine Jacoutot <ajacoutot@gnome.org>
|
|
Date: Fri, 10 Nov 2017 08:55:55 +0100
|
|
Subject: [PATCH] Accept GnuPG 2.2.x as supported version
|
|
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=790152
|
|
---
|
|
configure.ac | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 4486e7b2..be5b28b4 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check,
|
|
DO_CHECK=$enableval, DO_CHECK=yes)
|
|
|
|
if test "$DO_CHECK" = "yes"; then
|
|
- accepted_versions="1.2 1.4 2.0"
|
|
+ accepted_versions="1.2 1.4 2.0 2.2 2.3 2.4"
|
|
AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
|
|
AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
|
|
ok="no"
|
|
--
|
|
GitLab
|
|
|