From c319640a113aae55c924706dc3f2ef59ddbf443d Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 28 Dec 2015 15:28:28 +0100 Subject: [PATCH] vdirsyncer: upstream patch to allow lxml>=3.5 Fix a packaging bug that prevent vdirsyncer from working with newer lxml versions. While I'm here: - the icalendar package is not a dependency since version 0.4.4; removed. - install the example config file. Close #3242. --- srcpkgs/vdirsyncer/patches/lxml.patch | 36 +++++++++++++++++++++++++++ srcpkgs/vdirsyncer/template | 9 ++++--- 2 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/vdirsyncer/patches/lxml.patch diff --git a/srcpkgs/vdirsyncer/patches/lxml.patch b/srcpkgs/vdirsyncer/patches/lxml.patch new file mode 100644 index 00000000000..f84994d04ce --- /dev/null +++ b/srcpkgs/vdirsyncer/patches/lxml.patch @@ -0,0 +1,36 @@ +From 4e8dbe9598cab324c5883f21257dd476c45815aa Mon Sep 17 00:00:00 2001 +From: Markus Unterwaditzer +Date: Sun, 27 Dec 2015 23:38:02 +0100 +Subject: [PATCH] Only pin down lxml version for PyPy + +--- + setup.py | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git setup.py setup.py +index 0a4efa6..bffa14b 100644 +--- setup.py ++++ setup.py +@@ -11,6 +11,7 @@ + + + from setuptools import find_packages, setup ++import platform + + + setup( +@@ -37,8 +38,12 @@ + 'click-threading', + # https://github.com/kennethreitz/requests/issues/2930 + 'requests !=2.9.0', +- # https://github.com/untitaker/vdirsyncer/issues/298 +- 'lxml >=3.1, <=3.4.4', ++ 'lxml >=3.1' + ( ++ # https://github.com/untitaker/vdirsyncer/issues/298 ++ ', <=3.4.4' ++ if platform.python_implementation() == 'PyPy' ++ else '' ++ ), + # https://github.com/sigmavirus24/requests-toolbelt/pull/28 + 'requests_toolbelt >=0.5.0', + 'atomicwrites' diff --git a/srcpkgs/vdirsyncer/template b/srcpkgs/vdirsyncer/template index 28427888120..c9d7110fab2 100644 --- a/srcpkgs/vdirsyncer/template +++ b/srcpkgs/vdirsyncer/template @@ -1,11 +1,12 @@ # Template file for 'vdirsyncer' pkgname=vdirsyncer version=0.7.4 -revision=1 +revision=2 noarch=yes build_style=python-module hostmakedepends="python-setuptools" -depends="python-atomicwrites python-click python-click-log python-click-threading python-icalendar python-lxml python-setuptools python-requests python-requests-toolbelt" +depends="python-atomicwrites python-click python-click-log python-click-threading + python-lxml python-setuptools python-requests-toolbelt" pycompile_module="vdirsyncer" short_desc="Synchronize calendars and addressbooks" maintainer="Oliver Kiddle " @@ -20,7 +21,7 @@ pre_build() { version='${version}'," \ -i setup.py } - post_install() { - vlicense LICENSE + vsconf config.example + vlicense LICENSE }