From: mobinmob <mobinmob@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] deluge: update to 2.0.5.
Date: Sun, 06 Feb 2022 19:22:15 +0100 [thread overview]
Message-ID: <20220206182215.GI_7I6362XWEFI8T0ZhFoxBorWEetbWAAdeGNZPh6Lw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35190@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1216 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages deluge
https://github.com/void-linux/void-packages/pull/35190
deluge: update to 2.0.5.
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/35190.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-deluge-35190.patch --]
[-- Type: text/x-diff, Size: 5552 bytes --]
From c76f1658350c08a24443d80a3a1402f27e686c37 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 23 Jan 2022 17:57:27 +0200
Subject: [PATCH] deluge: update to 2.0.5.
---
.../0001-Fix-warning-related-to-gettext.patch | 25 ------------
srcpkgs/deluge/patches/drop-priv.patch | 40 -------------------
srcpkgs/deluge/template | 23 ++++++-----
3 files changed, 13 insertions(+), 75 deletions(-)
delete mode 100644 srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
delete mode 100644 srcpkgs/deluge/patches/drop-priv.patch
diff --git a/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch b/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
deleted file mode 100644
index 565cd4f952d0..000000000000
--- a/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d6c96d629183e8bab2167ef56457f994017e7c85 Mon Sep 17 00:00:00 2001
-From: neeshy <neeshy@tfwno.gf>
-Date: Sat, 18 Apr 2020 23:23:51 -0400
-Subject: Fix warning related to gettext
-
----
- deluge/i18n/util.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deluge/i18n/util.py b/deluge/i18n/util.py
-index bd002f7a2..90568fc5b 100644
---- a/deluge/i18n/util.py
-+++ b/deluge/i18n/util.py
-@@ -114,7 +114,7 @@ def setup_translation():
- # Workaround for Python 2 unicode gettext (keyword removed in Py3).
- kwargs = {} if not deluge.common.PY2 else {'unicode': True}
-
-- gettext.install(I18N_DOMAIN, translations_path, names='ngettext', **kwargs)
-+ gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], **kwargs)
- builtins.__dict__['_n'] = builtins.__dict__['ngettext']
-
- libintl = None
---
-2.27.0
-
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
deleted file mode 100644
index cb356dbe018b..000000000000
--- a/srcpkgs/deluge/patches/drop-priv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
-From: Jack O'Sullivan <jackos1998@gmail.com>
-Date: Tue, 24 Sep 2019 11:32:18 +0100
-Subject: [PATCH] Fix privilege dropping when setting process ownership
-
-`os.setgid()` should be called to set the GID, and it should be called
-before `os.setuid()` to prevent reinstatement of privileges.
----
- deluge/argparserbase.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
-index af9d568fa4..77866a3ed6 100644
---- a/deluge/argparserbase.py
-+++ b/deluge/argparserbase.py
-@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
- _file.write('%d\n' % os.getpid())
-
- if not common.windows_check():
-+ if options.group:
-+ if not options.group.isdigit():
-+ import grp
-+
-+ options.group = grp.getgrnam(options.group)[2]
-+ os.setgid(options.group)
- if options.user:
- if not options.user.isdigit():
- import pwd
-
- options.user = pwd.getpwnam(options.user)[2]
- os.setuid(options.user)
-- if options.group:
-- if not options.group.isdigit():
-- import grp
--
-- options.group = grp.getgrnam(options.group)[2]
-- os.setuid(options.group)
-
- return options
-
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 180e473235fd..4d395042bc29 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,20 +1,22 @@
# Template file for 'deluge'
pkgname=deluge
-version=2.0.3
-revision=15
-build_style=python3-module
+version=2.0.5
+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"
-checkdepends="python3-pytest $depends"
+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=7e7ae8e6ca2a2bf0d487227cecf81e27332f0b92b567cc2bda38e47d859da891
+checksum=c4bd04abfd211b65218be03f3c46d26f44024884de10e01859fb856fdd6f25d8
system_accounts="deluge"
deluge_homedir="/var/lib/deluge"
@@ -25,18 +27,19 @@ make_dirs="
/var/lib/deluge/.config/deluge 0755 deluge deluge
"
-post_install() {
- vsv deluged
+do_check() {
+ rm deluge/tests/test_torrentview.py deluge/tests/test_files_tab.py
+ xvfb-run python3 -m pytest
}
-do_check() {
- python3 -m pytest || : # fails
+post_install() {
+ vsv deluged
}
deluge-gtk_package() {
replaces="deluge<1.3.14_1"
short_desc+=" - GTK+ frontend"
- depends="${sourcepkg}-${version}_${revision} python3-gobject"
+ depends="${sourcepkg}-${version}_${revision} python3-gobject gtk+3"
pkg_install() {
vmove usr/bin/deluge
vmove usr/bin/deluge-gtk
next prev parent reply other threads:[~2022-02-06 18:22 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-23 9:54 [PR PATCH] " mobinmob
2022-01-23 15:22 ` [PR PATCH] [Updated] " mobinmob
2022-01-23 15:58 ` mobinmob
2022-01-23 15:59 ` mobinmob
2022-01-23 16:00 ` mobinmob
2022-01-23 21:29 ` [PR REVIEW] " paper42
2022-01-23 21:29 ` paper42
2022-01-23 21:29 ` paper42
2022-02-06 18:19 ` [PR PATCH] [Updated] " mobinmob
2022-02-06 18:22 ` mobinmob [this message]
2022-02-06 18:28 ` mobinmob
2022-02-08 22:36 ` [PR REVIEW] " paper42
2022-02-08 22:38 ` paper42
2022-03-18 15:46 ` [PR PATCH] [Updated] " mobinmob
2022-03-18 15:47 ` mobinmob
2022-03-20 21:48 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220206182215.GI_7I6362XWEFI8T0ZhFoxBorWEetbWAAdeGNZPh6Lw@z \
--to=mobinmob@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).