mirror of
https://github.com/void-linux/void-packages.git
synced 2025-04-22 17:17:03 +02:00
libcryptui: fix build with gpg 2.4
This commit is contained in:
parent
4dfec0707c
commit
a7006e880c
3 changed files with 11 additions and 50 deletions
|
@ -1,25 +0,0 @@
|
|||
From 183d7619c29482a5d4ae8019692899f87f198171 Mon Sep 17 00:00:00 2001
|
||||
From: Antoine Jacoutot <ajacoutot@gnome.org>
|
||||
Date: Sat, 17 Oct 2015 08:52:35 +0200
|
||||
Subject: Allow building with gnupg 2.1.
|
||||
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 406b9f3..b621b23 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.1 2.2"
|
||||
AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
|
||||
AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
|
||||
ok="no"
|
||||
--
|
||||
cgit v0.12
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From fa3b8fd3b55768e0e02b30948c29a9504d02522e Mon Sep 17 00:00:00 2001
|
||||
From: Dominique Leuenberger <dimstar@opensuse.org>
|
||||
Date: Tue, 31 Aug 2021 13:46:10 +0000
|
||||
Subject: [PATCH] Accept GnuPG 2.3.x as supported version
|
||||
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index be5b28b4..12df80ad 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 2.1 2.2"
|
||||
+ accepted_versions="1.2 1.4 2.0 2.1 2.2 2.3"
|
||||
AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
|
||||
AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
|
||||
ok="no"
|
||||
--
|
||||
GitLab
|
||||
|
11
srcpkgs/libcryptui/patches/support-new-gpg-versions.patch
Normal file
11
srcpkgs/libcryptui/patches/support-new-gpg-versions.patch
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- 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.1 2.2 2.3 2.4"
|
||||
AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
|
||||
AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
|
||||
ok="no"
|
Loading…
Add table
Reference in a new issue