mirror of
https://github.com/vim/vim.git
synced 2025-09-29 04:34:16 -04:00
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)
This commit is contained in:
11
.travis.yml
11
.travis.yml
@@ -69,10 +69,14 @@ branches:
|
|||||||
|
|
||||||
addons:
|
addons:
|
||||||
apt:
|
apt:
|
||||||
|
sources:
|
||||||
|
# Need msgfmt 0.19.8 to be able to generate .desktop files
|
||||||
|
- sourceline: 'ppa:ricotz/toolchain'
|
||||||
packages:
|
packages:
|
||||||
- autoconf
|
- autoconf
|
||||||
- clang
|
- clang
|
||||||
- lcov
|
- lcov
|
||||||
|
- gettext
|
||||||
- libperl-dev
|
- libperl-dev
|
||||||
- python-dev
|
- python-dev
|
||||||
- python3-dev
|
- python3-dev
|
||||||
@@ -115,13 +119,6 @@ before_install:
|
|||||||
if [[ "${TRAVIS_OS_NAME}" = "linux" ]] && [[ "${CC}" = "clang" ]]; then
|
if [[ "${TRAVIS_OS_NAME}" = "linux" ]] && [[ "${CC}" = "clang" ]]; then
|
||||||
ln -sf "$(which llvm-cov)" /home/travis/bin/gcov
|
ln -sf "$(which llvm-cov)" /home/travis/bin/gcov
|
||||||
fi
|
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:
|
before_script:
|
||||||
# Start virtual framebuffer to be able to test the GUI. Does not work on OS X.
|
# Start virtual framebuffer to be able to test the GUI. Does not work on OS X.
|
||||||
|
@@ -771,6 +771,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1154,
|
||||||
/**/
|
/**/
|
||||||
1153,
|
1153,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user