5 files changed, 109 insertions, 1 deletions
diff --git a/packages/gettext/0.20.1/0002-tparam-configure-fix.patch b/packages/gettext/0.20.1/0002-tparam-configure-fix.patch
new file mode 100644
index 00000000..331808e5
--- /dev/null
+++ b/packages/gettext/0.20.1/0002-tparam-configure-fix.patch
@@ -0,0 +1,49 @@
+[PATCH] tparam configure fix
+
+With a newer compiler the configure check for tparam/tparm fails with
+
+conftest.c: In function 'main':
+conftest.c:95:8: error: returning 'char *' from a function with return type 'int' makes integer from pointer without a cast [-Wint-conversion]
+   95 | return tparam ("\033\133%dm", &buf, 1, 8);
+      |        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+configure:23675: $? = 1
+conftest.c: In function 'main':
+conftest.c:94:8: error: returning 'char *' from a function with return type 'int' makes integer from pointer without a cast [-Wint-conversion]
+   94 | return tparm ("\033\133%dm", 8);
+      |        ^~~~~~~~~~~~~~~~~~~~~~~~
+configure:23719: $? = 1
+
+This causes libtextstyle to backfill these two functions from gnulib which
+eventually causes a link error
+
+ld.bfd: buildtools/complibs-host/lib/libncurses.a(lib_tparm.o): in function `tparm':
+src/ncurses/ncurses/tinfo/lib_tparm.c:1093: multiple definition of `tparm'; ../lib/.libs/libtextstyle.a(tparm.o):src/gettext/libtextstyle/lib/tparm.c:256: first defined here
+
+Update the configure check to something that will correctly determine if
+tparam/tparm need to be back-filled.
+
+Signed-off-by: Chris Packham <judge.packham@gmail.com>
+---
+ libtextstyle/configure |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/libtextstyle/configure
++++ b/libtextstyle/configure
+@@ -23667,7 +23667,7 @@
+ int
+ main ()
+ {
+-return tparam ("\033\133%dm", &buf, 1, 8);
++return ! tparam ("\033\133%dm", &buf, 1, 8);
+   ;
+   return 0;
+ }
+@@ -23711,7 +23711,7 @@
+ int
+ main ()
+ {
+-return tparm ("\033\133%dm", 8);
++return ! tparm ("\033\133%dm", 8);
+   ;
+   return 0;
+ }
diff --git a/packages/gettext/0.20.1/0003-Fix-compilation-errors-with-ISO-C-23-compilers.patch b/packages/gettext/0.20.1/0003-Fix-compilation-errors-with-ISO-C-23-compilers.patch
new file mode 100644
index 00000000..c0ab21b4
--- /dev/null
+++ b/packages/gettext/0.20.1/0003-Fix-compilation-errors-with-ISO-C-23-compilers.patch
@@ -0,0 +1,51 @@
+From eb8a76522689a010a595071ce753ed489cbad7ff Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Thu, 9 Feb 2023 16:58:20 +0100
+Subject: [PATCH] Fix compilation errors with ISO C 23 compilers.
+
+* gettext-runtime/intl/dcigettext.c (getwd, getcwd): Assume a declaration in the
+system header files.
+* gettext-runtime/intl/gettextP.h (SWAP): Drop K&C compatibility.
+---
+ gettext-runtime/intl/dcigettext.c | 3 ---
+ gettext-runtime/intl/gettextP.h   | 5 -----
+ 2 files changed, 8 deletions(-)
+
+diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c
+index ba333303f..85e0d6aad 100644
+--- a/gettext-runtime/intl/dcigettext.c
++++ b/gettext-runtime/intl/dcigettext.c
+@@ -138,13 +138,10 @@ extern int errno;
+ # define tfind __tfind
+ #else
+ # if !defined HAVE_GETCWD
+-char *getwd ();
+ #  define getcwd(buf, max) getwd (buf)
+ # else
+ #  if VMS
+ #   define getcwd(buf, max) (getcwd) (buf, max, 0)
+-#  else
+-char *getcwd ();
+ #  endif
+ # endif
+ # ifndef HAVE_STPCPY
+diff --git a/gettext-runtime/intl/gettextP.h b/gettext-runtime/intl/gettextP.h
+index 0d7dbd6d4..1b7186552 100644
+--- a/gettext-runtime/intl/gettextP.h
++++ b/gettext-runtime/intl/gettextP.h
+@@ -113,12 +113,7 @@ extern char *libintl_dcigettext (const char *__domainname,
+ # define SWAP(i) bswap_32 (i)
+ #else
+ static inline nls_uint32
+-# ifdef __cplusplus
+ SWAP (nls_uint32 i)
+-# else
+-SWAP (i)
+-     nls_uint32 i;
+-# endif
+ {
+   return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
+ }
+-- 
+2.49.0
+
diff --git a/packages/gettext/0.23.1/chksum b/packages/gettext/0.23.1/chksum
new file mode 100644
index 00000000..3f68a404
--- /dev/null
+++ b/packages/gettext/0.23.1/chksum
@@ -0,0 +1,8 @@
+md5 gettext-0.23.1.tar.xz 1a174902c396e95c7d9761033fe1360e
+sha1 gettext-0.23.1.tar.xz 21e0c340de0c79f9d93f970f4a6bdafaa7dc8fe7
+sha256 gettext-0.23.1.tar.xz c1f97a72a7385b7e71dd07b5fea6cdaf12c9b88b564976b23bd8c11857af2970
+sha512 gettext-0.23.1.tar.xz d75908f73eabe36c01d72d342ca694dbefad5f43da54f0ccb43bfd0518baff5becc8f50e787f21fadb7c29b3123638e4559334ea4f8e48a97107e8c5e22453b6
+md5 gettext-0.23.1.tar.gz 50889348408eb278ed0c9c913c325f30
+sha1 gettext-0.23.1.tar.gz 3faf57a14ada2a9772360beb6659374cc20ca8c8
+sha256 gettext-0.23.1.tar.gz 52a578960fe308742367d75cd1dff8552c5797bd0beba7639e12bdcda28c0e49
+sha512 gettext-0.23.1.tar.gz 39ccf78961e4baae761a6117dcec02957bbbdbd398197b8b11ea18e53c04bf2500a7c143d3f9ea3ded48c55f71a323eb05ee0e461c1d9b397297e971b8ad6eef
diff --git a/packages/gettext/0.23.1/version.desc b/packages/gettext/0.23.1/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/gettext/0.23.1/version.desc
diff --git a/packages/gettext/package.desc b/packages/gettext/package.desc
index 2341b4bd..f5108ca6 100644
--- a/packages/gettext/package.desc
+++ b/packages/gettext/package.desc
@@ -5,4 +5,4 @@ bootstrap='./autogen.sh'
 mirrors='$(CT_Mirrors GNU gettext)'
 archive_formats='.tar.xz .tar.gz'
 signature_format='packed/.sig'
-milestones='0.21'
+milestones='0.21 0.23'