Re: [PR PATCH] [Updated] qbittorrent: update to 4.3.2

[pullmoll <pullmoll@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 654 bytes --]

There is an updated pull request by pullmoll against master on the void-packages repository

https://github.com/pullmoll/void-packages qbittorrent
https://github.com/void-linux/void-packages/pull/27503

qbittorrent: update to 4.3.2
The update requires a newer libtorrent-rasterbar so I upgraded this to 1.2.11 and bumped its dependencies.

The previous revert of libtorrent-raster was because of the ABI breakage it seems, so revbumping the 2 dependencies should be sufficient. Built and tested here for x86_64. Anyone uses deluge or btfs to test if they work?

A patch file from https://github.com/void-linux/void-packages/pull/27503.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qbittorrent-27503.patch --]
[-- Type: text/x-diff, Size: 6157 bytes --]

From b9d2fd26f711b44d3345cd4786935b1923ab986c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 28 Dec 2020 15:41:49 +0100
Subject: [PATCH 1/4] libtorrent-rasterbar: update to 1.2.11

Enforce using -std=c++11 for compatibility with dependencies
---
 srcpkgs/libtorrent-rasterbar/template | 55 ++++++++++++---------------
 1 file changed, 25 insertions(+), 30 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 913b14a6558..e7e0daed934 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -1,50 +1,43 @@
 # 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
-build_style=gnu-configure
-configure_args="--enable-examples --enable-python-binding
- --with-boost=${XBPS_CROSS_BASE}/usr
- --with-boost-python=boost_python${py3_ver//./}"
-hostmakedepends="automake pkg-config intltool libtool python3-devel"
+version=1.2.11
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
+ -Dpython-bindings=ON"
+hostmakedepends="pkg-config intltool libtool python3-devel"
 makedepends="libressl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 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_CHECK_PKGS" ]; then
+	configure_args+=" -Dbuild_tests=ON"
+fi
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
-	LDFLAGS+=" -latomic"
 fi
 
 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}"
-	autoreconf -fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do
-			f=${f##*/}
-			export _PYTHON_SYSCONFIGDATA_NAME=${f%.py}
-		done
-		export PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib}
+	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+		vsed -i CMakeLists.txt -e "s;Threads::Threads;& atomic;"
 	fi
 }
 
-pre_install() {
-	pre_build
-}
 
 post_install() {
+	local f
+
+	# Install examples. They are not installed with make install :P
+	for f in client_test connection_tester dump_torrent simple_client upnp_test \
+		custom_storage make_torrent stats_counters; do
+		vbin ${wrksrc}/build/examples/${f}
+	done
 	vlicense LICENSE
 }
 
@@ -58,13 +51,15 @@ libtorrent-rasterbar-python3_package() {
 
 libtorrent-rasterbar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+		depends+=" libatomic-devel"
+	fi
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/share/cmake
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.a"
 	}
 }
 

From a93e2135a3a9338ce7d61f5eed5a883f45363e9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
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 3db1024e9b23d14638cdfc46cecc011b792e0efc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
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 507ef85937efb28f88c42fcdd812e05fe0795845 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
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"