diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-06-07 20:44:40 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-06-07 20:44:40 +0200 |
| commit | 62a88f498ac8d996bc976871cd80fcc14466f013 (patch) | |
| tree | b85479e576fa4ad685332d718452a9b53dbfc136 | |
| parent | 125370459178b0ca3acc98edca774c390c9b9fa4 (diff) | |
| download | vim-git-62a88f498ac8d996bc976871cd80fcc14466f013.tar.gz | |
patch 8.1.1487: older msgfmt cannot generate proper .desktop filev8.1.1487
Problem: Older msgfmt cannot generate proper .desktop file.
Solution: Add a configure check to not use this msgfmt version. (Ken Takata)
| -rwxr-xr-x | src/auto/configure | 9 | ||||
| -rw-r--r-- | src/configure.ac | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 17 insertions, 4 deletions
diff --git a/src/auto/configure b/src/auto/configure index bb613d279..1f5ee2add 100755 --- 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 946c10d36..773844a0d 100644 --- 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 bfda61873..5ac6f9d19 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1487, +/**/ 1486, /**/ 1485, |