diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-04-11 15:49:11 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-04-11 15:49:11 +0200 |
| commit | 29a9baa0779c21f3d055a7b119d6d5650f4ae56e (patch) | |
| tree | c1e42a6e9ab41160cb0fd919ef89d6323b86e049 | |
| parent | 26096cc96fc402db45948b3b662a380281585649 (diff) | |
patch 8.1.1150: generating desktop files not tested on Travisv8.1.1150
Problem: Generating desktop files not tested on Travis.
Solution: Install a newer msgfmt package. (Christian Brabandt)
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 038a1d6421..1c8cc2ebf2 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 433f6bf4e4..efd117ea8b 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1150, +/**/ 1149, /**/ 1148, |