From fdb30d5d23da14397b941e2d4d6ecda6f5475b5b Mon Sep 17 00:00:00 2001
From: kth5 <alex.bldck@gmail.com>
Date: Mon, 3 Feb 2025 23:38:04 +0100
Subject: [PATCH] * update gettext to 0.23.1-2

---
 gettext/.SRCINFO                   | 15 ++++++++-------
 gettext/PKGBUILD                   | 21 +++++++++------------
 gettext/gettext-0.23-libxml2.patch | 25 -------------------------
 3 files changed, 17 insertions(+), 44 deletions(-)
 delete mode 100644 gettext/gettext-0.23-libxml2.patch

diff --git a/gettext/.SRCINFO b/gettext/.SRCINFO
index 748a5466f0..7b03169f93 100644
--- a/gettext/.SRCINFO
+++ b/gettext/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gettext
 	pkgdesc = GNU internationalization library
-	pkgver = 0.23
-	pkgrel = 1
+	pkgver = 0.23.1
+	pkgrel = 2
 	url = https://www.gnu.org/software/gettext/
 	arch = x86_64
 	arch = powerpc64le
@@ -15,20 +15,21 @@ pkgbase = gettext
 	license = LGPL-2.0-only
 	makedepends = emacs
 	depends = acl
+	depends = attr
 	depends = gcc-libs
+	depends = gnulib-l10n
 	depends = libunistring
 	depends = libxml2
+	depends = ncurses
 	depends = sh
 	optdepends = git: for autopoint infrastructure updates
 	options = !docs
-	source = https://ftp.gnu.org/pub/gnu/gettext/gettext-0.23.tar.gz
-	source = https://ftp.gnu.org/pub/gnu/gettext/gettext-0.23.tar.gz.sig
-	source = gettext-0.23-libxml2.patch
+	source = https://ftp.gnu.org/pub/gnu/gettext/gettext-0.23.1.tar.gz
+	source = https://ftp.gnu.org/pub/gnu/gettext/gettext-0.23.1.tar.gz.sig
 	validpgpkeys = 462225C3B46F34879FC8496CD605848ED7E69871
 	validpgpkeys = 68D94D8AAEEAD48AE7DC5B904F494A942E4616C2
 	validpgpkeys = 9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D
-	b2sums = 32828852ff105c66d4034f8a689f3e2a007b8770daa72f7f99fec3fb5ee2be7a930fb534389edf59436c8f41b98122efab24931d0e8bea3a903d24b4d9a34bfb
+	b2sums = c5c5b857b945aef24be45e855d0bfdeb717135eb4a3d1ecc48db2df4c31e32b20f6c5f9730a11c36b8e8f3246073751eeaef1f6a97a066ee2c324217426e52c4
 	b2sums = SKIP
-	b2sums = c93e039ac8fd150a2d210343886cdaa13308af091ed9f97b93d4137c52d51e84ec32f78961b1ee5a100f2e7f4c61ef47c7ad9282e28a406a89d11ef18c57510b
 
 pkgname = gettext
diff --git a/gettext/PKGBUILD b/gettext/PKGBUILD
index 4779ebc0fc..09fc4b8c4f 100644
--- a/gettext/PKGBUILD
+++ b/gettext/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=gettext
-pkgver=0.23
-pkgrel=1
+pkgver=0.23.1
+pkgrel=2
 pkgdesc="GNU internationalization library"
 url="https://www.gnu.org/software/gettext/"
 arch=(x86_64 powerpc64le powerpc64 powerpc espresso riscv64)
@@ -15,9 +15,12 @@ license=(
 )
 depends=(
   acl
+  attr
   gcc-libs
+  gnulib-l10n
   libunistring
   libxml2
+  ncurses
   sh
 )
 makedepends=(
@@ -27,24 +30,18 @@ optdepends=('git: for autopoint infrastructure updates')
 options=(!docs)
 source=(
   https://ftp.gnu.org/pub/gnu/gettext/$pkgname-$pkgver.tar.gz{,.sig}
-  gettext-0.23-libxml2.patch
-  )
-b2sums=('32828852ff105c66d4034f8a689f3e2a007b8770daa72f7f99fec3fb5ee2be7a930fb534389edf59436c8f41b98122efab24931d0e8bea3a903d24b4d9a34bfb'
-        'SKIP'
-        'c93e039ac8fd150a2d210343886cdaa13308af091ed9f97b93d4137c52d51e84ec32f78961b1ee5a100f2e7f4c61ef47c7ad9282e28a406a89d11ef18c57510b')
+)
+b2sums=('c5c5b857b945aef24be45e855d0bfdeb717135eb4a3d1ecc48db2df4c31e32b20f6c5f9730a11c36b8e8f3246073751eeaef1f6a97a066ee2c324217426e52c4'
+        'SKIP')
 validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871'  # Daiki Ueno
               '68D94D8AAEEAD48AE7DC5B904F494A942E4616C2'
               '9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D') # Bruno Haible (Open Source Development)
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -Np1 -i ../gettext-0.23-libxml2.patch
-}
-
 build() {
   cd ${pkgname}-${pkgver}
   ./configure \
     --prefix=/usr \
+    --libexecdir=/usr/lib \
     --enable-csharp \
     --enable-nls \
     --with-xz \
diff --git a/gettext/gettext-0.23-libxml2.patch b/gettext/gettext-0.23-libxml2.patch
deleted file mode 100644
index 21e6589ad3..0000000000
--- a/gettext/gettext-0.23-libxml2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur gettext-0.23.orig/gettext-tools/src/its.c gettext-0.23/gettext-tools/src/its.c
---- gettext-0.23.orig/gettext-tools/src/its.c	2024-10-13 16:14:36.000000000 +0530
-+++ gettext-0.23/gettext-tools/src/its.c	2024-12-05 23:24:03.100545103 +0530
-@@ -28,6 +28,7 @@
- #include <stdint.h>
- #include <stdlib.h>
- 
-+#include <libxml/xmlversion.h>
- #include <libxml/xmlerror.h>
- #include <libxml/tree.h>
- #include <libxml/parser.h>
-@@ -82,7 +83,13 @@
- /* ----------------------------- Error handling ----------------------------- */
- 
- static void
-+/* Adapt to API change in libxml 2.12.0.
-++   See <https://gitlab.gnome.org/GNOME/libxml2/-/issues/622>.  */
-+#if LIBXML_VERSION >= 21200
-+structured_error (void *data, const xmlError *err)
-+#else
- structured_error (void *data, xmlError *err)
-+#endif
- {
-   error (0, err->level == XML_ERR_FATAL ? EXIT_FAILURE : 0,
-          _("%s error: %s"), "libxml2", err->message);