[packages/gnome-shell] - added libical4 fix from unmerged PR; release 2
qboosh
qboosh at pld-linux.org
Thu Jul 23 10:57:22 CEST 2026
commit 646f6f6ba0f1447ed5b16928302e512559242bf5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Jul 23 10:57:33 2026 +0200
- added libical4 fix from unmerged PR; release 2
gnome-shell-libical4.patch | 41 +++++++++++++++++++++++++++++++++++++++++
gnome-shell.spec | 5 ++++-
2 files changed, 45 insertions(+), 1 deletion(-)
---
diff --git a/gnome-shell.spec b/gnome-shell.spec
index 66714da..19fa9a3 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -26,12 +26,14 @@ Summary: Window manager and application launcher for GNOME
Summary(pl.UTF-8): Zarządca okien i uruchamiania aplikacji dla GNOME
Name: gnome-shell
Version: 50.3
-Release: 1
+Release: 2
License: GPL v2+
Group: X11/Window Managers
Source0: https://download.gnome.org/sources/gnome-shell/50/%{name}-%{version}.tar.xz
# Source0-md5: e3864e7b048ac53f644ab416c0f38a52
Patch0: %{name}-no-update.patch
+# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/4215.patch
+Patch1: %{name}-libical4.patch
URL: https://wiki.gnome.org/Projects/GnomeShell
BuildRequires: NetworkManager-devel >= %{NetworkManager_ver}
BuildRequires: at-spi2-atk-devel
@@ -176,6 +178,7 @@ Ten pakiet dostarcza dokumentację API GNOME Shell.
%prep
%setup -q
%patch -P0 -p1
+%patch -P1 -p1
%build
%meson \
diff --git a/gnome-shell-libical4.patch b/gnome-shell-libical4.patch
new file mode 100644
index 0000000..9441511
--- /dev/null
+++ b/gnome-shell-libical4.patch
@@ -0,0 +1,41 @@
+From 7ce9e5e974ab574e28ef1ffc59cfe97c78efd995 Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111 at xry111.site>
+Date: Fri, 8 May 2026 13:13:37 +0800
+Subject: [PATCH] calendar: Fix build failure with libical 4
+
+Fix the following build error with libical 4 due to function signature changes:
+
+ error: passing argument 4 of 'get_time_from_property' from incompatible pointer type [-Wincompatible-pointer-types]
+ note: expected 'ICalTime * (*)(ICalProperty *)' but argument is of type 'ICalTime * (*)(const ICalProperty *)'
+
+Link: https://github.com/libical/libical/blob/4.0/docs/MigrationGuide_to_4.md#const-pointers
+---
+ src/calendar-server/gnome-shell-calendar-server.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/calendar-server/gnome-shell-calendar-server.c b/src/calendar-server/gnome-shell-calendar-server.c
+index 0b2f88eb7e..238969edb9 100644
+--- a/src/calendar-server/gnome-shell-calendar-server.c
++++ b/src/calendar-server/gnome-shell-calendar-server.c
+@@ -112,11 +112,17 @@ typedef struct
+ time_t end_time;
+ } CalendarAppointment;
+
++#if ICAL_MAJOR_VERSION >= 4
++typedef ICalTime * (* get_prop_func_type) (const ICalProperty *prop);
++#else
++typedef ICalTime * (* get_prop_func_type) (ICalProperty *prop);
++#endif
++
+ static gboolean
+ get_time_from_property (ECalClient *cal,
+ ICalComponent *icomp,
+ ICalPropertyKind prop_kind,
+- ICalTime * (* get_prop_func) (ICalProperty *prop),
++ get_prop_func_type get_prop_func,
+ ICalTimezone *default_zone,
+ ICalTime **out_itt,
+ ICalTimezone **out_timezone)
+--
+GitLab
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnome-shell.git/commitdiff/646f6f6ba0f1447ed5b16928302e512559242bf5
More information about the pld-cvs-commit
mailing list