From 29a9baa0779c21f3d055a7b119d6d5650f4ae56e Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 11 Apr 2019 15:49:11 +0200 Subject: [PATCH] patch 8.1.1150: generating desktop files not tested on Travis Problem: Generating desktop files not tested on Travis. Solution: Install a newer msgfmt package. (Christian Brabandt) --- .travis.yml | 7 +++++++ src/version.c | 2 ++ 2 files changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index 038a1d64216ea..1c8cc2ebf2d86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -115,6 +115,13 @@ before_install: if [[ "${TRAVIS_OS_NAME}" = "linux" ]] && [[ "${CC}" = "clang" ]]; then ln -sf "$(which llvm-cov)" /home/travis/bin/gcov fi + # Need msgfmt 0.19.8 to be able to generate .desktop files + - | + if [[ "${TRAVIS_OS_NAME}" = "linux" ]]; then + sudo add-apt-repository ppa:ricotz/toolchain -y && + sudo apt-get update -q && + sudo apt-get install gettext=0.19.8.1-1ubuntu2~14.04~ricotz1 -y + fi before_script: # Start virtual framebuffer to be able to test the GUI. Does not work on OS X. diff --git a/src/version.c b/src/version.c index 433f6bf4e4c8e..efd117ea8b791 100644 --- a/src/version.c +++ b/src/version.c @@ -771,6 +771,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1150, /**/ 1149, /**/