Skip to content

Commit 62a88f4

Browse files
committed
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)
1 parent 1253704 commit 62a88f4

3 files changed

Lines changed: 17 additions & 4 deletions

File tree

src/auto/configure

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14549,9 +14549,14 @@ rm -f core conftest.err conftest.$ac_objext \
1454914549
$as_echo_n "checking if msgfmt supports --desktop... " >&6; }
1455014550
MSGFMT_DESKTOP=
1455114551
if "$MSGFMT" --help | grep -e '--desktop' >/dev/null; then
14552-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14552+
if "$MSGFMT" --version | grep '0.19.[3-7]$' >/dev/null; then
14553+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: broken" >&5
14554+
$as_echo "broken" >&6; }
14555+
else
14556+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1455314557
$as_echo "yes" >&6; }
14554-
MSGFMT_DESKTOP="gvim.desktop vim.desktop"
14558+
MSGFMT_DESKTOP="gvim.desktop vim.desktop"
14559+
fi
1455514560
else
1455614561
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1455714562
$as_echo "no" >&6; }

src/configure.ac

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4302,8 +4302,14 @@ if test "$enable_nls" = "yes"; then
43024302
AC_MSG_CHECKING([if msgfmt supports --desktop])
43034303
MSGFMT_DESKTOP=
43044304
if "$MSGFMT" --help | grep -e '--desktop' >/dev/null; then
4305-
AC_MSG_RESULT([yes])
4306-
MSGFMT_DESKTOP="gvim.desktop vim.desktop"
4305+
if "$MSGFMT" --version | grep '0.19.[[3-7]]$' >/dev/null; then
4306+
dnl GNU gettext 0.19.7's --desktop is broken. We assume back to
4307+
dnl 0.19.3 is also broken.
4308+
AC_MSG_RESULT([broken])
4309+
else
4310+
AC_MSG_RESULT([yes])
4311+
MSGFMT_DESKTOP="gvim.desktop vim.desktop"
4312+
fi
43074313
else
43084314
AC_MSG_RESULT([no])
43094315
fi

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,8 @@ static char *(features[]) =
767767

768768
static int included_patches[] =
769769
{ /* Add new patch number below this line */
770+
/**/
771+
1487,
770772
/**/
771773
1486,
772774
/**/

0 commit comments

Comments
 (0)