Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] libtorrent-rasterbar: update to 2.0.6.
@ 2022-04-30 17:29 ologantr
  2022-04-30 19:55 ` [PR PATCH] [Updated] " ologantr
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: ologantr @ 2022-04-30 17:29 UTC (permalink / raw)
  To: ml

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

There is a new 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: 4954 bytes --]

From 443cc47e8dd50356aaf605a868a4b13b45d3112c 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 +-
 .../libtorrent-rasterbar/patches/remove-pthread.patch  | 10 ++++++++++
 srcpkgs/libtorrent-rasterbar/template                  |  8 ++++----
 3 files changed, 15 insertions(+), 5 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..77f70eac8599 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,7 +13,7 @@ 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
+checksum=438e29272ff41ccc68ec7530f1b98d639f6d01ec8bf680766336ae202a065722
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dbuild_tests=ON"

From 23582a54ffca693d4d930a1d6207d0fd4dc3387a 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 d86ccdba8d2dfe0f186aa40ef7f4432da6790a04 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 f84dd1631e269896a340ec7a2e4970004a0252d6 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"

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] libtorrent-rasterbar: update to 2.0.6.
  2022-04-30 17:29 [PR PATCH] libtorrent-rasterbar: update to 2.0.6 ologantr
@ 2022-04-30 19:55 ` ologantr
  2022-06-01 15:20 ` ologantr
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: ologantr @ 2022-04-30 19:55 UTC (permalink / raw)
  To: ml

[-- 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"

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] libtorrent-rasterbar: update to 2.0.6.
  2022-04-30 17:29 [PR PATCH] libtorrent-rasterbar: update to 2.0.6 ologantr
  2022-04-30 19:55 ` [PR PATCH] [Updated] " ologantr
@ 2022-06-01 15:20 ` ologantr
  2022-06-01 20:53 ` ologantr
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: ologantr @ 2022-06-01 15:20 UTC (permalink / raw)
  To: ml

[-- 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: 6337 bytes --]

From 6dd1bd2bd50e2f67716e90e02133a0a7892e2c4f 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 0541c2dea7e8..21fbbf2ad87c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2081,7 +2081,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..fb1058beeb0d 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 3c21d8eac01dcbafd11477fe0a7317cb30ef8b12 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 de65272f012d86f07e792463c7ab1917c70d203d 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 ada2ed429f26..efc0270bb61b 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.4.3.1
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=gnu-configure
 build_helper=qmake

From cae4015824b5491587d2773ff18587bb3558d84e 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.

Also, disable checks for now as some of
them fail with libtorrent-rasterbar 2.x.
---
 srcpkgs/deluge/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index bdb186148072..b5fa2752a6f6 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"
@@ -17,6 +17,7 @@ homepage="https://deluge-torrent.org/"
 changelog="https://raw.githubusercontent.com/deluge-torrent/deluge/develop/CHANGELOG.md"
 distfiles="https://ftp.osuosl.org/pub/deluge/source/2.0/deluge-${version}.tar.xz"
 checksum=c4bd04abfd211b65218be03f3c46d26f44024884de10e01859fb856fdd6f25d8
+make_check=no # one test segfaults, another is failing, taken from alpine
 
 system_accounts="deluge"
 deluge_homedir="/var/lib/deluge"

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] libtorrent-rasterbar: update to 2.0.6.
  2022-04-30 17:29 [PR PATCH] libtorrent-rasterbar: update to 2.0.6 ologantr
  2022-04-30 19:55 ` [PR PATCH] [Updated] " ologantr
  2022-06-01 15:20 ` ologantr
