* [attempt at patch] adding --no-wrap to msgmerge
@ 2013-12-17 10:02 Benno Schulenberg
2013-12-17 17:16 ` Sami Kerola
0 siblings, 1 reply; 5+ messages in thread
From: Benno Schulenberg @ 2013-12-17 10:02 UTC (permalink / raw)
To: Util-Linux
[-- Attachment #1: Type: text/plain, Size: 782 bytes --]
Hi,
Attached is a patch that should add the option --no-wrap to the runs
of msgmerge (after a renewal of the POT file) to reduce the number
of spurious differences.
However, I can't get the thing to work here. When i run autogen.sh
it says "Copying file po/Makefile.in.in", and when I then look in that
file it mentions "# Origin: gettext-0.14". But the only Makefile.in.in
I have on this testing system is /usr/share/gettext/po/Makefile.in.in
and in that file it says "# Origin: gettext-0.18". (That version is needed,
otherwise it doesn't know the MSGMERGE_OPTIONS variable.)
So... where does autogen.sh/autopoint take its Makefile.in.in from?
Regards,
Benno
--
http://www.fastmail.fm - Or how I learned to stop worrying and
love email again
[-- 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: 1057 bytes --]
From 4d9a629b2d3a9e1768eb268acaf9e73fb169978f 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>
---
po/Makevars | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [attempt at patch] adding --no-wrap to msgmerge
2013-12-17 10:02 [attempt at patch] adding --no-wrap to msgmerge Benno Schulenberg
@ 2013-12-17 17:16 ` Sami Kerola
2013-12-18 22:47 ` [patch] " Benno Schulenberg
0 siblings, 1 reply; 5+ messages in thread
From: Sami Kerola @ 2013-12-17 17:16 UTC (permalink / raw)
To: Benno Schulenberg; +Cc: Util-Linux
On 17 December 2013 10:02, Benno Schulenberg <bensberg@justemail.net> wrote:
> Attached is a patch that should add the option --no-wrap to the runs
> of msgmerge (after a renewal of the POT file) to reduce the number
> of spurious differences.
>
> However, I can't get the thing to work here. When i run autogen.sh
> it says "Copying file po/Makefile.in.in", and when I then look in that
> file it mentions "# Origin: gettext-0.14". But the only Makefile.in.in
> I have on this testing system is /usr/share/gettext/po/Makefile.in.in
> and in that file it says "# Origin: gettext-0.18". (That version is needed,
> otherwise it doesn't know the MSGMERGE_OPTIONS variable.)
>
> So... where does autogen.sh/autopoint take its Makefile.in.in from?
Hi Benno,
I think the change should include configure.ac update to require
gettext version 0.18.
-- snip
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"], [
-- snip
Feel free to add when resubmitting.
Acked-by: Sami Kerola <kerolasa@iki.fi>
--
Sami Kerola
http://www.iki.fi/kerolasa/
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [patch] adding --no-wrap to msgmerge
2013-12-17 17:16 ` Sami Kerola
@ 2013-12-18 22:47 ` Benno Schulenberg
2013-12-19 10:30 ` Sami Kerola
2014-01-06 7:49 ` Karel Zak
0 siblings, 2 replies; 5+ messages in thread
From: Benno Schulenberg @ 2013-12-18 22:47 UTC (permalink / raw)
To: Util-Linux; +Cc: kerolasa
[-- 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [patch] adding --no-wrap to msgmerge
2013-12-18 22:47 ` [patch] " Benno Schulenberg
@ 2013-12-19 10:30 ` Sami Kerola
2014-01-06 7:49 ` Karel Zak
1 sibling, 0 replies; 5+ messages in thread
From: Sami Kerola @ 2013-12-19 10:30 UTC (permalink / raw)
To: Benno Schulenberg; +Cc: Util-Linux
On 18 December 2013 22:47, Benno Schulenberg <bensberg@justemail.net> wrote:
> 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
Yes, that is coming from gettext. I have hunch the error is expected.
See link below for details.
http://git.savannah.gnu.org/cgit/gettext.git/commit/gettext-tools/po?id=c35de4365ac8f7a87b62b85a35eb122f79cb12ad
I'm sure bug-gnu-gettext@gnu.org can make just call if the $(mkdir_p)
should replaced with $(MKDIR_P), and if the gettext should attempt to
find the value for the macro.
--
Sami Kerola
http://www.iki.fi/kerolasa/
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [patch] adding --no-wrap to msgmerge
2013-12-18 22:47 ` [patch] " Benno Schulenberg
2013-12-19 10:30 ` Sami Kerola
@ 2014-01-06 7:49 ` Karel Zak
1 sibling, 0 replies; 5+ messages in thread
From: Karel Zak @ 2014-01-06 7:49 UTC (permalink / raw)
To: Benno Schulenberg; +Cc: Util-Linux, kerolasa
> configure.ac | 2 +-
> po/Makevars | 3 +++
> 2 files changed, 4 insertions(+), 1 deletions(-)
Applied, thanks.
--
Karel Zak <kzak@redhat.com>
http://karelzak.blogspot.com
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-01-06 7:49 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-12-17 10:02 [attempt at patch] adding --no-wrap to msgmerge Benno Schulenberg
2013-12-17 17:16 ` Sami Kerola
2013-12-18 22:47 ` [patch] " Benno Schulenberg
2013-12-19 10:30 ` Sami Kerola
2014-01-06 7:49 ` Karel Zak
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.