Paul Eggert wrote: > I think the idea is that gettext is upstream from gnulib, so the fix should > be > cherry-picked into gettext
The fix already has been included in upstream gettext, after being re-reported <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25690>. > and gnulib will pick it up from there. Done as follows: 2018-06-17 Bruno Haible <br...@clisp.org> gettext po infrastructure: Update from current gettext git. Reported by Akim Demaille <a...@lrde.epita.fr>. * build-aux/po/Makefile.in.in: Update from current gettext git. * build-aux/po/remove-potcdate.sin: Likewise. * config/srclist.txt: Temporarily disable sync for these files. diff --git a/config/srclist.txt b/config/srclist.txt index ac0a433..6a695bd 100644 --- a/config/srclist.txt +++ b/config/srclist.txt @@ -58,8 +58,9 @@ $GETTEXT gettext-runtime/m4/lcmessage.m4 m4 release $GETTEXT gettext-runtime/m4/nls.m4 m4 release $GETTEXT gettext-runtime/m4/po.m4 m4 release -$GETTEXT gettext-runtime/po/Makefile.in.in build-aux/po release -$GETTEXT gettext-runtime/po/remove-potcdate.sin build-aux/po release +# Re-enable after the next gettext release. +#$GETTEXT gettext-runtime/po/Makefile.in.in build-aux/po release +#$GETTEXT gettext-runtime/po/remove-potcdate.sin build-aux/po release # # All below here commented out in forlorn hope of future syncs. diff --git a/build-aux/po/Makefile.in.in b/build-aux/po/Makefile.in.in index 38c293d..7e22bd9 100644 --- a/build-aux/po/Makefile.in.in +++ b/build-aux/po/Makefile.in.in @@ -1,5 +1,6 @@ # Makefile for PO directory in any package using GNU gettext. -# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drep...@gnu.ai.mit.edu> +# Copyright (C) 1995-2000 Ulrich Drepper <drep...@gnu.ai.mit.edu> +# Copyright (C) 2000-2018 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright @@ -232,13 +233,15 @@ $(POFILES): $(POFILESDEPS) if test -f "$(srcdir)/$${lang}.po"; then \ test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \ cd $(srcdir) \ && { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ + 0.1[6-7] | 0.1[6-7].*) \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \ *) \ - $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \ esac; \ }; \ else \ @@ -373,6 +376,8 @@ check: all info dvi ps pdf html tags TAGS ctags CTAGS ID: +install-dvi install-ps install-pdf install-html: + mostlyclean: rm -f remove-potcdate.sed rm -f stamp-poT @@ -439,13 +444,15 @@ update-po: Makefile tmpdir=`pwd`; \ echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ + echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ cd $(srcdir); \ if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \ $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + 0.1[6-7] | 0.1[6-7].*) \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ *) \ - $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ esac; \ }; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ diff --git a/build-aux/po/remove-potcdate.sin b/build-aux/po/remove-potcdate.sin index 2436c49..8c70dfb 100644 --- a/build-aux/po/remove-potcdate.sin +++ b/build-aux/po/remove-potcdate.sin @@ -1,6 +1,12 @@ -# Sed script that remove the POT-Creation-Date line in the header entry +# Sed script that removes the POT-Creation-Date line in the header entry # from a POT file. # +# Copyright (C) 2002 Free Software Foundation, Inc. +# Copying and distribution of this file, with or without modification, +# are permitted in any medium without royalty provided the copyright +# notice and this notice are preserved. This file is offered as-is, +# without any warranty. +# # The distinction between the first and the following occurrences of the # pattern is achieved by looking at the hold space. /^"POT-Creation-Date: .*"$/{
