From ef37c201c515b32e62120195c5213cedffd38a10 Mon Sep 17 00:00:00 2001 From: "James E. King, III" Date: Wed, 4 Nov 2015 16:24:04 -0500 Subject: [PATCH 1/4] fix travis dependencies --- build/travis/installCXXDependencies.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/build/travis/installCXXDependencies.sh b/build/travis/installCXXDependencies.sh index ac3edf381aa..6d6afab3391 100755 --- a/build/travis/installCXXDependencies.sh +++ b/build/travis/installCXXDependencies.sh @@ -22,8 +22,14 @@ # see what we need: http://thrift.apache.org/docs/install/ubuntu # General dependencies -sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu/ trusty main restricted" -y -sudo apt-get update -qq +# sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu/ trusty main restricted" -y + +# for cmake-2.8.12 on precise +sudo add-apt-repository ppa:smspillaz/cmake-2.8.12 -y -sudo apt-get install -qq libpango-1.0-0 libqt4-dev qtbase5-dev qtbase5-dev-tools qt5-default libboost-dev libboost-test-dev libboost-program-options-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libevent-dev automake libtool flex bison pkg-config g++ libssl-dev make cmake git debhelper bc nsis ninja-build +# for qt5 development on precise +sudo apt-add-repository ppa:ubuntu-sdk-team/ppa -y + +sudo apt-get update -qq +sudo apt-get install -qq libpango1.0-0 libqt4-dev qtbase5-dev qtbase5-dev-tools qt5-default libboost-dev libboost-test-dev libboost-program-options-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libevent-dev automake libtool flex bison pkg-config g++ libssl-dev make cmake git debhelper bc nsis ninja-build dpkg -S /usr/include/boost/version.hpp From 00ca8d0dc1573b1dcd75d74a743a168eba2f9163 Mon Sep 17 00:00:00 2001 From: "James E. King, III" Date: Wed, 4 Nov 2015 16:40:41 -0500 Subject: [PATCH 2/4] fix travis dependencies --- build/travis/installCXXDependencies.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/travis/installCXXDependencies.sh b/build/travis/installCXXDependencies.sh index 6d6afab3391..42224b6100e 100755 --- a/build/travis/installCXXDependencies.sh +++ b/build/travis/installCXXDependencies.sh @@ -24,6 +24,9 @@ # General dependencies # sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu/ trusty main restricted" -y +# clean up held packages +sudo apt-get autoremove + # for cmake-2.8.12 on precise sudo add-apt-repository ppa:smspillaz/cmake-2.8.12 -y From aeeae6215cbfed728e51869b1f1f026d4698a306 Mon Sep 17 00:00:00 2001 From: "James E. King, III" Date: Wed, 4 Nov 2015 16:45:15 -0500 Subject: [PATCH 3/4] fix travis dependencies --- build/travis/installCXXDependencies.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build/travis/installCXXDependencies.sh b/build/travis/installCXXDependencies.sh index 42224b6100e..1577b518a02 100755 --- a/build/travis/installCXXDependencies.sh +++ b/build/travis/installCXXDependencies.sh @@ -24,9 +24,6 @@ # General dependencies # sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu/ trusty main restricted" -y -# clean up held packages -sudo apt-get autoremove - # for cmake-2.8.12 on precise sudo add-apt-repository ppa:smspillaz/cmake-2.8.12 -y @@ -34,5 +31,5 @@ sudo add-apt-repository ppa:smspillaz/cmake-2.8.12 -y sudo apt-add-repository ppa:ubuntu-sdk-team/ppa -y sudo apt-get update -qq -sudo apt-get install -qq libpango1.0-0 libqt4-dev qtbase5-dev qtbase5-dev-tools qt5-default libboost-dev libboost-test-dev libboost-program-options-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libevent-dev automake libtool flex bison pkg-config g++ libssl-dev make cmake git debhelper bc nsis ninja-build +sudo apt-get install libpango1.0-0 libqt4-dev qtbase5-dev qtbase5-dev-tools qt5-default libboost-dev libboost-test-dev libboost-program-options-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libevent-dev automake libtool flex bison pkg-config g++ libssl-dev make cmake git debhelper bc nsis ninja-build dpkg -S /usr/include/boost/version.hpp From 2e37f10578639d26100e5f988ae5747d2abfb4e6 Mon Sep 17 00:00:00 2001 From: "James E. King, III" Date: Wed, 4 Nov 2015 16:50:43 -0500 Subject: [PATCH 4/4] fix travis dependencies --- build/travis/installCXXDependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/travis/installCXXDependencies.sh b/build/travis/installCXXDependencies.sh index 1577b518a02..898db1e98e2 100755 --- a/build/travis/installCXXDependencies.sh +++ b/build/travis/installCXXDependencies.sh @@ -31,5 +31,9 @@ sudo add-apt-repository ppa:smspillaz/cmake-2.8.12 -y sudo apt-add-repository ppa:ubuntu-sdk-team/ppa -y sudo apt-get update -qq + +# remove cmake from ubuntu +sudo apt-get remove cmake cmake-data + sudo apt-get install libpango1.0-0 libqt4-dev qtbase5-dev qtbase5-dev-tools qt5-default libboost-dev libboost-test-dev libboost-program-options-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libevent-dev automake libtool flex bison pkg-config g++ libssl-dev make cmake git debhelper bc nsis ninja-build dpkg -S /usr/include/boost/version.hpp