patch 8.1.1487: older msgfmt cannot generate proper .desktop file

Problem:    Older msgfmt cannot generate proper .desktop file.
Solution:   Add a configure check to not use this msgfmt version. (Ken Takata)

diff --git a/src/auto/configure b/src/auto/configure
index bb613d27933f8cbfe31384fbf4d9adee5856b92b..1f5ee2addbebcd20d70703082d46e4e504efd3de 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -14549,9 +14549,14 @@ rm -f core conftest.err conftest.$ac_objext \
 $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
+       if "$MSGFMT" --version | grep '0.19.[3-7]$' >/dev/null; then
+                         { $as_echo "$as_me:${as_lineno-$LINENO}: result: broken" >&5
+$as_echo "broken" >&6; }
+       else
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-       MSGFMT_DESKTOP="gvim.desktop vim.desktop"
+         MSGFMT_DESKTOP="gvim.desktop vim.desktop"
+       fi
       else
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }

diff --git a/src/configure.ac b/src/configure.ac
index 946c10d36c9b0634d82fbd41b7b88cd70daa8a0f..773844a0d8dc909226bb87494e4c1222f82ab754 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -4302,8 +4302,14 @@ if test "$enable_nls" = "yes"; then
       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"
+       if "$MSGFMT" --version | grep '0.19.[[3-7]]$' >/dev/null; then
+         dnl GNU gettext 0.19.7's --desktop is broken.  We assume back to
+         dnl 0.19.3 is also broken.
+         AC_MSG_RESULT([broken])
+       else
+         AC_MSG_RESULT([yes])
+         MSGFMT_DESKTOP="gvim.desktop vim.desktop"
+       fi
       else
        AC_MSG_RESULT([no])
       fi

diff --git a/src/version.c b/src/version.c
index bfda6187331b0ab8c010a8885e327cdee76b0147..5ac6f9d19a14f1354c61d404c3bc350c1d3163f5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1487,
 /**/
     1486,
 /**/