New upstream version 4.0.3

parent b392e14e

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

...@@ -5,6 +5,10 @@ skip_tags: true ...@@ -5,6 +5,10 @@ skip_tags: true
image: Visual Studio 2017 image: Visual Studio 2017
branches:
except: # blacklist
- coverity_scan
environment: environment:
REPO_DIR: &REPO_DIR c:\qbittorrent REPO_DIR: &REPO_DIR c:\qbittorrent
CACHE_DIR: &CACHE_DIR c:\qbt_cache CACHE_DIR: &CACHE_DIR c:\qbt_cache
...@@ -20,6 +24,8 @@ clone_folder: *REPO_DIR ...@@ -20,6 +24,8 @@ clone_folder: *REPO_DIR
cache: cache:
- *CACHE_DIR - *CACHE_DIR
clone_depth: 50
install: install:
# check if library needs update # check if library needs update
- appveyor DownloadFile "%QBT_VER_URL%" -FileName "c:\version_new" && SET /P newVersion=<"c:\version_new" - appveyor DownloadFile "%QBT_VER_URL%" -FileName "c:\version_new" && SET /P newVersion=<"c:\version_new"
......
# EditorConfig is awesome: http://EditorConfig.org
root = true
[*]
indent_style = space
indent_size = 4
insert_final_newline = true
trim_trailing_whitespace = true
[**.yml]
indent_size = 2
**Please provide the following information** **Please provide the following information**
### qBittorrent version and Operating System: ### qBittorrent version and Operating System
(type here)
### If on linux, libtorrent and Qt version: ### If on linux, libtorrent and Qt version
(type here)
### What is the problem: ### What is the problem
(type here)
### What is the expected behavior: ### What is the expected behavior
(type here)
### Steps to reproduce: ### Steps to reproduce
(type here)
### Extra info(if any): ### Extra info(if any)
(type here)
...@@ -10,19 +10,18 @@ env: ...@@ -10,19 +10,18 @@ env:
# Uncomment when Travis upgraded "Ubuntu 12.04 LTS" to a newer version whose repo will have a more up-to-date libtorrent package # Uncomment when Travis upgraded "Ubuntu 12.04 LTS" to a newer version whose repo will have a more up-to-date libtorrent package
#- lt_branch=dist gui=true #- lt_branch=dist gui=true
#- lt_branch=dist gui=false #- lt_branch=dist gui=false
- lt_branch=RC_1_0 qt=5 gui=true - lt_branch=RC_1_0 gui=true build_system=cmake
- lt_branch=RC_1_0 qt=5 gui=false - lt_branch=RC_1_0 gui=false build_system=cmake
- lt_branch=RC_1_0 qt=4 gui=true - lt_branch=RC_1_0 gui=true build_system=qmake
- lt_branch=RC_1_0 qt=4 gui=false - lt_branch=RC_1_0 gui=false build_system=qmake
global: global:
- secure: "OI9CUjj4lTb0HwwIZU5PbECU3hLlAL6KC8KsbwohG8/O3j5fLcnmDsK4Ad9us5cC39sS11Jcd1kDP2qRcCuST/glVNhLkcjKkiQerOfd5nQ/qL4JYfz/1mfP5mdpz9jHKzpLUIG+TXkbSTjP6VVmsb5KPT+3pKEdRFZB+Pu9+J8=" - secure: "OI9CUjj4lTb0HwwIZU5PbECU3hLlAL6KC8KsbwohG8/O3j5fLcnmDsK4Ad9us5cC39sS11Jcd1kDP2qRcCuST/glVNhLkcjKkiQerOfd5nQ/qL4JYfz/1mfP5mdpz9jHKzpLUIG+TXkbSTjP6VVmsb5KPT+3pKEdRFZB+Pu9+J8="
- coverity_branch: coverity_scan - coverity_branch: coverity_scan
matrix: matrix:
allow_failures: allow_failures:
- os: osx - env: lt_branch=RC_1_0 gui=true build_system=cmake
env: lt_branch=RC_1_0 qt=4 gui=true - env: lt_branch=RC_1_0 gui=false build_system=cmake
- os: osx
env: lt_branch=RC_1_0 qt=4 gui=false
branches: branches:
except: except:
...@@ -56,29 +55,24 @@ addons: ...@@ -56,29 +55,24 @@ addons:
apt: apt:
sources: sources:
# sources list: https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json # sources list: https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json
#- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
#- boost-latest #- boost-latest
- sourceline: 'ppa:qbittorrent-team/qbittorrent-stable' - sourceline: 'ppa:qbittorrent-team/qbittorrent-stable'
- sourceline: 'ppa:beineri/opt-qt551-trusty' - sourceline: 'ppa:beineri/opt-qt551-trusty'
- sourceline: 'ppa:adrozdoff/cmake'
packages: packages:
# packages list: https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise # packages list: https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
- autoconf - [autoconf, automake, colormake]
- automake - [cmake, ninja-build]
- colormake
- libssl-dev - libssl-dev
- libboost-dev - [libboost-dev, libboost-system-dev]
- libboost-system-dev
- libtorrent-rasterbar-dev - libtorrent-rasterbar-dev
# Qt 5.5.1 - [qt55base, qt55svg, qt55tools]
- qt55base - [gcc-6, g++-6]
- qt55tools
# Qt 4.8
- qt4-default
- libqt4-dev
before_install: before_install:
# only allow specific build for coverity scan, others will stop # only allow specific build for coverity scan, others will stop
- if [ "$TRAVIS_BRANCH" = "$coverity_branch" ] && ! [ "$TRAVIS_OS_NAME" = "linux" -a "$lt_branch" = "RC_1_0" -a "$gui" = true ]; then exit ; fi - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ] && ! [ "$TRAVIS_OS_NAME" = "linux" -a "$lt_branch" = "RC_1_0" -a "$gui" = true -a "$build_system" = "qmake" ]; then exit ; fi
- shopt -s expand_aliases - shopt -s expand_aliases
- alias make="colormake -j3" # Using nprocs/2 sometimes may fail (gcc is killed by system) - alias make="colormake -j3" # Using nprocs/2 sometimes may fail (gcc is killed by system)
...@@ -88,7 +82,6 @@ before_install: ...@@ -88,7 +82,6 @@ before_install:
- qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH="$libt_path/lib/pkgconfig":/opt/qt55/lib/pkgconfig:$PKG_CONFIG_PATH" - qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH="$libt_path/lib/pkgconfig":/opt/qt55/lib/pkgconfig:$PKG_CONFIG_PATH"
# options for specific branches # options for specific branches
- if [ "$qt" = 4 ]; then qbtconf="$qbtconf --with-qt4" ; fi
- if [ "$gui" = false ]; then qbtconf="$qbtconf --disable-gui" ; fi - if [ "$gui" = false ]; then qbtconf="$qbtconf --disable-gui" ; fi
- | - |
if [ "$TRAVIS_OS_NAME" = "linux" ]; then if [ "$TRAVIS_OS_NAME" = "linux" ]; then
...@@ -97,11 +90,17 @@ before_install: ...@@ -97,11 +90,17 @@ before_install:
# Qt 5 # Qt 5
PATH=/opt/qt55/bin:${PATH} PATH=/opt/qt55/bin:${PATH}
if [ "$build_system" = "cmake" ]; then
COMPILER_VERSION=6
export CXX="${CXX}-${COMPILER_VERSION}" CC="${CC}-${COMPILER_VERSION}"
fi
fi fi
# print settings # print settings
- echo $lt_branch - echo $lt_branch
- echo $gui - echo $gui
- echo $build_system
- echo $ltconf - echo $ltconf
- echo $qbtconf - echo $qbtconf
...@@ -110,49 +109,46 @@ install: ...@@ -110,49 +109,46 @@ install:
#if [ "$TRAVIS_OS_NAME" = "linux" ]; then #if [ "$TRAVIS_OS_NAME" = "linux" ]; then
# build libtorrent from source # build libtorrent from source
#if [ "$lt_branch" != "dist" ]; then #if [ "$lt_branch" != "dist" ]; then
#cd "$HOME" && pwd && git clone --depth 1 https://github.com/arvidn/libtorrent.git --branch $lt_branch ; #cd "$HOME" && pwd && git clone --depth 1 https://github.com/arvidn/libtorrent.git --branch $lt_branch
#cd libtorrent && ./autotool.sh && ./configure $ltconf && make install ; #cd libtorrent && ./autotool.sh && ./configure $ltconf && make install
#fi ; #fi
#fi #fi
- | - |
if [ "$TRAVIS_OS_NAME" = "osx" ]; then if [ "$TRAVIS_OS_NAME" = "osx" ]; then
# dependencies # dependencies
brew update > /dev/null brew update > /dev/null
brew install colormake ccache zlib
PATH="/usr/local/opt/ccache/libexec:$PATH"
brew link --force zlib
brew outdated "pkg-config" || brew upgrade "pkg-config" brew outdated "pkg-config" || brew upgrade "pkg-config"
brew install colormake ccache zlib qt
PATH="/usr/local/opt/ccache/libexec:$PATH"
brew link --force zlib qt
wget https://builds.shiki.hu/homebrew/version ; wget https://builds.shiki.hu/homebrew/version
if ! cmp --quiet "version" "$HOME/hombebrew_cache/version" ; then if ! cmp --quiet "version" "$HOME/hombebrew_cache/version" ; then
echo "Cached files are different from server. Downloading new ones." ; echo "Cached files are different from server. Downloading new ones."
# First delete old files # First delete old files
rm -r "$HOME/hombebrew_cache" ; rm -r "$HOME/hombebrew_cache"
mkdir "$HOME/hombebrew_cache"; mkdir "$HOME/hombebrew_cache"
cp "version" $HOME/hombebrew_cache ; cp "version" $HOME/hombebrew_cache
cd "$HOME/hombebrew_cache" ; cd "$HOME/hombebrew_cache"
wget https://builds.shiki.hu/homebrew/libtorrent-rasterbar.rb ; wget https://builds.shiki.hu/homebrew/libtorrent-rasterbar.rb
wget https://builds.shiki.hu/homebrew/libtorrent-rasterbar-1.0.11+git20172003.8736a59adc.el_capitan.bottle.tar.gz wget https://builds.shiki.hu/homebrew/libtorrent-rasterbar-1.0.11+git20170910.6d5625e0ea.el_capitan.bottle.tar.gz
wget https://builds.shiki.hu/homebrew/qt.rb
wget https://builds.shiki.hu/homebrew/qt-5.9.1.el_capitan.bottle.tar.gz
fi fi
# Copy custom libtorrent bottle to homebrew's cache so it can find and install it # Copy custom libtorrent bottle to homebrew's cache so it can find and install it
# Also install our custom libtorrent formula by passing the local path to it # Also install our custom libtorrent formula by passing the local path to it
# These 2 files are restored from Travis' cache. # These 2 files are restored from Travis' cache.
cp "$HOME/hombebrew_cache/libtorrent-rasterbar-1.0.11+git20172003.8736a59adc.el_capitan.bottle.tar.gz" "$(brew --cache)" cp "$HOME/hombebrew_cache/libtorrent-rasterbar-1.0.11+git20170910.6d5625e0ea.el_capitan.bottle.tar.gz" "$(brew --cache)"
brew install "$HOME/hombebrew_cache/libtorrent-rasterbar.rb" ; brew install "$HOME/hombebrew_cache/libtorrent-rasterbar.rb"
# Qt if [ "$build_system" = "cmake" ]; then
if [ "$qt" = 4 ]; then brew install qt && ln -s /usr/local/Cellar/qt/4.8.7_2/plugins /usr/local ; fi ; brew outdated cmake || brew upgrade cmake
if [ "$qt" = 5 ]; then brew install ninja
# Copy custom qt5 bottle to homebrew's cache so it can find and install it
# Also install our custom qt5 formula by passing the local path to it ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs
# These 2 files are restored from Travis' cache. ln -s /usr/local/opt/qt/plugins /usr/local/plugins
cp "$HOME/hombebrew_cache/qt-5.9.1.el_capitan.bottle.tar.gz" "$(brew --cache)"
brew install "$HOME/hombebrew_cache/qt.rb"
brew link --force qt
fi fi
MY_CMAKE_OPENSSL_HINT="-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl/"
fi fi
- | - |
if [ "$TRAVIS_BRANCH" != "$coverity_branch" ]; then if [ "$TRAVIS_BRANCH" != "$coverity_branch" ]; then
...@@ -162,22 +158,37 @@ install: ...@@ -162,22 +158,37 @@ install:
script: script:
- if [ "$TRAVIS_BRANCH" = "$coverity_branch" ]; then exit ; fi # skip usual build when running coverity scan - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ]; then exit ; fi # skip usual build when running coverity scan
- cd "$TRAVIS_BUILD_DIR" && ./bootstrap.sh && ./configure $qbtconf
- | - |
if [ "$TRAVIS_OS_NAME" = "osx" ]; then cd "$TRAVIS_BUILD_DIR"
sed -i "" -e "s/^\(CC.*&&\).*$/\1 $CC/" src/Makefile ; # workaround for Qt & ccache: https://bugreports.qt.io/browse/QTBUG-31034 if [ "$build_system" = "cmake" ]; then
sed -i "" -e "s/^\(CXX.*&&\).*$/\1 $CXX/" src/Makefile ; mkdir build
sed -i "" -e 's/^\(CXXFLAGS.*\)$/\1 -Wno-unused-local-typedefs -Wno-inconsistent-missing-override/' src/Makefile ;