From 466cedff6cdf7d21613adf2cc248935e64bafa31 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 6 Jul 2025 14:02:39 +0300
Subject: [PATCH] pinentry: update gettext 0.25 fixes to also apply to Linux

---
 pkgs/tools/security/pinentry/default.nix      |  5 ++++-
 .../security/pinentry/gettext-0.25.patch      | 20 +++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
index 6845cb59c785..b8eaca0fe86c 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/pkgs/tools/security/pinentry/default.nix
@@ -91,7 +91,10 @@ let
       dontWrapQtApps = true;
 
       patches =
-        [ ./autoconf-ar.patch ]
+        [
+          ./autoconf-ar.patch
+          ./gettext-0.25.patch
+        ]
         ++ lib.optionals (lib.elem "gtk2" buildFlavors) [
           (fetchpatch {
             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";
diff --git a/pkgs/tools/security/pinentry/gettext-0.25.patch b/pkgs/tools/security/pinentry/gettext-0.25.patch
index b686d960f4c5..d38289950b2f 100644
--- a/pkgs/tools/security/pinentry/gettext-0.25.patch
+++ b/pkgs/tools/security/pinentry/gettext-0.25.patch
@@ -1,13 +1,29 @@
 diff --git a/configure.ac b/configure.ac
-index 1b3ded6..0b78e69 100644
+index 2a9f5d2..a3d9b79 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -358,6 +358,8 @@ if test "$pinentry_tty" = "yes"; then
+@@ -45,6 +45,7 @@ m4_esyscmd([echo ]mym4_version[>VERSION])
+ 
+ AC_INIT([mym4_package],[mym4_version],[https://bugs.gnupg.org])
+ 
++AC_CONFIG_MACRO_DIRS([m4])
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_SRCDIR(pinentry/pinentry.h)
+@@ -329,13 +330,15 @@ if test "$pinentry_tty" = "yes"; then
             [The TTY version of Pinentry is to be build])
  fi
  
 +AM_GNU_GETTEXT_VERSION([0.21])
 +AM_GNU_GETTEXT([external])
++AM_ICONV
  
  dnl
  dnl Additional checks pinentry Curses.
+ dnl
+ if test "$pinentry_curses" = "yes" \
+         -o "$fallback_curses" = "yes" ; then
+-  AM_ICONV
+   if test "$am_cv_func_iconv" != "yes"; then
+     AC_MSG_ERROR([[
+ ***