CVS commit: pkgsrc/time/khal

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Thu Oct 31 13:35:05 UTC 2024

Modified Files:
        pkgsrc/time/khal: Makefile distinfo
Added Files:
        pkgsrc/time/khal/patches: patch-khal_icalendar.py patch-setup.py

Log Message:
khal: Make it compatible with icalendar>=6.0.0

Adjust the code in order to be compatible with (and require)
icalendar>=6.0.0.

Now all tests passes (remove the comment due that).

PKGREVISION++


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/time/khal/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/time/khal/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/time/khal/patches/patch-khal_icalendar.py \
    pkgsrc/time/khal/patches/patch-setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/time/khal/Makefile
diff -u pkgsrc/time/khal/Makefile:1.46 pkgsrc/time/khal/Makefile:1.47
--- pkgsrc/time/khal/Makefile:1.46      Mon Oct 14 06:46:04 2024
+++ pkgsrc/time/khal/Makefile   Thu Oct 31 13:35:05 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2024/10/14 06:46:04 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2024/10/31 13:35:05 leot Exp $
 
 DISTNAME=      khal-0.11.3
+PKGREVISION=   1
 CATEGORIES=    time net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=k/khal/}
 
@@ -16,7 +17,7 @@ DEPENDS+=     ${PYPKGPREFIX}-click>=3.2:../.
 DEPENDS+=      ${PYPKGPREFIX}-click-log>=0.2.0:../../devel/py-click-log
 DEPENDS+=      ${PYPKGPREFIX}-configobj-[0-9]*:../../devel/py-configobj
 DEPENDS+=      ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
-DEPENDS+=      ${PYPKGPREFIX}-icalendar>=4.0.3:../../time/py-icalendar
+DEPENDS+=      ${PYPKGPREFIX}-icalendar>=6.0.0:../../time/py-icalendar
 DEPENDS+=      ${PYPKGPREFIX}-pytz>=2018.7:../../time/py-pytz
 DEPENDS+=      ${PYPKGPREFIX}-tzlocal>=1.0:../../time/py-tzlocal
 DEPENDS+=      ${PYPKGPREFIX}-urwid>=1.3.0:../../devel/py-urwid
@@ -46,8 +47,6 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/khal.conf.sample ${DESTDIR}${PREFIX}/share/doc/khal
        ${INSTALL_MAN} ${WRKSRC}/doc/build/man/khal.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
-# as of 0.11.3
-# 5 failed, 307 passed, 1 xfailed, 2 xpassed, 15 warnings
 do-test:
        cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests
 

Index: pkgsrc/time/khal/distinfo
diff -u pkgsrc/time/khal/distinfo:1.29 pkgsrc/time/khal/distinfo:1.30
--- pkgsrc/time/khal/distinfo:1.29      Tue Aug  6 17:24:11 2024
+++ pkgsrc/time/khal/distinfo   Thu Oct 31 13:35:05 2024
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.29 2024/08/06 17:24:11 wiz Exp $
+$NetBSD: distinfo,v 1.30 2024/10/31 13:35:05 leot Exp $
 
 BLAKE2s (khal-0.11.3.tar.gz) = 18e613451c2d983b17cdac8c61d61f4d794c3b1c8aaeebff4b1b46014076effd
 SHA512 (khal-0.11.3.tar.gz) = 1f7f82e04ad913df9e2e4bd315a70b9832b1af3f6d2db794018c780645f5bdb6df39efb45a36b38e3c1327932a1cb91d4c735f578b29a9326ef0f163fecd7bba
 Size (khal-0.11.3.tar.gz) = 196953 bytes
 SHA1 (patch-doc_source_conf.py) = f42c6e242617dee1c89d36ab9e219ea27f50657f
+SHA1 (patch-khal_icalendar.py) = e0c0381b6b3aa183848734250b34c3db6f3dc0b5
+SHA1 (patch-setup.py) = 3cb740be92ddc62f093c3961d39480137ba413a6

Added files:

Index: pkgsrc/time/khal/patches/patch-khal_icalendar.py
diff -u /dev/null pkgsrc/time/khal/patches/patch-khal_icalendar.py:1.1
--- /dev/null   Thu Oct 31 13:35:05 2024
+++ pkgsrc/time/khal/patches/patch-khal_icalendar.py    Thu Oct 31 13:35:05 2024
@@ -0,0 +1,32 @@
+$NetBSD: patch-khal_icalendar.py,v 1.1 2024/10/31 13:35:05 leot Exp $
+
+Make it compatible with icalendar>=6.0.0.
+
+Shared upstream via:
+
+ <https://github.com/pimutils/khal/pull/1364>
+
+--- khal/icalendar.py.orig     2024-10-31 13:32:32.407885997 +0000
++++ khal/icalendar.py
+@@ -37,6 +37,10 @@ from .utils import generate_random_uid, 
+ 
+ logger = logging.getLogger('khal')
+ 
++# Force use of pytz because we rely on functionalities not available in
++# zoneinfo.
++icalendar.use_pytz()
++
+ 
+ def split_ics(ics: str, random_uid: bool=False, default_timezone=None):
+     """split an ics string into several according to VEVENT's UIDs
+@@ -56,8 +60,8 @@ def split_ics(ics: str, random_uid: bool
+         # Standard Time' for 'Pacific/Auckland' in Olson format), we convert any
+         # Windows format timezones to Olson.
+         if item.name == 'VTIMEZONE':
+-            if item['TZID'] in icalendar.windows_to_olson.WINDOWS_TO_OLSON:
+-                key = icalendar.windows_to_olson.WINDOWS_TO_OLSON[item['TZID']]
++            if item['TZID'] in icalendar.timezone.windows_to_olson.WINDOWS_TO_OLSON:
++                key = icalendar.timezone.windows_to_olson.WINDOWS_TO_OLSON[item['TZID']]
+             else:
+                 key = item['TZID']
+             tzs[key] = item
Index: pkgsrc/time/khal/patches/patch-setup.py
diff -u /dev/null pkgsrc/time/khal/patches/patch-setup.py:1.1
--- /dev/null   Thu Oct 31 13:35:05 2024
+++ pkgsrc/time/khal/patches/patch-setup.py     Thu Oct 31 13:35:05 2024
@@ -0,0 +1,19 @@
+$NetBSD: patch-setup.py,v 1.1 2024/10/31 13:35:05 leot Exp $
+
+Make it compatible with icalendar>=6.0.0.
+
+Shared upstream via:
+
+ <https://github.com/pimutils/khal/pull/1364>
+
+--- setup.py.orig      2024-10-31 13:29:01.578288212 +0000
++++ setup.py
+@@ -13,7 +13,7 @@ if sys.version_info < (3, 8):
+ requirements = [
+     'click>=3.2',
+     'click_log>=0.2.0',
+-    'icalendar>=4.0.3',
++    'icalendar>=6.0.0',
+     'urwid>=1.3.0',
+     'pyxdg',
+     'pytz',