* [PR PATCH] qbittorrent: update to 4.3.2
@ 2020-12-28 16:19 pullmoll
2020-12-28 16:23 ` ericonr
` (11 more replies)
0 siblings, 12 replies; 13+ messages in thread
From: pullmoll @ 2020-12-28 16:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 686 bytes --]
There is a new 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, added the now required `-std=c++14` 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: 4266 bytes --]
From 6c49f3f6e636a4699de1708a20e82f72bd3525ce 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
Update required for qbittorrent.
---
srcpkgs/libtorrent-rasterbar/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 913b14a6558..f962ce48bd6 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,13 +13,14 @@ short_desc="C++ bittorrent library by Rasterbar Software"
maintainer="Orphaned <orphan@voidlinux.org>"
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}
From 59698a844f0336a000e856428c8341cc6a786c6a 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 3a75c042c55e6e32cac5f7c143363abd5ea0b8ea 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 e5b08dd0cd7362a394daba10391764f85b77f5ce 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"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: qbittorrent: update to 4.3.2
2020-12-28 16:19 [PR PATCH] qbittorrent: update to 4.3.2 pullmoll
@ 2020-12-28 16:23 ` ericonr
2020-12-28 17:59 ` pullmoll
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: ericonr @ 2020-12-28 16:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 341 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27503#issuecomment-751772734
Comment:
> The previous revert of libtorrent-raster was because of the ABI breakage it seems
ABI breakage + I couldn't build one of the dependants at all.
I use qbittorrent, but I can test Deluge anyway.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: qbittorrent: update to 4.3.2
2020-12-28 16:19 [PR PATCH] qbittorrent: update to 4.3.2 pullmoll
2020-12-28 16:23 ` ericonr
@ 2020-12-28 17:59 ` pullmoll
2020-12-29 12:00 ` [PR PATCH] [Updated] " pullmoll
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: pullmoll @ 2020-12-28 17:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 264 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/27503#issuecomment-751809674
Comment:
Hmm .. the check still uses c++11 which of course fails. It seems it uses different CXXFLAGS, i.e. loses the `-std=c++14`.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] qbittorrent: update to 4.3.2
2020-12-28 16:19 [PR PATCH] qbittorrent: update to 4.3.2 pullmoll
2020-12-28 16:23 ` ericonr
2020-12-28 17:59 ` pullmoll
@ 2020-12-29 12:00 ` pullmoll
2020-12-29 15:35 ` pullmoll
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: pullmoll @ 2020-12-29 12:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 691 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, added the now required `-std=c++14` 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: 4793 bytes --]
From e97b2a8bfc7a3f3181b9c059db984d56d976a294 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++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 <orphan@voidlinux.org>"
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?= <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 ad2698045b25ff54b72fa5489c2d537df87a26aa 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 e408daaac8d2c339d15afd0508839eacf49326d6 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"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] qbittorrent: update to 4.3.2
2020-12-28 16:19 [PR PATCH] qbittorrent: update to 4.3.2 pullmoll
` (2 preceding siblings ...)
2020-12-29 12:00 ` [PR PATCH] [Updated] " pullmoll
@ 2020-12-29 15:35 ` pullmoll
2020-12-29 16:50 ` pullmoll
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: pullmoll @ 2020-12-29 15:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 691 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, added the now required `-std=c++14` 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: 5775 bytes --]
From b88d1a200e1a1427369d9f4d49d5ffb6e2ca6dbb 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++14 because this is required for qbittorrent.
---
srcpkgs/libtorrent-rasterbar/template | 54 ++++++++++-----------------
1 file changed, 20 insertions(+), 34 deletions(-)
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 913b14a6558..557c05e2a45 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -1,50 +1,37 @@
# 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=14 -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}
- 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
}
@@ -64,7 +51,6 @@ libtorrent-rasterbar-devel_package() {
vmove usr/share/cmake
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove "usr/lib/*.a"
}
}
From 145d49657b623d419d043307a70b65e80ec11496 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 57e929e31a1394b3928f7ce4d314c617d8e28c21 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 f31941e7d84f69db5f927673dcbc4c47f2676108 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"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] qbittorrent: update to 4.3.2
2020-12-28 16:19 [PR PATCH] qbittorrent: update to 4.3.2 pullmoll
` (3 preceding siblings ...)
2020-12-29 15:35 ` pullmoll
@ 2020-12-29 16:50 ` pullmoll
2020-12-29 16:56 ` pullmoll
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: pullmoll @ 2020-12-29 16:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 691 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, added the now required `-std=c++14` 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: 5876 bytes --]
From 2920c33301af9063e2d326ee27712e5958aae39c 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++14 because this is required for qbittorrent.
---
srcpkgs/libtorrent-rasterbar/template | 52 ++++++++++++---------------
1 file changed, 22 insertions(+), 30 deletions(-)
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 913b14a6558..9f6d344ab5f 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=14 -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
}
@@ -64,7 +57,6 @@ libtorrent-rasterbar-devel_package() {
vmove usr/share/cmake
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove "usr/lib/*.a"
}
}
From bc9d6a95e90d2f050826c691fea112612e9181c9 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 465a911cbe0f94eeed906b05055c54455bf1302f 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 53be0df4c5336fed318a55d25255d99e92684e56 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"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: qbittorrent: update to 4.3.2
2020-12-28 16:19 [PR PATCH] qbittorrent: update to 4.3.2 pullmoll
` (4 preceding siblings ...)
2020-12-29 16:50 ` pullmoll
@ 2020-12-29 16:56 ` pullmoll
2021-01-01 13:24 ` [PR PATCH] [Updated] " pullmoll
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: pullmoll @ 2020-12-29 16:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/27503#issuecomment-752158367
Comment:
Switched to cmake. Some tests are failing locally, too. And the `test_torrent` test seems to hang.
Still, the libtorrent-rasterbar update should be ok and works with qbittorrent.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] qbittorrent: update to 4.3.2
2020-12-28 16:19 [PR PATCH] qbittorrent: update to 4.3.2 pullmoll
` (5 preceding siblings ...)
2020-12-29 16:56 ` pullmoll
@ 2021-01-01 13:24 ` pullmoll
2021-01-01 13:56 ` pullmoll
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: pullmoll @ 2021-01-01 13:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 691 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, added the now required `-std=c++14` 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: 5870 bytes --]
From bfb9e7704c00f42d65bb6ae54301bfd2a9a635c2 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 | 52 ++++++++++++---------------
1 file changed, 22 insertions(+), 30 deletions(-)
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 913b14a6558..bab3b181d1c 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
}
@@ -64,7 +57,6 @@ libtorrent-rasterbar-devel_package() {
vmove usr/share/cmake
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove "usr/lib/*.a"
}
}
From a15345252823032b8973df12d1089e3b0c1666ce 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 a4e865d7be414ee6f3f492b71f153a8e7055cd58 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 b22efa27f11ec5ce0a625af412f637170169f9e9 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"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: qbittorrent: update to 4.3.2
2020-12-28 16:19 [PR PATCH] qbittorrent: update to 4.3.2 pullmoll
` (6 preceding siblings ...)
2021-01-01 13:24 ` [PR PATCH] [Updated] " pullmoll
@ 2021-01-01 13:56 ` pullmoll
2021-01-01 13:57 ` [PR PATCH] [Updated] " pullmoll
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: pullmoll @ 2021-01-01 13:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 409 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/27503#issuecomment-752158367
Comment:
Switched to cmake. Some tests are failing locally, too. And the `test_torrent` test seems to hang. Still, the libtorrent-rasterbar update should be ok and works with qbittorrent.
Now using the cmake configuration to force c++11 and qbittorrent is happy with it.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] qbittorrent: update to 4.3.2
2020-12-28 16:19 [PR PATCH] qbittorrent: update to 4.3.2 pullmoll
` (7 preceding siblings ...)
2021-01-01 13:56 ` pullmoll
@ 2021-01-01 13:57 ` pullmoll
2021-01-01 15:04 ` pullmoll
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: pullmoll @ 2021-01-01 13:57 UTC (permalink / raw)
To: ml
[-- 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: 6041 bytes --]
From bfb9e7704c00f42d65bb6ae54301bfd2a9a635c2 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 | 52 ++++++++++++---------------
1 file changed, 22 insertions(+), 30 deletions(-)
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 913b14a6558..bab3b181d1c 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
}
@@ -64,7 +57,6 @@ libtorrent-rasterbar-devel_package() {
vmove usr/share/cmake
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove "usr/lib/*.a"
}
}
From 08fcd311fb66a74a436791126ed07ef5d972d30b 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 | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index fdccf72aa5b..8f1067e0fbc 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,12 +13,16 @@ 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"
fi
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
+
do_extract() {
local n=${pkgname}-${version}
mkdir -p build-nox build-x11
From 4053536d86027c0fa74826fcc384c1978ebf6f69 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 b28df765a02142079eda46772140fb013458c760 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"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] qbittorrent: update to 4.3.2
2020-12-28 16:19 [PR PATCH] qbittorrent: update to 4.3.2 pullmoll
` (8 preceding siblings ...)
2021-01-01 13:57 ` [PR PATCH] [Updated] " pullmoll
@ 2021-01-01 15:04 ` pullmoll
2021-01-01 16:21 ` pullmoll
2021-01-01 17:22 ` [PR PATCH] [Merged]: " pullmoll
11 siblings, 0 replies; 13+ messages in thread
From: pullmoll @ 2021-01-01 15:04 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] qbittorrent: update to 4.3.2
2020-12-28 16:19 [PR PATCH] qbittorrent: update to 4.3.2 pullmoll
` (9 preceding siblings ...)
2021-01-01 15:04 ` pullmoll
@ 2021-01-01 16:21 ` pullmoll
2021-01-01 17:22 ` [PR PATCH] [Merged]: " pullmoll
11 siblings, 0 replies; 13+ messages in thread
From: pullmoll @ 2021-01-01 16:21 UTC (permalink / raw)
To: ml
[-- 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: 6707 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 9248a47880219c7b0dc67fd9c1f5c30beadab13f 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 | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 660a8d7eb7c..e54a8d57181 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,13 +1,14 @@
# 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"
depends="python3-setuptools python3-chardet python3-Twisted python3-Mako
python3-xdg python3-rencode python3-setproctitle libtorrent-rasterbar-python3
python3-Pillow"
+checkdepends="python3-pytest $depends"
short_desc="Fully-featured cross-platform BitTorrent client"
maintainer="Alexey Rochev <equeim@gmail.com>"
license="GPL-3.0-or-later"
@@ -25,6 +26,10 @@ post_install() {
vsv deluged
}
+do_check() {
+ python3 -m pytest || : # fails
+}
+
deluge-gtk_package() {
replaces="deluge<1.3.14_1"
short_desc+=" - GTK+ frontend"
From f47fcf3e146434ee92a66bfb885d35725cfd7a83 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"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Merged]: qbittorrent: update to 4.3.2
2020-12-28 16:19 [PR PATCH] qbittorrent: update to 4.3.2 pullmoll
` (10 preceding siblings ...)
2021-01-01 16:21 ` pullmoll
@ 2021-01-01 17:22 ` pullmoll
11 siblings, 0 replies; 13+ messages in thread
From: pullmoll @ 2021-01-01 17:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 492 bytes --]
There's a merged pull request on the void-packages repository
qbittorrent: update to 4.3.2
https://github.com/void-linux/void-packages/pull/27503
Description:
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?
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2021-01-01 17:22 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-28 16:19 [PR PATCH] qbittorrent: update to 4.3.2 pullmoll
2020-12-28 16:23 ` ericonr
2020-12-28 17:59 ` pullmoll
2020-12-29 12:00 ` [PR PATCH] [Updated] " pullmoll
2020-12-29 15:35 ` pullmoll
2020-12-29 16:50 ` pullmoll
2020-12-29 16:56 ` pullmoll
2021-01-01 13:24 ` [PR PATCH] [Updated] " pullmoll
2021-01-01 13:56 ` pullmoll
2021-01-01 13:57 ` [PR PATCH] [Updated] " pullmoll
2021-01-01 15:04 ` pullmoll
2021-01-01 16:21 ` pullmoll
2021-01-01 17:22 ` [PR PATCH] [Merged]: " pullmoll
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).