diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-04-11 20:14:56 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-04-11 20:14:56 +0200 |
| commit | 496555fd18219cb902d7683b3f08dd2e47cbdc1a (patch) | |
| tree | a0204acdbe9d20425c31963649c8deb389654727 | |
| parent | 9a419ffb934bd04bf8d44ceaf4694e50cce55eab (diff) | |
patch 8.1.1154: getting a newer msgfmt on Travis is too complicated
Problem: Getting a newer msgfmt on Travis is too complicated.
Solution: Use a "sourcline" entry. (Ozaki Kiichi, closes #4236)
| -rw-r--r-- | .travis.yml | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 1c8cc2ebf2..d683b13ef3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,10 +69,14 @@ branches: addons: apt: + sources: + # Need msgfmt 0.19.8 to be able to generate .desktop files + - sourceline: 'ppa:ricotz/toolchain' packages: - autoconf - clang - lcov + - gettext - libperl-dev - python-dev - python3-dev @@ -115,13 +119,6 @@ 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 a25944da13..022fc43a51 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 */ /**/ + 1154, +/**/ 1153, /**/ 1152, |