Mercurial > vim

changeset 16299:5b592d4eb23a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1154: getting a newer msgfmt on Travis is too complicated commit https://github.com/vim/vim/commit/496555fd18219cb902d7683b3f08dd2e47cbdc1a Author: Bram Moolenaar <Bram@vim.org> 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)
author Bram Moolenaar <Bram@vim.org>
date Thu, 11 Apr 2019 20:30:05 +0200
parents a6202922986f
children f3d579f009d1
files .travis.yml src/version.c
diffstat 2 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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,