Hi!

On Sun, 2025-01-05 at 17:44:33 +0100, Santiago Vila wrote:
> I've just uploaded gettext 0.23.1-0.1 for experimental.

Ah, great, thanks!

> In most cases, the failure is like this:
> 
> make[3]: Entering directory '/<<PKGBUILDDIR>>/po'
> *** error: gettext infrastructure mismatch: using a Makefile.in.in from 
> gettext version 0.20 but the
>  autoconf macros are from gettext version 0.22
> 
> and I expect that the trick I used for sitecopy (QA maintained), which
> is to copy Makefile.in.in *after* dh_autoreconf:
> 
> https://salsa.debian.org/debian/sitecopy/-/commit/27e4ed4205b7c62197f0428b6890d7bac2f5692e
> 
> will also work in many other cases.

I think this indicates a problem in the upstream autotools support,
and it might be better to try to fix that instead of adding what seems
like a workaround that might end up causing problems too due to the
(silenced) version mismatch.

I don't see the gettext version in the repo yet, but perhaps you could
try whether the attached patch fixes the above issue (and potentially
similar ones too).

The problem with AM_GNU_GETTEXT_VERSION is that it requires an exact
version (from the autpoint gettext archive.dir.tar.xz) while
AM_GNU_GETTEXT_REQUIRE_VERSION requires at least the specified version
but will pull in the latest available, which in our case should in
theory match the one used for the autoreconf.

(For upstream submission, depending on the version requirements, you
might want to have both, for backward compatibility reasons, for an
example of this see
<https://git.dpkg.org/cgit/dpkg/dpkg.git/tree/configure.ac#n33>.)

Thanks,
Guillem
diff -Naur sitecopy-0.16.6/debian/patches/autoreconf.patch sitecopy-0.16.6.new/debian/patches/autoreconf.patch
--- sitecopy-0.16.6/debian/patches/autoreconf.patch	1970-01-01 00:00:00.000000000 +0000
+++ sitecopy-0.16.6.new/debian/patches/autoreconf.patch	2025-01-05 17:26:32.146975267 +0000
@@ -0,0 +1,16 @@
+---
+ configure.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/configure.in
++++ b/configure.in
+@@ -144,8 +144,8 @@ AC_CHECK_HEADERS(stdarg.h string.h strin
+ SOCKLEN_ARG_TYPE
+ 
+ ALL_LINGUAS="ru fr cs ja de tr nn it"
++AM_GNU_GETTEXT_REQUIRE_VERSION([0.21])
+ AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.21])
+ 
+ NEON_WARNINGS
+ 
diff -Naur sitecopy-0.16.6/debian/patches/series sitecopy-0.16.6.new/debian/patches/series
--- sitecopy-0.16.6/debian/patches/series	2025-01-04 12:22:55.000000000 +0000
+++ sitecopy-0.16.6.new/debian/patches/series	2025-01-05 17:25:41.622842293 +0000
@@ -9,3 +9,4 @@
 31_Fix-various-issues.diff
 32_neon-0.31.patch
 33_fix-ftbfs-gcc14.patch
+autoreconf.patch
diff -Naur sitecopy-0.16.6/debian/rules sitecopy-0.16.6.new/debian/rules
--- sitecopy-0.16.6/debian/rules	2025-01-04 12:35:00.000000000 +0000
+++ sitecopy-0.16.6.new/debian/rules	2025-01-05 17:26:59.587045641 +0000
@@ -10,10 +10,6 @@
 %:
 	dh $@
 
-override_dh_autoreconf:
-	dh_autoreconf
-	cp /usr/share/gettext/po/Makefile.in.in po
-
 override_dh_auto_configure: configure
 	$(RM) -rf intl
 

Reply via email to