From ae39425fa19742d32a8631b7ba378920167cd928 Mon Sep 17 00:00:00 2001 From: H09-0 Date: Mon, 25 May 2026 10:14:24 +0300 Subject: [PATCH 1/2] Fix ICal version requirement for libical 4.0 compatibility --- calendar-server/cinnamon-calendar-server.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/calendar-server/cinnamon-calendar-server.py b/calendar-server/cinnamon-calendar-server.py index 9145f6e207..8fc5090736 100755 --- a/calendar-server/cinnamon-calendar-server.py +++ b/calendar-server/cinnamon-calendar-server.py @@ -13,7 +13,10 @@ import gi gi.require_version('EDataServer', '1.2') gi.require_version('ECal', '2.0') -gi.require_version('ICal', '3.0') +try: + gi.require_version('ICal', '3.0') +except ValueError: + gi.require_version('ICal', '4.0') gi.require_version('Cinnamon', '0.1') from gi.repository import GLib, Gio, GObject from gi.repository import EDataServer, ECal, ICal, ICalGLib From 327840e86c58a96172dbe79a043d37bbb193f6c0 Mon Sep 17 00:00:00 2001 From: H09-0 Date: Mon, 25 May 2026 10:19:56 +0300 Subject: [PATCH 2/2] fix(calendar-server): support ICal 4.0 with fallback from 3.0 --- calendar-server/cinnamon-calendar-server.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/calendar-server/cinnamon-calendar-server.py b/calendar-server/cinnamon-calendar-server.py index 8fc5090736..931b4459c6 100755 --- a/calendar-server/cinnamon-calendar-server.py +++ b/calendar-server/cinnamon-calendar-server.py @@ -13,10 +13,14 @@ import gi gi.require_version('EDataServer', '1.2') gi.require_version('ECal', '2.0') -try: +for ical_version in ('3.0', '4.0'): + try: + gi.require_version('ICal', ical_version) + break + except ValueError: + continue +else: gi.require_version('ICal', '3.0') -except ValueError: - gi.require_version('ICal', '4.0') gi.require_version('Cinnamon', '0.1') from gi.repository import GLib, Gio, GObject from gi.repository import EDataServer, ECal, ICal, ICalGLib