mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-15 16:07:26 +00:00
Code Issues Projects Releases Wiki Activity

gnome-calendar: fix build against libical 4.0

Browse Source 
gnome-calendar 48.0 fails to compile against libical 4.0 (as shipped by
oe-core) because several libical-glib APIs it uses were changed or removed:

* i_cal_recurrence_get_by_day()/set_by_day() were replaced by generic
  accessors taking an ICalRecurrenceByRule selector, i.e.
  i_cal_recurrence_get_by()/set_by() with I_CAL_BY_DAY.
* i_cal_errno_return() was removed in favour of i_cal_error_icalerrno().
* ICalTime became a registered GObject type and libical-glib now defines
  its g_autoptr() cleanup function itself, making the local
  G_DEFINE_AUTOPTR_CLEANUP_FUNC (ICalTime, ...) a redefinition.

Add a patch guarding all three on ICAL_CHECK_VERSION(4, 0, 0) so the
recipe keeps building against both libical 3.x and 4.x. Upstream has not
migrated yet, so a version bump does not help here.

Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
Khem Raj
2026-07-02 21:11:36 +00:00
parent 1e4599311b
commit 0bd556ec1c
2 changed files with 89 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar/0001-Support-building-against-libical-4.0.patch
+87
View File
@@ -0,0 +1,87 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 2 Jul 2026 00:00:00 +0000
Subject: [PATCH] Support building against libical 4.0
libical 4.0 changed several parts of its GObject (libical-glib) API in
ways that break gnome-calendar:
* The per-part recurrence accessors i_cal_recurrence_get_by_day() and
i_cal_recurrence_set_by_day() were removed in favour of generic
accessors i_cal_recurrence_get_by()/i_cal_recurrence_set_by() that
take an ICalRecurrenceByRule selector.
* i_cal_errno_return() was removed; the current error number is now
obtained through i_cal_error_icalerrno().
* ICalTime became a registered GObject-derived type and libical-glib
now defines its g_autoptr() cleanup function itself, so the local
G_DEFINE_AUTOPTR_CLEANUP_FUNC() in gcal-utils.h is a redefinition.
Guard all three on ICAL_CHECK_VERSION(4, 0, 0) so the code keeps
building against both libical 3.x and 4.x.
Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-calendar/-/issues]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/core/gcal-recurrence.c | 10 ++++++++++
src/gui/importer/gcal-importer.c | 4 ++++
src/utils/gcal-utils.h | 4 ++++
3 files changed, 18 insertions(+)
diff --git a/src/core/gcal-recurrence.c b/src/core/gcal-recurrence.c
index 3d271036..2cdf85c5 100644
--- a/src/core/gcal-recurrence.c
+++ b/src/core/gcal-recurrence.c
@@ -22,6 +22,16 @@
#include <glib.h>
+/* libical 4.0 dropped the per-part i_cal_recurrence_{get,set}_by_day()
+ * accessors in favour of generic ones taking an ICalRecurrenceByRule
+ * selector. Keep the old spelling working when building against it. */
+#if ICAL_CHECK_VERSION (4, 0, 0)
+#define i_cal_recurrence_get_by_day(recur, index) \
+ i_cal_recurrence_get_by ((recur), I_CAL_BY_DAY, (index))
+#define i_cal_recurrence_set_by_day(recur, index, value) \
+ i_cal_recurrence_set_by ((recur), I_CAL_BY_DAY, (index), (value))
+#endif
+
G_DEFINE_BOXED_TYPE (GcalRecurrence, gcal_recurrence, gcal_recurrence_ref, gcal_recurrence_unref)
static void
diff --git a/src/gui/importer/gcal-importer.c b/src/gui/importer/gcal-importer.c
index 7b0bbf10..cfc4eaee 100644
--- a/src/gui/importer/gcal-importer.c
+++ b/src/gui/importer/gcal-importer.c
@@ -147,7 +147,11 @@ read_file_in_thread (GTask *task,
g_assert (g_utf8_validate (contents, length, NULL));
component = i_cal_parser_parse_string (contents);
+#if ICAL_CHECK_VERSION (4, 0, 0)
+ ical_error = i_cal_error_icalerrno ();
+#else
ical_error = i_cal_errno_return ();
+#endif
if (ical_error != I_CAL_NO_ERROR)
{
diff --git a/src/utils/gcal-utils.h b/src/utils/gcal-utils.h
index d7be86d9..0764e6ca 100644
--- a/src/utils/gcal-utils.h
+++ b/src/utils/gcal-utils.h
@@ -47,7 +47,11 @@ typedef void (*GcalAskRecurrenceCallback) (GcalEvent *event,
GcalRecurrenceModType modtype,
gpointer user_data);
+/* libical-glib 4.0 makes ICalTime a registered GObject type and defines the
+ * autoptr cleanup func itself, so only declare it for older libical. */
+#if !ICAL_CHECK_VERSION (4, 0, 0)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ICalTime, g_object_unref)
+#endif
gchar* gcal_get_weekday (gint i);
--
2.43.0
meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_48.0.bb
+2
View File
@@ -21,6 +21,8 @@ inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-versi
REQUIRED_DISTRO_FEATURES = "opengl"
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
SRC_URI += "file://0001-Support-building-against-libical-4.0.patch"
SRC_URI[archive.sha256sum] = "e69a5a66be820105a4d823d4dba9b4e6ef9f6e7523978aaf33361ebbb993e604"
FILES:${PN} += " \