@ 2022-06-01 20:53 ` ologantr
  2022-09-29  2:14 ` github-actions
  2022-10-13  2:15 ` [PR PATCH] [Closed]: " github-actions
  4 siblings, 0 replies; 6+ messages in thread
From: ologantr @ 2022-06-01 20:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1199 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 :)

Edit: Deluge 2.0.5 seems stable with libtorrent-rasterbar 2.x, but some
tests are failing. For now I've disabled them.
https://git.alpinelinux.org/aports/tree/community/deluge/APKBUILD
https://github.com/deluge-torrent/deluge/pull/312 (this seems in some way related)

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: 6390 bytes --]

From 35a0997fd59cf5d6b41f9650de5672e65f49c7ad 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         | 37 ++++++++++++++-----
 3 files changed, 39 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/libtorrent-rasterbar/patches/remove-pthread.patch

diff --git a/common/shlibs b/common/shlibs
index 0541c2dea7e8..21fbbf2ad87c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2081,7 +2081,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..06a6cc47b207 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,42 @@ 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"
+
+	# test_copy_file fails on x86_64* CI
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*) tests_to_skip="$tests_to_skip|test_url_seed|test_session_params|test_copy_file" ;;
+		*) ;;
+	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 13219ddf885b9c362be967f20d905578ec95aff0 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 90eee77d1f13d18c55dfb11f28d476d92993b56a 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 ada2ed429f26..efc0270bb61b 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.4.3.1
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=gnu-configure
 build_helper=qmake

From 84e251cb21c9a26d757017ec67fbafc7114b913d 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.

Also, disable checks for now as some of
them fail with libtorrent-rasterbar 2.x.
---
 srcpkgs/deluge/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index bdb186148072..b5fa2752a6f6 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"
@@ -17,6 +17,7 @@ homepage="https://deluge-torrent.org/"
 changelog="https://raw.githubusercontent.com/deluge-torrent/deluge/develop/CHANGELOG.md"
 distfiles="https://ftp.osuosl.org/pub/deluge/source/2.0/deluge-${version}.tar.xz"
 checksum=c4bd04abfd211b65218be03f3c46d26f44024884de10e01859fb856fdd6f25d8
+make_check=no # one test segfaults, another is failing, taken from alpine
 
 system_accounts="deluge"
 deluge_homedir="/var/lib/deluge"

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: libtorrent-rasterbar: update to 2.0.6.
  2022-04-30 17:29 [PR PATCH] libtorrent-rasterbar: update to 2.0.6 ologantr
                   ` (2 preceding siblings ...)
  2022-06-01 20:53 ` ologantr
@ 2022-09-29  2:14 ` github-actions
  2022-10-13  2:15 ` [PR PATCH] [Closed]: " github-actions
  4 siblings, 0 replies; 6+ messages in thread
From: github-actions @ 2022-09-29  2:14 UTC (permalink / raw)
  To: ml

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/36926#issuecomment-1261655763

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Closed]: libtorrent-rasterbar: update to 2.0.6.
  2022-04-30 17:29 [PR PATCH] libtorrent-rasterbar: update to 2.0.6 ologantr
                   ` (3 preceding siblings ...)
  2022-09-29  2:14 ` github-actions
@ 2022-10-13  2:15 ` github-actions
  4 siblings, 0 replies; 6+ messages in thread
From: github-actions @ 2022-10-13  2:15 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

libtorrent-rasterbar: update to 2.0.6.
https://github.com/void-linux/void-packages/pull/36926

Description:
#### 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 :)

Edit: Deluge 2.0.5 seems stable with libtorrent-rasterbar 2.x, but some
tests are failing. For now I've disabled them.
https://git.alpinelinux.org/aports/tree/community/deluge/APKBUILD
https://github.com/deluge-torrent/deluge/pull/312 (this seems in some way related)

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-10-13  2:15 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-30 17:29 [PR PATCH] libtorrent-rasterbar: update to 2.0.6 ologantr
2022-04-30 19:55 ` [PR PATCH] [Updated] " ologantr
2022-06-01 15:20 ` ologantr
2022-06-01 20:53 ` ologantr
2022-09-29  2:14 ` github-actions
2022-10-13  2:15 ` [PR PATCH] [Closed]: " github-actions

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).