From cd000573a6c03fb13c4de49904f10ca638399f51 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 13 Jun 2015 15:50:10 -0700 Subject: [PATCH 1/3] Make sure add-apt-repository is installed. --- .travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.sh b/.travis.sh index 29fb4d0a8c..7e12c8a8fd 100644 --- a/.travis.sh +++ b/.travis.sh @@ -26,7 +26,7 @@ travis_before_install() { if [ ! "$TRAVIS_OS_NAME" = "osx" ]; then sudo apt-get update -qq - sudo apt-get install aria2 pv -qq + sudo apt-get install software-properties-common aria2 pv -qq if [ "$CMAKE" = "TRUE" ]; then sudo apt-get install lib32stdc++6 lib32z1 lib32z1-dev cmake -qq From 47d6c50a20fbea275c6ddec8a53a044514d55d6a Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 13 Jun 2015 15:57:52 -0700 Subject: [PATCH 2/3] Make sure we have GL headers. --- .travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.sh b/.travis.sh index 7e12c8a8fd..2e1f66f504 100644 --- a/.travis.sh +++ b/.travis.sh @@ -26,7 +26,7 @@ travis_before_install() { if [ ! "$TRAVIS_OS_NAME" = "osx" ]; then sudo apt-get update -qq - sudo apt-get install software-properties-common aria2 pv -qq + sudo apt-get install software-properties-common aria2 pv build-essential libgl1-mesa-dev libglu1-mesa-dev -qq if [ "$CMAKE" = "TRUE" ]; then sudo apt-get install lib32stdc++6 lib32z1 lib32z1-dev cmake -qq From f3f27694c046cb44cef5f2f40005eb3e7f06f082 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 13 Jun 2015 16:15:14 -0700 Subject: [PATCH 3/3] Try to fix Qt build on Travis. --- .travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.sh b/.travis.sh index 2e1f66f504..4123e45729 100644 --- a/.travis.sh +++ b/.travis.sh @@ -53,7 +53,7 @@ travis_install() { fi if [ "$QT" = "TRUE" ]; then - sudo apt-get install -qq qt5-qmake qtmultimedia5-dev qtsystems5-dev qtbase5-dev qtdeclarative5-dev qttools5-dev-tools libqt5webkit5-dev libsqlite3-dev + sudo apt-get install -qq qt5-qmake qtmultimedia5-dev qtsystems5-dev qtbase5-dev qtdeclarative5-dev qttools5-dev-tools libqt5webkit5-dev libsqlite3-dev qt5-default fi fi