aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.1487: older msgfmt cannot generate proper .desktop file

Browse Source 
Problem:    Older msgfmt cannot generate proper .desktop file.
Solution:   Add a configure check to not use this msgfmt version. (Ken Takata)
This commit is contained in:
Bram Moolenaar 2019-06-07 20:44:40 +02:00
parent 1253704591
commit 62a88f498a
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/auto/configure vendored
View File

@ -14549,9 +14549,14 @@ rm -f core conftest.err conftest.$ac_objext \
$as_echo_n "checking if msgfmt supports --desktop... " >&6; } $as_echo_n "checking if msgfmt supports --desktop... " >&6; }
MSGFMT_DESKTOP= MSGFMT_DESKTOP=
if "$MSGFMT" --help | grep -e '--desktop' >/dev/null; then if "$MSGFMT" --help | grep -e '--desktop' >/dev/null; then
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 "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
MSGFMT_DESKTOP="gvim.desktop vim.desktop" MSGFMT_DESKTOP="gvim.desktop vim.desktop"
fi
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }

6
src/configure.ac
View File

@ -4302,8 +4302,14 @@ if test "$enable_nls" = "yes"; then
AC_MSG_CHECKING([if msgfmt supports --desktop]) AC_MSG_CHECKING([if msgfmt supports --desktop])
MSGFMT_DESKTOP= MSGFMT_DESKTOP=
if "$MSGFMT" --help | grep -e '--desktop' >/dev/null; then if "$MSGFMT" --help | grep -e '--desktop' >/dev/null; then
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]) AC_MSG_RESULT([yes])
MSGFMT_DESKTOP="gvim.desktop vim.desktop" MSGFMT_DESKTOP="gvim.desktop vim.desktop"
fi
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi

2
src/version.c
View File

@ -767,6 +767,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1487,
/**/ /**/
1486, 1486,
/**/ /**/