Re: [PR PATCH] [Updated] libtorrent-rasterbar: update to 2.0.6.

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

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

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

https://github.com/ologantr/void-packages libtorrent-updates
https://github.com/void-linux/void-packages/pull/36926

libtorrent-rasterbar: update to 2.0.6.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture (x86_64-glibc)

I have mainly tested qbittorrent and is working as expected so far.
The patch that I have created for libtorrent-rasterbar is essentially
a revert of upstream commit https://github.com/arvidn/libtorrent/commit/55bbcdc4321dbcd899f783763d9390ecc3a09850.
Without this revert the generated pkg-config file has a bogus 
`-l-pthread` flag that then makes linking against libtorrent-rasterbar fail.
Please test :)

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

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

From c2b60f44568856fbb91430c50672c828ecc7313e Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Sat, 30 Apr 2022 14:36:55 +0200
Subject: [PATCH 1/4] libtorrent-rasterbar: update to 2.0.6.

---
 common/shlibs                                 |  2 +-
 .../patches/remove-pthread.patch              | 10 ++++++
 srcpkgs/libtorrent-rasterbar/template         | 36 ++++++++++++++-----
 3 files changed, 38 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/libtorrent-rasterbar/patches/remove-pthread.patch

diff --git a/common/shlibs b/common/shlibs
index 4114151662fb..e3fe0ca15031 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2082,7 +2082,7 @@ libldns.so.3 libldns-1.7.1_4
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
 libloudmouth-1.so.0 loudmouth-1.5.3_12
-libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.12_2
+libtorrent-rasterbar.so.2.0 libtorrent-rasterbar-2.0.6_1
 libcapstone.so.4 capstone-4.0_1
 libhavege.so.2 libhaveged-1.9.11_1
 libnih.so.1 libnih-1.0.3_1
diff --git a/srcpkgs/libtorrent-rasterbar/patches/remove-pthread.patch b/srcpkgs/libtorrent-rasterbar/patches/remove-pthread.patch
new file mode 100644
index 000000000000..a421e6069753
--- /dev/null
+++ b/srcpkgs/libtorrent-rasterbar/patches/remove-pthread.patch
@@ -0,0 +1,10 @@
+--- b/CMakeLists.txt
++++ a/CMakeLists.txt
+@@ -447,7 +447,6 @@
+ feature_option(BUILD_SHARED_LIBS "build libtorrent as a shared library" ON)
+ feature_option(static_runtime "build libtorrent with static runtime" OFF)
+ 
+-set(THREADS_PREFER_PTHREAD_FLAG ON)
+ find_public_dependency(Threads REQUIRED)
+ 
+ if(CMAKE_CXX_COMPILER_ID MATCHES Clang)
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index b1ceddc95282..2f62283b9f63 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -1,10 +1,10 @@
 # Template file for 'libtorrent-rasterbar'
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
-version=1.2.14
-revision=2
+version=2.0.6
+revision=1
 build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
+configure_args="-DCMAKE_CXX_STANDARD=14 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
 makedepends="openssl-devel boost-devel geoip-devel python3-devel"
@@ -13,23 +13,41 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://libtorrent.org/"
 distfiles="https://github.com/arvidn/libtorrent/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=9e27bf359b45236d4490960faffc796528f3adbdea6aeb6881d39f310e27953f
-
-if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -Dbuild_tests=ON"
-fi
+checksum=438e29272ff41ccc68ec7530f1b98d639f6d01ec8bf680766336ae202a065722
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) make_check=no # tests fail to compile on 32bit
+	;;
+	*) [ "$XBPS_CHECK_PKGS" ] && configure_args+=" -Dbuild_tests=on"
+	;;
+esac
+
+do_check() {
+	# taken from alpine
+	local tests_to_skip="test_upnp|test_flags|test_remove_torrent|test_privacy"
+
+	# broken, for now
+	tests_to_skip="$tests_to_skip|test_create_torrent"
+
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*) tests_to_skip="$tests_to_skip|test_url_seed|test_session_params" ;;
+		*) ;;
+	esac
+
+	export CTEST_PARALLEL_LEVEL="$XBPS_MAKEJOBS"
+	ctest --output-on-failure --test-dir build --exclude-regex "$tests_to_skip"
+}
+
 pre_configure() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		vsed -i CMakeLists.txt -e "s;Threads::Threads;& atomic;"
 	fi
 }
 
-
 post_install() {
 	local f
 

From b1512c1cb08f110f330afe7011d48cf29de33f62 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Sat, 30 Apr 2022 18:44:48 +0200
Subject: [PATCH 2/4] btfs: revbump for libtorrent-rasterbar.

---
 srcpkgs/btfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/btfs/template b/srcpkgs/btfs/template
index a41afd1e2db5..eead540d33a2 100644
--- a/srcpkgs/btfs/template
+++ b/srcpkgs/btfs/template
@@ -1,7 +1,7 @@
 # Template file for 'btfs'
 pkgname=btfs
 version=2.24
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="boost-devel fuse-devel libcurl-devel libtorrent-rasterbar-devel"

From 38312af357024efd13479ceecf9b2ea833b7d9b8 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Sat, 30 Apr 2022 18:54:04 +0200
Subject: [PATCH 3/4] qbittorrent: revbump for libtorrent-rasterbar.

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index b80695e80958..fe8a6583ba2d 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.4.2
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=gnu-configure
 build_helper=qmake

From ce28a5803e717992ed196a1f183a5c2a1689bacc Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Sat, 30 Apr 2022 18:55:18 +0200
Subject: [PATCH 4/4] deluge: revbump for libtorrent-rasterbar.

---
 srcpkgs/deluge/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index bdb186148072..8124c09f0ca3 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.5
-revision=1
+revision=2
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"