From f3d7a4d5e8a349908604ea98fd28addf6f6d1c57 Mon Sep 17 00:00:00 2001 From: Reginald Kennedy Date: Mon, 21 Jan 2019 11:46:31 +0800 Subject: [PATCH] [travis] Fix build failure. Ubuntu Xenial is missing libxcb-xinput-dev. For now, disable xinput support when build testing. --- .travis.yml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b5add7d..de82d2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,26 @@ language: c + matrix: include: - os: linux dist: xenial - os: osx + +addons: + apt: + update: true + before_install: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - sudo apt-get update; - sudo apt-get install -y xorg libxft2-dev libxcursor-dev libxrandr-dev libxcb-icccm4-dev; - fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then + sudo apt-get install -y libx11-dev libx11-xcb-dev libxcursor-dev libxrandr-dev libxt-dev libxtst-dev libxcb1-dev libxcb-icccm4-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-util0-dev libxcb-xtest0-dev libxft-dev libxcb-xfixes0-dev libfreetype6-dev; + fi + script: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd linux && make; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then + # xenial doesn't include libxcb-xinput-dev, disable for now. + sed -i 's/#if defined(__linux__) || defined(__FreeBSD__)/#if 0/' spectrwm.c; + sed -i 's/xcb-xinput //g' linux/Makefile; + cd linux; + make; + fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cd osx && make; fi