From 3e5f8c64d49c998b2e5da05dda9e99f82a01126f Mon Sep 17 00:00:00 2001 From: "Vladimir Golovnev (glassez)" Date: Tue, 30 Mar 2021 19:29:55 +0300 Subject: [PATCH] Raise minimum libtorrent version to 1.2.13 (2.0.3) --- .github/workflows/ci.yaml | 2 +- .travis.yml | 4 ++-- CMakeLists.txt | 2 +- INSTALL | 2 +- configure | 18 +++++++++--------- configure.ac | 2 +- vcpkg/libtorrent/CONTROL | 2 +- vcpkg/libtorrent/portfile.cmake | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e4eb4a5e2..f81587415 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,7 +14,7 @@ env: VCPKG_COMMIT: e4ce66eecfd3e5cca5eac06c971921bf8e37cf88 VCPKG_DEST_MACOS: /Users/runner/qbt_tools/vcpkg VCPKG_DEST_WIN: C:\qbt_tools\vcpkg - LIBTORRENT_VERSION_TAG: v1.2.12 + LIBTORRENT_VERSION_TAG: v1.2.13 jobs: diff --git a/.travis.yml b/.travis.yml index dbf00b2df..e153540f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -125,7 +125,7 @@ install: pushd "$HOME" git clone --single-branch --branch RC_1_2 https://github.com/arvidn/libtorrent.git cd libtorrent - git checkout tags/v1.2.12 + git checkout tags/v1.2.13 cmake \ -DCMAKE_BUILD_TYPE=Release \ @@ -140,7 +140,7 @@ install: pushd "$HOME" git clone --single-branch --branch RC_2_0 https://github.com/arvidn/libtorrent.git cd libtorrent - git checkout tags/v2.0.2 + git checkout tags/v2.0.3 git submodule update --init --recursive cmake \ diff --git a/CMakeLists.txt b/CMakeLists.txt index a4da313ef..8bd11a665 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON) set(minBoostVersion 1.65) set(minQtVersion 5.12) set(minOpenSSLVersion 1.1.1) -set(minLibtorrentVersion 1.2.12) +set(minLibtorrentVersion 1.2.13) set(minZlibVersion 1.2.11) # features (some are platform-specific) diff --git a/INSTALL b/INSTALL index 51b0220f9..ff2eb3dc6 100644 --- a/INSTALL +++ b/INSTALL @@ -5,7 +5,7 @@ qBittorrent - A BitTorrent client in C++ / Qt - Boost >= 1.65 - - libtorrent-rasterbar >= 1.2.12 (by Arvid Norberg) + - libtorrent-rasterbar >= 1.2.13 (by Arvid Norberg) * https://www.libtorrent.org/ * Be careful: another library (the one used by rTorrent) uses a similar name diff --git a/configure b/configure index da4254f38..b8636ab5c 100755 --- a/configure +++ b/configure @@ -6354,12 +6354,12 @@ if test -n "$libtorrent_CFLAGS"; then pkg_cv_libtorrent_CFLAGS="$libtorrent_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.2.12\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.2.12") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.2.13\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.2.13") 2>&5 ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_libtorrent_CFLAGS=`$PKG_CONFIG --cflags "libtorrent-rasterbar >= 1.2.12" 2>/dev/null` + pkg_cv_libtorrent_CFLAGS=`$PKG_CONFIG --cflags "libtorrent-rasterbar >= 1.2.13" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -6371,12 +6371,12 @@ if test -n "$libtorrent_LIBS"; then pkg_cv_libtorrent_LIBS="$libtorrent_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.2.12\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.2.12") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.2.13\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.2.13") 2>&5 ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_libtorrent_LIBS=`$PKG_CONFIG --libs "libtorrent-rasterbar >= 1.2.12" 2>/dev/null` + pkg_cv_libtorrent_LIBS=`$PKG_CONFIG --libs "libtorrent-rasterbar >= 1.2.13" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -6397,14 +6397,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - libtorrent_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtorrent-rasterbar >= 1.2.12" 2>&1` + libtorrent_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtorrent-rasterbar >= 1.2.13" 2>&1` else - libtorrent_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtorrent-rasterbar >= 1.2.12" 2>&1` + libtorrent_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtorrent-rasterbar >= 1.2.13" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$libtorrent_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libtorrent-rasterbar >= 1.2.12) were not met: + as_fn_error $? "Package requirements (libtorrent-rasterbar >= 1.2.13) were not met: $libtorrent_PKG_ERRORS diff --git a/configure.ac b/configure.ac index 28b14611c..eb179fca7 100644 --- a/configure.ac +++ b/configure.ac @@ -180,7 +180,7 @@ AC_MSG_NOTICE([Boost.System LIB: "$BOOST_SYSTEM_LIB"]) LIBS="$BOOST_SYSTEM_LIB $LIBS" PKG_CHECK_MODULES(libtorrent, - [libtorrent-rasterbar >= 1.2.12], + [libtorrent-rasterbar >= 1.2.13], [CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS" LIBS="$libtorrent_LIBS $LIBS"]) diff --git a/vcpkg/libtorrent/CONTROL b/vcpkg/libtorrent/CONTROL index 5dd5dcf0a..1ff88ab6e 100644 --- a/vcpkg/libtorrent/CONTROL +++ b/vcpkg/libtorrent/CONTROL @@ -1,5 +1,5 @@ Source: libtorrent -Version: 1.2.12 +Version: 1.2.13 Homepage: https://github.com/arvidn/libtorrent Description: An efficient feature complete C++ BitTorrent implementation Build-Depends: openssl, boost-system, boost-date-time, boost-chrono, boost-random, boost-asio, boost-crc, boost-config, boost-iterator, boost-scope-exit, boost-multiprecision, boost-pool, boost-variant diff --git a/vcpkg/libtorrent/portfile.cmake b/vcpkg/libtorrent/portfile.cmake index a50d73993..5c5f2cdb9 100644 --- a/vcpkg/libtorrent/portfile.cmake +++ b/vcpkg/libtorrent/portfile.cmake @@ -37,8 +37,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arvidn/libtorrent - REF v1.2.12 - SHA512 78be4c12e12f593154eda0960aaf9583fe27310e0223dbb21220400c5339744c9b2b11afa880fea30f77b4c0d07345937ff8a20d58d2d4ed7dcda84601380e20 + REF v1.2.13 + SHA512 1f295303c93c5525e0e40d3d0a7543b3a1fb99d53078dc7cdb70790e57898270df6292cc37348bb87906529568fb8fe3e32f5472afa620d597c8d149201bb1f0 HEAD_REF RC_1_2 PATCHES ${ICONV_PATCH}