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 1c8cc2e..d683b13 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,10 +69,14 @@
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 @@
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 a25944d..022fc43 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1154,
+/**/
1153,
/**/
1152,