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 bb613d2..1f5ee2a 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -14549,9 +14549,14 @@
$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 946c10d..773844a 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -4302,8 +4302,14 @@
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 bfda618..5ac6f9d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1487,
+/**/
1486,
/**/
1485,