Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] deluge: update to 2.1.1.
@ 2022-11-10 20:17 TinfoilSubmarine
  2022-11-11  3:41 ` deluge: update to 2.1.1 (and fix boost for Python 3.11) sgn
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: TinfoilSubmarine @ 2022-11-10 20:17 UTC (permalink / raw)
  To: ml

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

There is a new pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages update/deluge
https://github.com/void-linux/void-packages/pull/40453

deluge: update to 2.1.1.
I had to pull a patch from upstream to fix, the current deluge version in repo
doesn't actually work

https://github.com/boostorg/python/pull/385

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From a7f702306f726d09523d64fa04b413cd47c71dbf Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 14:25:12 -0500
Subject: [PATCH 1/3] boost: add patch to support Python 3.11.

---
 .../boost/patches/Py_TPFLAGS_HAVE_GC.patch    | 35 +++++++++++++++++++
 srcpkgs/boost/template                        |  2 +-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/boost/patches/Py_TPFLAGS_HAVE_GC.patch

diff --git a/srcpkgs/boost/patches/Py_TPFLAGS_HAVE_GC.patch b/srcpkgs/boost/patches/Py_TPFLAGS_HAVE_GC.patch
new file mode 100644
index 000000000000..53659904ba03
--- /dev/null
+++ b/srcpkgs/boost/patches/Py_TPFLAGS_HAVE_GC.patch
@@ -0,0 +1,35 @@
+From ae5da2a7e8f1111757d8a474095486a5b22aa12d Mon Sep 17 00:00:00 2001
+From: Victor Stinner <vstinner@python.org>
+Date: Mon, 25 Apr 2022 10:51:46 +0200
+Subject: [PATCH] Fix enum_type_object type on Python 3.11
+
+The enum_type_object type inherits from PyLong_Type which is not tracked
+by the GC. Instances doesn't have to be tracked by the GC: remove the
+Py_TPFLAGS_HAVE_GC flag.
+
+The Python C API documentation says:
+
+    "To create a container type, the tp_flags field of the type object
+    must include the Py_TPFLAGS_HAVE_GC and provide an implementation of
+    the tp_traverse handler."
+
+https://docs.python.org/dev/c-api/gcsupport.html
+
+The new exception was introduced in Python 3.11 by:
+https://github.com/python/cpython/issues/88429
+---
+ libs/python/src/object/enum.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/object/enum.cpp b/src/object/enum.cpp
+index 293e705899..5753b32e07 100644
+--- a/libs/python/src/object/enum.cpp
++++ b/libs/python/src/object/enum.cpp
+@@ -113,7 +113,6 @@ static PyTypeObject enum_type_object = {
+ #if PY_VERSION_HEX < 0x03000000
+     | Py_TPFLAGS_CHECKTYPES
+ #endif
+-    | Py_TPFLAGS_HAVE_GC
+     | Py_TPFLAGS_BASETYPE,                  /* tp_flags */
+     0,                                      /* tp_doc */
+     0,                                      /* tp_traverse */
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index a3da2dc4ca2e..fb01417cea1d 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.80.0
-revision=5
+revision=6
 hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config"
 makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel
  libzstd-devel"

From cfd23260a8cf712115347485036c5042b352fb09 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 14:27:36 -0500
Subject: [PATCH 2/3] libtorrent-rasterbar: rebuild to support Python 3.11.

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

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 4d325a46f53c..bbb945a01409 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,7 +2,7 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.17
-revision=4
+revision=5
 build_style=cmake
 configure_args="DCMAKE_CXX_STANDARD=14 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"

From cfe5af17ffdc542a0950d27fea60fccb4133ee75 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 14:25:34 -0500
Subject: [PATCH 3/3] deluge: update to 2.1.1.

---
 srcpkgs/deluge/template | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 6ac544ff9fa6..0fbbccf2a43c 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,22 +1,21 @@
 # Template file for 'deluge'
 pkgname=deluge
-version=2.0.5
-revision=3
+version=2.1.1
+revision=1
 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 python3-pyasn1 python3-openssl python3-six python3-zope.interface"
-checkdepends="python3-pytest $depends python3-pytest-mock python3-mock gtk+3
- python3-gobject xvfb-run cantarell-fonts"
 short_desc="Fully-featured cross-platform BitTorrent client"
 maintainer="Alexey Rochev <equeim@gmail.com>"
 license="GPL-3.0-or-later"
 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
+distfiles="https://ftp.osuosl.org/pub/deluge/source/2.1/deluge-${version}.tar.xz"
+checksum=768dd319802e42437ab3794ebe75b497142e08ed5b0fb2503bad62cef442dff7
+make_check=no # requires unpackaged pytest_twisted
 
 system_accounts="deluge"
 deluge_homedir="/var/lib/deluge"
@@ -27,11 +26,6 @@ make_dirs="
  /var/lib/deluge/.config/deluge 0755 deluge deluge
  "
 
-do_check() {
-	rm deluge/tests/test_torrentview.py deluge/tests/test_files_tab.py
-	xvfb-run python3 -m pytest
-}
-
 post_install() {
 	vsv deluged
 }

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

* Re: deluge: update to 2.1.1 (and fix boost for Python 3.11)
  2022-11-10 20:17 [PR PATCH] deluge: update to 2.1.1 TinfoilSubmarine
@ 2022-11-11  3:41 ` sgn
  2022-11-11  9:55 ` [PR PATCH] [Updated] " sgn
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2022-11-11  3:41 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/40453#issuecomment-1311192971

Comment:
boost merged, no need to rebuild libtorrent-rasterbar

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

* Re: [PR PATCH] [Updated] deluge: update to 2.1.1 (and fix boost for Python 3.11)
  2022-11-10 20:17 [PR PATCH] deluge: update to 2.1.1 TinfoilSubmarine
  2022-11-11  3:41 ` deluge: update to 2.1.1 (and fix boost for Python 3.11) sgn
