1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge branch 'v1.17-dev'

This commit is contained in:
sudden6 2019-10-15 21:05:45 +02:00
commit a29415024a
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
4 changed files with 13 additions and 13 deletions

View File

@ -1,5 +1,5 @@
sudo: required sudo: required
dist: trusty dist: xenial
language: cpp language: cpp
cache: ccache cache: ccache
@ -44,7 +44,7 @@ jobs:
# the actual compilin' # the actual compilin'
- stage: Linux - stage: Linux
os: linux os: linux
env: JOB=build-ubuntu-14-04 env: JOB=build-ubuntu-16-04
script: "./.travis/$JOB.sh" script: "./.travis/$JOB.sh"
- stage: "Windows Stage 1: Dependencies (OpenSSL, Qt)" - stage: "Windows Stage 1: Dependencies (OpenSSL, Qt)"
os: linux os: linux

View File

@ -19,8 +19,6 @@
# stop as soon as one of steps will fail # stop as soon as one of steps will fail
set -e -o pipefail set -e -o pipefail
# Qt 5.5, since that's the lowest supported version
sudo add-apt-repository -y ppa:beineri/opt-qt551-trusty
sudo apt-get update -qq sudo apt-get update -qq
# install needed Qt, OpenAL, opus, qrencode, GTK tray deps, sqlcipher # install needed Qt, OpenAL, opus, qrencode, GTK tray deps, sqlcipher
@ -43,16 +41,13 @@ sudo apt-get install -y --force-yes \
libtool \ libtool \
libvpx-dev \ libvpx-dev \
libxss-dev qrencode \ libxss-dev qrencode \
qt55base \ qt5-default \
qt55script \ qttools5-dev-tools \
qt55svg \ qttools5-dev \
qt55tools \ libqt5opengl5-dev \
qt55xmlpatterns \ libqt5svg5-dev \
pkg-config || yes pkg-config || yes
# Qt
source /opt/qt55/bin/qt55-env.sh || yes
# ffmpeg # ffmpeg
if [ ! -e "libs" ]; then mkdir libs; fi if [ ! -e "libs" ]; then mkdir libs; fi
if [ ! -e "ffmpeg" ]; then mkdir ffmpeg; fi if [ ! -e "ffmpeg" ]; then mkdir ffmpeg; fi

View File

@ -108,6 +108,11 @@ ls -lbh "$CACHE_DIR"
# Purely for debugging # Purely for debugging
ls -lbh "$PWD" ls -lbh "$PWD"
sudo apt-get update -qq
# even though we're building in docker, libseccomp2 is used by docker, and needs to be up to date
# to support functionality used by Qt's configure
sudo apt-get install libseccomp2 -y --force-yes
# Build # Build
sudo docker run --rm \ sudo docker run --rm \
-v "$PWD/workspace":/workspace \ -v "$PWD/workspace":/workspace \

View File

@ -60,7 +60,7 @@ update_flatpak() {
update_travis() { update_travis() {
cd .travis cd .travis
perl -i -0pe "s|$VERSION_PATTERN( --depth=1 https://github.com/toktok/c-toxcore)|$@\${1}|gms" build-ubuntu-14-04.sh perl -i -0pe "s|$VERSION_PATTERN( --depth=1 https://github.com/toktok/c-toxcore)|$@\${1}|gms" build-ubuntu-16-04.sh
cd .. cd ..
} }