pyrox.dev
lol
pinentry: update gettext 0.25 fixes to also apply to Linux
+22
-3
+4
-1
pkgs/tools/security/pinentry/default.nix
+4
-1
pkgs/tools/security/pinentry/default.nix
···
91
91
dontWrapQtApps = true;
92
92
93
93
patches =
94
-
[ ./autoconf-ar.patch ]
94
+
[
95
+
./autoconf-ar.patch
96
+
./gettext-0.25.patch
97
+
]
95
98
++ lib.optionals (lib.elem "gtk2" buildFlavors) [
96
99
(fetchpatch {
97
100
url = "https://salsa.debian.org/debian/pinentry/raw/debian/1.1.0-1/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch";
+18
-2
pkgs/tools/security/pinentry/gettext-0.25.patch
+18
-2
pkgs/tools/security/pinentry/gettext-0.25.patch
···
1
1
diff --git a/configure.ac b/configure.ac
2
-
index 1b3ded6..0b78e69 100644
2
+
index 2a9f5d2..a3d9b79 100644
3
3
--- a/configure.ac
4
4
+++ b/configure.ac
5
-
@@ -358,6 +358,8 @@ if test "$pinentry_tty" = "yes"; then
5
+
@@ -45,6 +45,7 @@ m4_esyscmd([echo ]mym4_version[>VERSION])
6
+
7
+
AC_INIT([mym4_package],[mym4_version],[https://bugs.gnupg.org])
8
+
9
+
+AC_CONFIG_MACRO_DIRS([m4])
10
+
AC_CONFIG_AUX_DIR([build-aux])
11
+
AC_CONFIG_HEADERS([config.h])
12
+
AC_CONFIG_SRCDIR(pinentry/pinentry.h)
13
+
@@ -329,13 +330,15 @@ if test "$pinentry_tty" = "yes"; then
6
14
[The TTY version of Pinentry is to be build])
7
15
fi
8
16
9
17
+AM_GNU_GETTEXT_VERSION([0.21])
10
18
+AM_GNU_GETTEXT([external])
19
+
+AM_ICONV
11
20
12
21
dnl
13
22
dnl Additional checks pinentry Curses.
23
+
dnl
24
+
if test "$pinentry_curses" = "yes" \
25
+
-o "$fallback_curses" = "yes" ; then
26
+
- AM_ICONV
27
+
if test "$am_cv_func_iconv" != "yes"; then
28
+
AC_MSG_ERROR([[
29
+
***