@ 2022-11-11  9:55 ` sgn
  2022-11-11  9:59 ` sgn
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2022-11-11  9:55 UTC (permalink / raw)
  To: ml

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

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

https://github.com/TinfoilSubmarine/void-packages update/deluge
https://github.com/void-linux/void-packages/pull/40453

deluge: update to 2.1.1 (and fix boost for Python 3.11)
I had to pull a patch from upstream boost to fix, the current deluge version in repo doesn't actually work because of this, might be affecting others as well.

I don't know what else I need to do as far as bumping dependents of boost and libtorrent-rasterbar, I just wanted to put this up here since apparently deluge is currently unusable.

https://github.com/boostorg/python/pull/385

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From f2978c940af1f8d85384ba04357e86c9aba09b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 11 Nov 2022 16:42:49 +0700
Subject: [PATCH 1/4] btfs: rebuild for libtorrent-rasterbar 1.2.18

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

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

From 4ddea9e55a8e72362bb82b30db5eebfdba825ed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 11 Nov 2022 16:42:50 +0700
Subject: [PATCH 2/4] qbittorrent: rebuild for libtorrent-rasterbar 1.2.18

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

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 65e74335509e..8c58a0d0d1fc 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.4.5
-revision=2
+revision=3
 create_wrksrc=yes
 build_style=gnu-configure
 build_helper=qmake

From 7342019952fe881c0eff16be03b42e1343fb7580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 11 Nov 2022 16:54:00 +0700
Subject: [PATCH 3/4] libtorrent-rasterbar: update to 1.2.18.

---
 common/shlibs                         | 2 +-
 srcpkgs/libtorrent-rasterbar/template | 4 ++--
 srcpkgs/libtorrent-rasterbar/update   | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 13f7a81b2028..76512744735e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2109,7 +2109,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.17_2
+libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.18_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/template b/srcpkgs/libtorrent-rasterbar/template
index 4d325a46f53c..56d2c813302d 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -1,8 +1,8 @@
 # Template file for 'libtorrent-rasterbar'
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
-version=1.2.17
-revision=4
+version=1.2.18
+revision=1
 build_style=cmake
 configure_args="DCMAKE_CXX_STANDARD=14 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
