From: olafmersmann <olafmersmann@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] vdirsyncer: cherry pick Python 3.9 fixes.
Date: Wed, 14 Oct 2020 12:06:00 +0200 [thread overview]
Message-ID: <20201014100600.CinWwpTtBiA_IPqWIph8POeWwEQFhRgZG7W6g52Wz2Q@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25598@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 586 bytes --]
There is an updated pull request by olafmersmann against master on the void-packages repository
https://github.com/olafmersmann/void-packages vdirsync-fix
https://github.com/void-linux/void-packages/pull/25598
vdirsyncer: cherry pick Python 3.9 fixes.
vdirsyncer uses the deprecared iter() method. Python 3.9 removed this method. Upstream has a fix (commit 7577fa21177442aacc2d86640ef28cebf1c4aaef), but has not spun a new release. This commit cherry-picks that commit and bumps the revision.
A patch file from https://github.com/void-linux/void-packages/pull/25598.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vdirsync-fix-25598.patch --]
[-- Type: text/x-diff, Size: 1677 bytes --]
From a02df9f0a5a14be1bd2355735fd548fc7e1d32da Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Wed, 14 Oct 2020 11:52:07 +0200
Subject: [PATCH] vdirsyncer: cherry pick Python 3.9 fixes.
---
...01-Update-usage-of-deprecated-method.patch | 19 +++++++++++++++++++
srcpkgs/vdirsyncer/template | 2 +-
2 files changed, 20 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vdirsyncer/patches/0001-Update-usage-of-deprecated-method.patch
diff --git a/srcpkgs/vdirsyncer/patches/0001-Update-usage-of-deprecated-method.patch b/srcpkgs/vdirsyncer/patches/0001-Update-usage-of-deprecated-method.patch
new file mode 100644
index 00000000000..cf140da496e
--- /dev/null
+++ b/srcpkgs/vdirsyncer/patches/0001-Update-usage-of-deprecated-method.patch
@@ -0,0 +1,19 @@
+Source: Upstream
+Upstream: Yes
+Reason: Python 3.9 compatibility fix.
+diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py
+index 07d164f..a7e2422 100644
+--- vdirsyncer/storage/dav.py
++++ vdirsyncer/storage/dav.py
+@@ -124,7 +124,7 @@ def _merge_xml(items):
+ return None
+ rv = items[0]
+ for item in items[1:]:
+- rv.extend(item.getiterator())
++ rv.extend(item.iter())
+ return rv
+
+
+--
+2.28.0
+
diff --git a/srcpkgs/vdirsyncer/template b/srcpkgs/vdirsyncer/template
index d791cb2edd0..906b77950d3 100644
--- a/srcpkgs/vdirsyncer/template
+++ b/srcpkgs/vdirsyncer/template
@@ -1,7 +1,7 @@
# Template file for 'vdirsyncer'
pkgname=vdirsyncer
version=0.16.8
-revision=2
+revision=3
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-atomicwrites python3-click python3-click-log
next prev parent reply other threads:[~2020-10-14 10:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-14 9:55 [PR PATCH] " olafmersmann
2020-10-14 10:06 ` olafmersmann [this message]
2020-10-16 15:34 ` [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=20201014100600.CinWwpTtBiA_IPqWIph8POeWwEQFhRgZG7W6g52Wz2Q@z \
--to=olafmersmann@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).