From e97b2a8bfc7a3f3181b9c059db984d56d976a294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 28 Dec 2020 15:41:49 +0100 Subject: [PATCH 1/4] libtorrent-rasterbar: update to 1.2.11 Enforce using -std=c++14 because this is required for qbittorrent. --- srcpkgs/libtorrent-rasterbar/template | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template index 913b14a6558..97129251038 100644 --- a/srcpkgs/libtorrent-rasterbar/template +++ b/srcpkgs/libtorrent-rasterbar/template @@ -1,9 +1,8 @@ # Template file for 'libtorrent-rasterbar' # Breaks ABI/API without changing soname, revbump all dependants pkgname=libtorrent-rasterbar -reverts="1.2.9_1" -version=1.2.7 -revision=4 +version=1.2.11 +revision=1 build_style=gnu-configure configure_args="--enable-examples --enable-python-binding --with-boost=${XBPS_CROSS_BASE}/usr @@ -14,19 +13,24 @@ short_desc="C++ bittorrent library by Rasterbar Software" maintainer="Orphaned " license="BSD-3-Clause" homepage="https://libtorrent.org/" -distfiles="https://github.com/arvidn/libtorrent/releases/download/libtorrent_${version//./_}/libtorrent-rasterbar-${version}.tar.gz" -checksum=bc00069e65c0825cbe1eee5cdd26f94fcd9a621c4e7f791810b12fab64192f00 +distfiles="https://github.com/arvidn/libtorrent/releases/download/v${version}/${pkgname}-${version}.tar.gz" +checksum=cb6a9cc3c9a9e485174394baa82744cef8415d23a357f5721dcc9ee7622c4efb if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" fi +CXXFLAGS="-std=c++14" pre_configure() { local _py3_ver=${py3_ver}${py3_abiver} export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python${_py3_ver}" export PYTHON_CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python${_py3_ver}" export PYTHON_EXTRA_LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${_py3_ver}" + # Use -std=c++14 everywhere (tests, examples) + cp -pv m4/ax_cxx_compile_stdcxx_{11,14}.m4 + vsed -i m4/ax_cxx_compile_stdcxx_14.m4 -e "s;11;14;g" + vsed -i configure.ac -e "s;AX_CXX_COMPILE_STDCXX_11;AX_CXX_COMPILE_STDCXX_14;" autoreconf -fi } From e83304dbe2e6394d7bfa92af1452a28e6fcdb0d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 28 Dec 2020 15:42:22 +0100 Subject: [PATCH 2/4] qbittorrent: update to 4.3.2 --- srcpkgs/qbittorrent/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template index fdccf72aa5b..f808c46595a 100644 --- a/srcpkgs/qbittorrent/template +++ b/srcpkgs/qbittorrent/template @@ -1,6 +1,6 @@ # Template file for 'qbittorrent' pkgname=qbittorrent -version=4.3.1 +version=4.3.2 revision=1 create_wrksrc=yes build_style=qmake @@ -13,7 +13,7 @@ license="GPL-2.0-or-later" homepage="http://www.qbittorrent.org/" changelog="https://www.qbittorrent.org/news.php" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=796bd81f50b83dc6bde9a0c726137aca3df7d3385e779360b2304dfda6c151c5 +checksum=b58e377a26c6de91aa61a56cddc9399c52fb9c752444c761a52784943b2b8b4b if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-svg-devel" From ad2698045b25ff54b72fa5489c2d537df87a26aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 28 Dec 2020 15:44:53 +0100 Subject: [PATCH 3/4] deluge: revbump for libtorrent-rasterbar-1.2.11 --- srcpkgs/deluge/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template index 660a8d7eb7c..fb7679257fc 100644 --- a/srcpkgs/deluge/template +++ b/srcpkgs/deluge/template @@ -1,7 +1,7 @@ # Template file for 'deluge' pkgname=deluge version=2.0.3 -revision=9 +revision=10 build_style=python3-module # TODO package python3-slimit to minify javascript hostmakedepends="intltool python3-setuptools python3-wheel" From e408daaac8d2c339d15afd0508839eacf49326d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 28 Dec 2020 15:46:51 +0100 Subject: [PATCH 4/4] btfs: revbump for libtorrent-rasterbar-1.2.11 --- srcpkgs/btfs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/btfs/template b/srcpkgs/btfs/template index b70ea7d79be..78af3c6bcc9 100644 --- a/srcpkgs/btfs/template +++ b/srcpkgs/btfs/template @@ -1,7 +1,7 @@ # Template file for 'btfs' pkgname=btfs version=2.23 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake pkg-config" makedepends="boost-devel fuse-devel libcurl-devel libtorrent-rasterbar-devel"