diff --git a/srcpkgs/libtorrent-rasterbar/update b/srcpkgs/libtorrent-rasterbar/update
index db300c9b2742..ce0ba5145f6c 100644
--- a/srcpkgs/libtorrent-rasterbar/update
+++ b/srcpkgs/libtorrent-rasterbar/update
@@ -1,3 +1,2 @@
-site='https://github.com/arvidn/libtorrent/releases'
-pattern='libtorrent-rasterbar-\K[\d\.]+(?=\.tar\.gz")'
+# https://github.com/arvidn/libtorrent/issues/6667
 ignore="2.*"

From 692a44c664378bc6ab15d7766b51c5e3cced1a64 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 14:25:34 -0500
Subject: [PATCH 4/4] deluge: update to 2.1.1.

Close: #40453
---
 srcpkgs/deluge/template | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 6ac544ff9fa6..c7f2b503fe3b 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,22 +1,21 @@
 # Template file for 'deluge'
 pkgname=deluge
-version=2.0.5
-revision=3
+version=2.1.1
+revision=1
 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 python3-pyasn1 python3-openssl python3-six python3-zope.interface"
-checkdepends="python3-pytest $depends python3-pytest-mock python3-mock gtk+3
- python3-gobject xvfb-run cantarell-fonts"
 short_desc="Fully-featured cross-platform BitTorrent client"
 maintainer="Alexey Rochev <equeim@gmail.com>"
 license="GPL-3.0-or-later"
 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
+distfiles="https://ftp.osuosl.org/pub/deluge/source/${version%.*}/deluge-${version}.tar.xz"
+checksum=768dd319802e42437ab3794ebe75b497142e08ed5b0fb2503bad62cef442dff7
+make_check=no # requires unpackaged pytest_twisted
 
 system_accounts="deluge"
 deluge_homedir="/var/lib/deluge"
@@ -27,11 +26,6 @@ make_dirs="
  /var/lib/deluge/.config/deluge 0755 deluge deluge
  "
 
-do_check() {
-	rm deluge/tests/test_torrentview.py deluge/tests/test_files_tab.py
-	xvfb-run python3 -m pytest
-}
-
 post_install() {
 	vsv deluged
 }

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

* Re: [PR PATCH] [Updated] deluge: update to 2.1.1 (and fix boost for Python 3.11)
  2022-11-10 20:17 [PR PATCH] deluge: update to 2.1.1 TinfoilSubmarine
  2022-11-11  3:41 ` deluge: update to 2.1.1 (and fix boost for Python 3.11) sgn
  2022-11-11  9:55 ` [PR PATCH] [Updated] " sgn
@ 2022-11-11  9:59 ` sgn
  2022-11-11 14:05 ` TinfoilSubmarine
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2022-11-11  9:59 UTC (permalink / raw)
  To: ml

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

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

https://github.com/TinfoilSubmarine/void-packages update/deluge
https://github.com/void-linux/void-packages/pull/40453

deluge: update to 2.1.1 (and fix boost for Python 3.11)
I had to pull a patch from upstream boost to fix, the current deluge version in repo doesn't actually work because of this, might be affecting others as well.

I don't know what else I need to do as far as bumping dependents of boost and libtorrent-rasterbar, I just wanted to put this up here since apparently deluge is currently unusable.

https://github.com/boostorg/python/pull/385

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From f2978c940af1f8d85384ba04357e86c9aba09b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 11 Nov 2022 16:42:49 +0700
Subject: [PATCH 1/4] btfs: rebuild for libtorrent-rasterbar 1.2.18

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

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

From 4ddea9e55a8e72362bb82b30db5eebfdba825ed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 11 Nov 2022 16:42:50 +0700
Subject: [PATCH 2/4] qbittorrent: rebuild for libtorrent-rasterbar 1.2.18

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

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 65e74335509e..8c58a0d0d1fc 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.4.5
-revision=2
+revision=3
 create_wrksrc=yes
 build_style=gnu-configure
 build_helper=qmake

From 4917c4b6347f163b136434748249747fb8a7637b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 11 Nov 2022 16:54:00 +0700
Subject: [PATCH 3/4] libtorrent-rasterbar: update to 1.2.18.

