[patch] adding --no-wrap to msgmerge

[Benno Schulenberg <bensberg@justemail.net>]

[-- Attachment #1: Type: text/plain, Size: 909 bytes --]


Attached an updated patch, that avoids unneeded churn in PO files in git
(wrapping and subsequent unwrapping of long lines).  Works for me.

On Tue, Dec 17, 2013, at 18:16, Sami Kerola wrote:
> I think the change should include configure.ac update to require
> gettext version 0.18.
> 
> -AM_GNU_GETTEXT_VERSION([0.14.1])
> +AM_GNU_GETTEXT_VERSION([0.18])

Thank you, Sami.  That worked.

Although, now, during ./autogen.sh, I get the following warning:

configure.ac:149: warning: The 'AM_PROG_MKDIR_P' macro is deprecated, and its use is discouraged.
configure.ac:149: You should use the Autoconf-provided 'AC_PROG_MKDIR_P' macro instead,
configure.ac:149: and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am fi

Something from gettext, apparently, because line 149 is:

AM_GNU_GETTEXT([external])

Regards,

Benno

-- 
http://www.fastmail.fm - Email service worth paying for. Try it for free


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-po-add-no-wrap-to-msgmerge-to-not-wrap-long-message-.patch --]
[-- Type: text/x-patch; name="0001-po-add-no-wrap-to-msgmerge-to-not-wrap-long-message-.patch", Size: 1431 bytes --]

From 4cb5d4ccd529bc5521e23b817d23295f1456e1ef Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Mon, 16 Dec 2013 22:41:56 +0100
Subject: [PATCH] po: add '--no-wrap' to msgmerge, to not wrap long message lines

This avoids unneeded churn during POT-file renewal and PO-file updates,
as the PO files at the TP are made with '--no-wrap'.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Acked-by: Sami Kerola <kerolasa@iki.fi>
---
 configure.ac |    2 +-
 po/Makevars  |    3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8665780..5444cd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -145,7 +145,7 @@ UL_SET_ARCH([HPPA], [hppa*])
 
 AC_SYS_LARGEFILE
 
-AM_GNU_GETTEXT_VERSION([0.14.1])
+AM_GNU_GETTEXT_VERSION([0.18])
 AM_GNU_GETTEXT([external])
 
 AS_IF([test -d "$srcdir/po"], [
diff --git a/po/Makevars b/po/Makevars
index 9938e44..4d5629c 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -10,6 +10,9 @@ top_builddir = ..
 # These options get passed to xgettext.
 XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=P_:1,2
 
+# This option gets passed to msgmerge.
+MSGMERGE_OPTIONS = --no-wrap
+
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
 # package.  (Note that the msgstr strings, extracted from the package's
-- 
1.7.0.4