Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Python3 keyring
@ 2022-09-28 10:10 icp1994
  2022-10-04 14:32 ` [PR REVIEW] python3-keyring: update to 23.9.3 ahesford
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: icp1994 @ 2022-09-28 10:10 UTC (permalink / raw)
  To: ml

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

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

From e8ed6d7e081572726e80a1413d494e9dc1b61b99 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 c91c06bcde1859c7a44a65af6af0fa9cd9b0cd5d Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 24 Sep 2022 01:08:00 +0530
Subject: [PATCH 2/3] Komikku: fix appdata file

---
 srcpkgs/Komikku/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 0b66eb387e75..42d2b1ec2854 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"
@@ -14,6 +14,10 @@ checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
-homepage="https://gitlab.com/valos/Komikku"
+homepage="https://valos.gitlab.io/Komikku/"
 distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
 checksum=66ed0aa3f4a7bcf049d2263befda42d3740a24662c40c56eeda5c8a06a043534
+
+post_extract() { # should be removed when updating to version>=1.0.0
+	vsed -e "s|Komikku/raw/master/|Komikku/raw/main/|g" -i data/info.febvre.Komikku.appdata.xml.in
+}

From f3168efb5740077b5777c60f1c61319585dc453f Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 24 Sep 2022 01:34:48 +0530
Subject: [PATCH 3/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

^ permalink raw reply	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-10-04 15:16 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PR PATCH] [Updated] " icp1994
2022-10-04 15:00 ` [PR REVIEW] " 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

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