---
 common/shlibs                         | 2 +-
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 srcpkgs/libtorrent-rasterbar/update   | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 13f7a81b2028..76512744735e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2109,7 +2109,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.17_2
+libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.18_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/template b/srcpkgs/libtorrent-rasterbar/template
index 4d325a46f53c..3049c8a4aa32 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -1,8 +1,8 @@
 # Template file for 'libtorrent-rasterbar'
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
-version=1.2.17
-revision=4
+version=1.2.18
+revision=1
 build_style=cmake
 configure_args="DCMAKE_CXX_STANDARD=14 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
@@ -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=5d536dbed9fe3a15d51ea1e93b94b62d806fc89b86504bba05f4c53d5245d14b
+checksum=fef2b6817de4e6d960e019c27f21daf27bc2468a81d9e028a19d45d61456fa72
 
 CXXFLAGS="-std=c++14"
 
diff --git a/srcpkgs/libtorrent-rasterbar/update b/srcpkgs/libtorrent-rasterbar/update
index db300c9b2742..ce0ba5145f6c 100644
--- a/srcpkgs/libtorrent-rasterbar/update
+++ b/srcpkgs/libtorrent-rasterbar/update
@@ -1,3 +1,2 @@
-site='https://github.com/arvidn/libtorrent/releases'
-pattern='libtorrent-rasterbar-\K[\d\.]+(?=\.tar\.gz")'
+# https://github.com/arvidn/libtorrent/issues/6667
 ignore="2.*"

From 03344bc406115a36102106715c7cb960e7130b08 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 14:25:34 -0500
Subject: [PATCH 4/4] deluge: update to 2.1.1.

Close: #40453
---
 srcpkgs/deluge/template | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 6ac544ff9fa6..c7f2b503fe3b 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,22 +1,21 @@
 # Template file for 'deluge'
 pkgname=deluge
-version=2.0.5
-revision=3
+version=2.1.1
+revision=1
 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 python3-pyasn1 python3-openssl python3-six python3-zope.interface"
-checkdepends="python3-pytest $depends python3-pytest-mock python3-mock gtk+3
- python3-gobject xvfb-run cantarell-fonts"
 short_desc="Fully-featured cross-platform BitTorrent client"
 maintainer="Alexey Rochev <equeim@gmail.com>"
 license="GPL-3.0-or-later"
 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
+distfiles="https://ftp.osuosl.org/pub/deluge/source/${version%.*}/deluge-${version}.tar.xz"
+checksum=768dd319802e42437ab3794ebe75b497142e08ed5b0fb2503bad62cef442dff7
+make_check=no # requires unpackaged pytest_twisted
 
 system_accounts="deluge"
 deluge_homedir="/var/lib/deluge"
@@ -27,11 +26,6 @@ make_dirs="
  /var/lib/deluge/.config/deluge 0755 deluge deluge
  "
 
-do_check() {
-	rm deluge/tests/test_torrentview.py deluge/tests/test_files_tab.py
-	xvfb-run python3 -m pytest
-}
-
 post_install() {
 	vsv deluged
 }

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

* Re: [PR PATCH] [Updated] deluge: update to 2.1.1 (and fix boost for Python 3.11)
  2022-11-10 20:17 [PR PATCH] deluge: update to 2.1.1 TinfoilSubmarine
                   ` (2 preceding siblings ...)
  2022-11-11  9:59 ` sgn
