From e5049643f889e139e3ad0ac3f11d4553058994c9 Mon Sep 17 00:00:00 2001 From: Olaf Mersmann 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 | 25 +++++++++++++++++++ srcpkgs/vdirsyncer/template | 2 +- 2 files changed, 26 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..f3bee58f0cf --- /dev/null +++ b/srcpkgs/vdirsyncer/patches/0001-Update-usage-of-deprecated-method.patch @@ -0,0 +1,25 @@ +From 7577fa21177442aacc2d86640ef28cebf1c4aaef Mon Sep 17 00:00:00 2001 +From: Hugo Osvaldo Barrera +Date: Tue, 9 Jun 2020 17:04:46 +0200 +Subject: [PATCH] Update usage of deprecated method + +--- + vdirsyncer/storage/dav.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py +index 07d164f..a7e2422 100644 +--- a/vdirsyncer/storage/dav.py ++++ b/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