pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Add patch for gettext/autopoint weirdness.



Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Tue Jul 9 21:11:57 2019 +0200
Changeset:	fbc68e6aca891b93cb39fbccb5b22f2655f0f2f3

Added Files:
	pan2-git/distinfo
	pan2-git/patches/patch-configure.ac

Log Message:
Add patch for gettext/autopoint weirdness.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fbc68e6aca891b93cb39fbccb5b22f2655f0f2f3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 pan2-git/distinfo                   |  4 ++++
 pan2-git/patches/patch-configure.ac | 27 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diffs:
diff --git a/pan2-git/distinfo b/pan2-git/distinfo
new file mode 100644
index 0000000000..97385b6a7e
--- /dev/null
+++ b/pan2-git/distinfo
@@ -0,0 +1,4 @@
+$NetBSD$
+
+SHA1 (patch-configure.ac) = e71544a02c6c3fa09fe79f78eb39ebd31e0d8a3c
+SHA1 (patch-pan-general-e-util.cc) = c252f074b139b100f3f879261b1ba894b5f3350c
diff --git a/pan2-git/patches/patch-configure.ac b/pan2-git/patches/patch-configure.ac
new file mode 100644
index 0000000000..f9206b1ccd
--- /dev/null
+++ b/pan2-git/patches/patch-configure.ac
@@ -0,0 +1,27 @@
+$NetBSD$
+
+Add AM_GNU_GETTEXT_REQUIRE_VERSION so that autopoint 0.20 will set
+the version number to 0.20 (its own) instead of 0.19. Otherwise,
+the generated po/Makefile.in.in will have "GETTEXT_MACRO_VERSION = 0.19"
+but @GETTEXT_MACRO_VERSION@ = 0.20 and it will refuse to work:
+
+    *** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.19 but the autoconf macros are from gettext version 0.20
+
+Just adding AM_GNU_GETTEXT_REQUIRE_VERSION isn't enough, then some tools
+seem to think that gettext isn't used at all.
+
+Weird.
+
+diff --git a/configure.ac b/configure.ac
+index f53d238..3d3a0cf 100644
+--- configure.ac
++++ configure.ac
+@@ -94,7 +94,8 @@ AC_CHECK_HEADERS([errno.h fcntl.h])
+ dnl I18n support
+ GETTEXT_PACKAGE=pan
+ AC_SUBST(GETTEXT_PACKAGE)
+ AM_GNU_GETTEXT_VERSION([0.19.7])
++AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.7])
+ AM_GNU_GETTEXT([external])
+ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext Package])
+ panlocaledir=[${datadir}/locale]


Home | Main Index | Thread Index | Old Index