@ 2022-11-11 14:05 ` TinfoilSubmarine
  2022-11-11 14:05 ` TinfoilSubmarine
  2022-11-11 15:50 ` [PR PATCH] [Closed]: " sgn
  5 siblings, 0 replies; 7+ messages in thread
From: TinfoilSubmarine @ 2022-11-11 14:05 UTC (permalink / raw)
  To: ml

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

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

https://github.com/TinfoilSubmarine/void-packages update/deluge
https://github.com/void-linux/void-packages/pull/40453

deluge: update to 2.1.1 (and fix boost for Python 3.11)
I had to pull a patch from upstream boost to fix, the current deluge version in repo doesn't actually work because of this, might be affecting others as well.

I don't know what else I need to do as far as bumping dependents of boost and libtorrent-rasterbar, I just wanted to put this up here since apparently deluge is currently unusable.

https://github.com/boostorg/python/pull/385

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From e4874aacc81c1c03b6e0c0e5432ea5adea9665c1 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 14:25:34 -0500
Subject: [PATCH] deluge: update to 2.1.1.

---
 srcpkgs/deluge/template | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 6ac544ff9fa60..0fbbccf2a43cc 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,22 +1,21 @@
 # Template file for 'deluge'
 pkgname=deluge
-version=2.0.5
-revision=3
+version=2.1.1
+revision=1
 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 python3-pyasn1 python3-openssl python3-six python3-zope.interface"
-checkdepends="python3-pytest $depends python3-pytest-mock python3-mock gtk+3
- python3-gobject xvfb-run cantarell-fonts"
 short_desc="Fully-featured cross-platform BitTorrent client"
 maintainer="Alexey Rochev <equeim@gmail.com>"
 license="GPL-3.0-or-later"
 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
+distfiles="https://ftp.osuosl.org/pub/deluge/source/2.1/deluge-${version}.tar.xz"
+checksum=768dd319802e42437ab3794ebe75b497142e08ed5b0fb2503bad62cef442dff7
+make_check=no # requires unpackaged pytest_twisted
 
 system_accounts="deluge"
 deluge_homedir="/var/lib/deluge"
@@ -27,11 +26,6 @@ make_dirs="
  /var/lib/deluge/.config/deluge 0755 deluge deluge
  "
 
-do_check() {
-	rm deluge/tests/test_torrentview.py deluge/tests/test_files_tab.py
-	xvfb-run python3 -m pytest
-}
-
 post_install() {
 	vsv deluged
 }

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

* Re: deluge: update to 2.1.1 (and fix boost for Python 3.11)
  2022-11-10 20:17 [PR PATCH] deluge: update to 2.1.1 TinfoilSubmarine
                   ` (3 preceding siblings ...)
  2022-11-11 14:05 ` TinfoilSubmarine
@ 2022-11-11 14:05 ` TinfoilSubmarine
  2022-11-11 15:50 ` [PR PATCH] [Closed]: " sgn
  5 siblings, 0 replies; 7+ messages in thread
From: TinfoilSubmarine @ 2022-11-11 14:05 UTC (permalink / raw)
  To: ml

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

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/40453#issuecomment-1311732749

Comment:
> boost merged, no need to rebuild libtorrent-rasterbar

indeed, thanks. dropped

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

* Re: [PR PATCH] [Closed]: deluge: update to 2.1.1 (and fix boost for Python 3.11)
  2022-11-10 20:17 [PR PATCH] deluge: update to 2.1.1 TinfoilSubmarine
                   ` (4 preceding siblings ...)
  2022-11-11 14:05 ` TinfoilSubmarine
@ 2022-11-11 15:50 ` sgn
  5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2022-11-11 15:50 UTC (permalink / raw)
  To: ml

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

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

deluge: update to 2.1.1 (and fix boost for Python 3.11)
https://github.com/void-linux/void-packages/pull/40453

Description:
I had to pull a patch from upstream boost to fix, the current deluge version in repo doesn't actually work because of this, might be affecting others as well.

I don't know what else I need to do as far as bumping dependents of boost and libtorrent-rasterbar, I just wanted to put this up here since apparently deluge is currently unusable.

https://github.com/boostorg/python/pull/385

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

end of thread, other threads:[~2022-11-11 15:50 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-10 20:17 [PR PATCH] deluge: update to 2.1.1 TinfoilSubmarine
2022-11-11  3:41 ` deluge: update to 2.1.1 (and fix boost for Python 3.11) sgn
2022-11-11  9:55 ` [PR PATCH] [Updated] " sgn
2022-11-11  9:59 ` sgn
2022-11-11 14:05 ` TinfoilSubmarine
2022-11-11 14:05 ` TinfoilSubmarine
2022-11-11 15:50 ` [PR PATCH] [Closed]: " sgn

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).