From: icp1994 <icp1994@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] python3-keyring: update to 23.9.3.
Date: Tue, 04 Oct 2022 16:58:57 +0200 [thread overview]
Message-ID: <20221004145857.7f5U09fQr3RgujLpkl-t2eGniJI85VzvOlG4QlhT-2Q@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39502@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 706 bytes --]
There is an updated pull request by icp1994 against master on the void-packages repository
https://github.com/icp1994/void-packages python3-keyring
https://github.com/void-linux/void-packages/pull/39502
python3-keyring: update to 23.9.3.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
#### Rev dep checks
- [x] Komikku
- [x] backintime
- [x] coursera-dl
- [x] cura
- [x] gajim
- [x] hatch
- [x] jrnl
- [x] mcg
- [x] nagstamon
- [x] pantalaimon
- [x] python3-keyrings-alt
- [x] urlwatch
A patch file from https://github.com/void-linux/void-packages/pull/39502.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-keyring-39502.patch --]
[-- Type: text/x-diff, Size: 8004 bytes --]
From 3d2a81da9a615b2226c4dfb22ec0027a460d2a06 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 22 Sep 2022 01:29:51 +0530
Subject: [PATCH 1/3] python3-keyring: update to 23.9.3.
Adopt.
---
srcpkgs/python3-keyring/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-keyring/template b/srcpkgs/python3-keyring/template
index 35b44a7380a2..908e160000ec 100644
--- a/srcpkgs/python3-keyring/template
+++ b/srcpkgs/python3-keyring/template
@@ -1,20 +1,19 @@
# Template file for 'python3-keyring'
pkgname=python3-keyring
-version=23.7.0
+version=23.9.3
revision=1
wrksrc="keyring-${version}"
build_style=python3-pep517
hostmakedepends="python3-wheel python3-setuptools_scm"
-depends="python3-SecretStorage"
-checkdepends="python3-pytest
- python3-pytest-flake8 python3-pytest-cov"
+depends="python3-SecretStorage python3-jeepney python3-jaraco.classes"
+checkdepends="${depends} python3-pytest-xdist"
short_desc="Python interface to the system keyring service"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="icp <pangolin@vivaldi.net>"
license="MIT"
homepage="https://github.com/jaraco/keyring"
changelog="https://raw.githubusercontent.com/jaraco/keyring/master/CHANGES.rst"
distfiles="${PYPI_SITE}/k/keyring/keyring-${version}.tar.gz"
-checksum=782e1cd1132e91bf459fcd243bcf25b326015c1ac0b198e4408f91fa6791062b
+checksum=69b01dd83c42f590250fe7a1f503fc229b14de83857314b1933a3ddbf595c4a5
post_install() {
vlicense LICENSE
From 3feb277f3c8c4c0a8c3503724fb6f95750fa06fa Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 24 Sep 2022 01:34:48 +0530
Subject: [PATCH 2/3] coursera-dl: patch for python3>=3.9
---
.../patches/fix-upstream-issue-778.patch | 48 +++++++++++++++++++
srcpkgs/coursera-dl/template | 8 ++--
2 files changed, 52 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/coursera-dl/patches/fix-upstream-issue-778.patch
diff --git a/srcpkgs/coursera-dl/patches/fix-upstream-issue-778.patch b/srcpkgs/coursera-dl/patches/fix-upstream-issue-778.patch
new file mode 100644
index 000000000000..659d936a9c43
--- /dev/null
+++ b/srcpkgs/coursera-dl/patches/fix-upstream-issue-778.patch
@@ -0,0 +1,48 @@
+From c8796e567698be166cb15f54e095140c1a9b567e Mon Sep 17 00:00:00 2001
+From: "Heino H. Gehlsen" <heino@gehlsen.dk>
+Date: Sun, 27 Dec 2020 13:28:35 +0100
+Subject: [PATCH] Fix AttributeError: 'HTMLParser' object has no attribute
+ 'unescape'
+
+https://github.com/coursera-dl/coursera-dl/pull/789
+---
+ coursera/utils.py | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/coursera/utils.py b/coursera/utils.py
+index 9ba577af..f271bb9f 100644
+--- a/coursera/utils.py
++++ b/coursera/utils.py
+@@ -21,7 +21,11 @@
+
+ import six
+ from six import iteritems
+-from six.moves import html_parser
++if six.PY34:
++ import html
++else:
++ from six.moves import html_parser
++ html = html_parser.HTMLParser()
+ from six.moves.urllib.parse import ParseResult
+ from six.moves.urllib_parse import unquote_plus
+
+@@ -98,8 +102,7 @@ def random_string(length):
+
+
+ def unescape_html(s):
+- h = html_parser.HTMLParser()
+- s = h.unescape(s)
++ s = html.unescape(s)
+ s = unquote_plus(s)
+ return unescape(s, HTML_UNESCAPE_TABLE)
+
+@@ -114,8 +117,7 @@ def clean_filename(s, minimal_change=False):
+ """
+
+ # First, deal with URL encoded strings
+- h = html_parser.HTMLParser()
+- s = h.unescape(s)
++ s = html.unescape(s)
+ s = unquote_plus(s)
+
+ # Strip forbidden characters
diff --git a/srcpkgs/coursera-dl/template b/srcpkgs/coursera-dl/template
index 9c569678e49c..a79cecd680d1 100644
--- a/srcpkgs/coursera-dl/template
+++ b/srcpkgs/coursera-dl/template
@@ -1,16 +1,16 @@
# Template file for 'coursera-dl'
pkgname=coursera-dl
version=0.11.5
-revision=3
+revision=4
build_style=python3-module
-pycompile_module="coursera"
hostmakedepends="python3-setuptools"
depends="python3-attrs python3-setuptools python3-pyasn1 python3-ConfigArgParse
python3-BeautifulSoup4 python3-requests python3-six python3-keyring
python3-urllib3"
+checkdepends="${depends} python3-keyrings-alt python3-mock python3-pytest-xdist"
short_desc="Script for downloading Coursera.org videos and naming them"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3.0-or-later"
homepage="https://github.com/coursera-dl/coursera-dl"
-distfiles="${PYPI_SITE}/c/coursera-dl/coursera-dl-${version}.tar.gz"
-checksum=66a84558dfcfcbdc487dcabcfc0d7c4a8569cc604b051b1d51bc95d52a369745
+distfiles="https://github.com/coursera-dl/coursera-dl/archive/refs/tags/${version}.tar.gz"
+checksum=27e382435084ec91ef89ab6c1d46f4756b708e4badf5307a8f18b9ad31971014
From 21b3884140524103963d610dcbc14b85c8040bc0 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 4 Oct 2022 20:26:47 +0530
Subject: [PATCH 3/3] Komikku: fix appdata file
---
.../Komikku/patches/fix-appdata-file.patch | 39 +++++++++++++++++++
srcpkgs/Komikku/template | 2 +-
2 files changed, 40 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/Komikku/patches/fix-appdata-file.patch
diff --git a/srcpkgs/Komikku/patches/fix-appdata-file.patch b/srcpkgs/Komikku/patches/fix-appdata-file.patch
new file mode 100644
index 000000000000..05c1fb3d59cd
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-appdata-file.patch
@@ -0,0 +1,39 @@
+--- info.febvre.Komikku.appdata.xml.in
++++ info.febvre.Komikku.appdata.xml.in
+@@ -49,28 +49,28 @@
+
+ <screenshots>
+ <screenshot type="default">
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library-with-categories.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library-with-categories.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/preferences.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/preferences.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/explorer.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/explorer.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/categories-editor.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/categories-editor.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-info.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-info.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-chapters.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-chapters.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/reader.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/reader.png</image>
+ </screenshot>
+ </screenshots>
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 0b66eb387e75..0fd7cdf7d015 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
# Template file for 'Komikku'
pkgname=Komikku
version=0.40.0
-revision=1
+revision=2
wrksrc=Komikku-v${version}
build_style=meson
hostmakedepends="gettext glib-devel gobject-introspection pkg-config"
next prev parent reply other threads:[~2022-10-04 14:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-28 10:10 [PR PATCH] Python3 keyring icp1994
2022-10-04 14:32 ` [PR REVIEW] python3-keyring: update to 23.9.3 ahesford
2022-10-04 14:32 ` ahesford
2022-10-04 14:58 ` icp1994 [this message]
2022-10-04 15:00 ` icp1994
2022-10-04 15:02 ` ahesford
2022-10-04 15:09 ` [PR PATCH] [Updated] " icp1994
2022-10-04 15:12 ` [PR REVIEW] " icp1994
2022-10-04 15:12 ` icp1994
2022-10-04 15:16 ` [PR PATCH] [Merged]: " ahesford
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=20221004145857.7f5U09fQr3RgujLpkl-t2eGniJI85VzvOlG4QlhT-2Q@z \
--to=icp1994@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).