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)

diff --git a/.travis.yml b/.travis.yml
index 1c8cc2ebf2d86271c58a89278f3ef8d776303bdf..d683b13ef3bca8d26a08bf39d83763b1c4a09757 100644 (file)
--- 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 a25944da13b8566f6ff9db197b03787e88ab31d3..022fc43a51704de81f7e682676d0ba69c40d928e 100644 (file)
--- 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 */
+/**/
+    1154,
 /**/
     1153,
 /**/