# HG changeset patch # User Bram Moolenaar # Date 1555007405 -7200 # Node ID 5b592d4eb23aa98eade6d8a8771efa4e2f3dc926 # Parent a6202922986fffc31423e80c1af5582fa8012b97 patch 8.1.1154: getting a newer msgfmt on Travis is too complicated commit https://github.com/vim/vim/commit/496555fd18219cb902d7683b3f08dd2e47cbdc1a Author: Bram Moolenaar Date: Thu Apr 11 20:14:56 2019 +0200 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 https://github.com/vim/vim/issues/4236) diff --git a/.travis.yml b/.travis.yml --- 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 --- 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,