patch 8.1.1149: building desktop files fails with older msgfmt

Problem:    Building desktop files fails with older msgfmt.
Solution:   Add autoconf check.  Avoid always building the desktop files.

diff --git a/src/auto/configure b/src/auto/configure
index db3e3b1e45b114fae15fe8581cbd7cfed76a0472..c2738579196da7404bc0195a262eeba2bd0df477 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -623,6 +623,7 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 LINK_AS_NEEDED
 DEPEND_CFLAGS_FILTER
+MSGFMT_DESKTOP
 MAKEMO
 MSGFMT
 INSTALL_TOOL_LANGS
@@ -14533,6 +14534,18 @@ $as_echo "no" >&6; }
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt supports --desktop" >&5
+$as_echo_n "checking if msgfmt supports --desktop... " >&6; }
+      MSGFMT_DESKTOP=
+      if "$MSGFMT" --help | grep -e '--desktop' >/dev/null; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+       MSGFMT_DESKTOP="gvim.desktop vim.desktop"
+      else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+      fi
+
     fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no \"po/Makefile\" - disabled" >&5

diff --git a/src/config.mk.in b/src/config.mk.in
index b5d1ebd9b784c1f37d1cde2618f625839fb1746a..e20a10f8bcfae24dce1cd5161f1757d186b62795 100644 (file)
--- a/src/config.mk.in
+++ b/src/config.mk.in
@@ -169,6 +169,7 @@ OS_EXTRA_OBJ        = @OS_EXTRA_OBJ@
 MAKEMO         = @MAKEMO@
 
 MSGFMT         = @MSGFMT@
+MSGFMT_DESKTOP = @MSGFMT_DESKTOP@
 
 # Make sure that "make first" will run "make all" once configure has done its
 # work.  This is needed when using the Makefile in the top directory.

diff --git a/src/configure.ac b/src/configure.ac
index 2d409b3ca06a1500b797d8ae5ebb56e336e85151..be869d1d52b0c271a6ee581abd4de5b23d179dd6 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -4298,6 +4298,15 @@ if test "$enable_nls" = "yes"; then
                [++_nl_msg_cat_cntr;],
                AC_MSG_RESULT([yes]); AC_DEFINE(HAVE_NL_MSG_CAT_CNTR),
                AC_MSG_RESULT([no]))
+      AC_MSG_CHECKING([if msgfmt supports --desktop])
+      MSGFMT_DESKTOP=
+      if "$MSGFMT" --help | grep -e '--desktop' >/dev/null; then
+       AC_MSG_RESULT([yes])
+       MSGFMT_DESKTOP="gvim.desktop vim.desktop"
+      else
+       AC_MSG_RESULT([no])
+      fi
+      AC_SUBST(MSGFMT_DESKTOP)
     fi
   else
     AC_MSG_RESULT([no "po/Makefile" - disabled]);

diff --git a/src/po/Make_all.mak b/src/po/Make_all.mak
index e16b9acf2b258575676097f6225be88f3d601eb1..c179de1ca457bbf66cb41ea05af372da906f6238 100644 (file)
--- a/src/po/Make_all.mak
+++ b/src/po/Make_all.mak
@@ -45,6 +45,49 @@ LANGUAGES = \
                zh_TW.UTF-8 \
 
 
+POFILES = \
+               af.po \
+               ca.po \
+               cs.po \
+               cs.cp1250.po \
+               da.po \
+               de.po \
+               en_GB.po \
+               eo.po \
+               es.po \
+               fi.po \
+               fr.po \
+               ga.po \
+               it.po \
+               ja.po \
+               ja.euc-jp.po \
+               ja.sjis.po \
+               ko.po \
+               ko.UTF-8.po \
+               lv.po \
+               nb.po \
+               nl.po \
+               no.po \
+               pl.po \
+               pl.UTF-8.po \
+               pl.cp1250.po \
+               pt_BR.po \
+               ru.po \
+               ru.cp1251.po \
+               sk.po \
+               sk.cp1250.po \
+               sr.po \
+               sv.po \
+               uk.po \
+               uk.cp1251.po \
+               vi.po \
+               zh_CN.po \
+               zh_CN.UTF-8.po \
+               zh_CN.cp936.po \
+               zh_TW.po \
+               zh_TW.UTF-8.po \
+
+
 MOFILES = \
                af.mo \
                ca.mo \

diff --git a/src/po/Makefile b/src/po/Makefile
index 70f7fc8367bb6762a11986c681edc5c03d4b80dd..82477cd174ea5acd14471eeed9bd795175b8240b 100644 (file)
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -25,9 +25,6 @@ MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes msgmerge
 .SUFFIXES: .po .mo .pot .ck
 .PHONY: all install uninstall prefixcheck converted check clean checkclean distclean update-po $(LANGUAGES)
 
-LINGUAS:
-       @echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS
-
 .po.mo:
        $(MSGFMTCMD) -o $@ $<
 
@@ -35,7 +32,7 @@ LINGUAS:
        $(VIM) -u NONE -e -X -S check.vim -c "if error == 0 | q | endif" -c cq $<
        touch $@
 
-all: $(MOFILES) $(MOCONVERTED) gvim.desktop vim.desktop
+all: $(MOFILES) $(MOCONVERTED) $(MSGFMT_DESKTOP)
 
 check: $(CHECKFILES)
 
@@ -167,7 +164,7 @@ $(PACKAGE).pot: ../*.c ../if_perl.xs ../GvimExt/gvimext.cpp ../globals.h ../if_p
                po/gvim.desktop.in po/vim.desktop.in
        mv -f ../$(PACKAGE).po $(PACKAGE).pot
 
-%.desktop: %.desktop.in $(PACKAGE).pot LINGUAS
+%.desktop: %.desktop.in $(POFILES)
        $(MSGFMT) --desktop -d . --template $< -o $@
        cp -f $@ ../../runtime/$@
 

diff --git a/src/version.c b/src/version.c
index 3da2d7a0973b410b6e491763b64b9c6d641a09d4..433f6bf4e4c8edbb20dc54551a19d96c0576a541 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1149,
 /**/
     1148,
 /**/