[packages/almanah] Rel 3
arekm
arekm at pld-linux.org
Sat Aug 22 12:45:05 CEST 2026
commit 48d979d25d33f097521871ce0355e0926d433221
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Aug 22 12:44:43 2026 +0200
Rel 3
almanah-libical4.patch | 26 ++++++++++++++++++++++++++
almanah.spec | 12 ++++++++++--
2 files changed, 36 insertions(+), 2 deletions(-)
---
diff --git a/almanah.spec b/almanah.spec
index b8f7a56..2f0d4f2 100644
--- a/almanah.spec
+++ b/almanah.spec
@@ -2,20 +2,23 @@
# Conditional build:
%bcond_without evolution # Evolution calendar integration
%bcond_without gtkspell # GtkSpell spell checking
+%bcond_without tests # unit tests
Summary: Almanah Diary - keep a personal diary
Summary(pl.UTF-8): Almanah Diary - osobisty pamiętnik
Name: almanah
Version: 0.12.4
-Release: 2
+Release: 3
License: GPL v3+
Group: X11/Applications
Source0: https://download.gnome.org/sources/almanah/0.12/%{name}-%{version}.tar.xz
# Source0-md5: b5d0e39c4f45bf8adfb53bd44461871c
+Patch0: %{name}-libical4.patch
URL: https://wiki.gnome.org/Apps/Almanah_Diary
-BuildRequires: AppStream
+%{?with_tests:BuildRequires: AppStream}
BuildRequires: atk-devel
BuildRequires: cairo-devel
+%{?with_tests:BuildRequires: desktop-file-utils}
%{?with_evolution:BuildRequires: evolution-data-server-devel >= 3.33.2}
BuildRequires: gettext-tools
BuildRequires: gcr4-devel >= 4
@@ -52,6 +55,7 @@ pamiętnik.
%prep
%setup -q
+%patch -P0 -p1
%build
%meson \
@@ -60,6 +64,10 @@ pamiętnik.
%meson_build
+%if %{with tests}
+%meson_test
+%endif
+
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/almanah-libical4.patch b/almanah-libical4.patch
new file mode 100644
index 0000000..62e1e41
--- /dev/null
+++ b/almanah-libical4.patch
@@ -0,0 +1,26 @@
+--- almanah-0.12.4/src/event-factories/calendar-client.c.orig
++++ almanah-0.12.4/src/event-factories/calendar-client.c
+@@ -477,7 +477,11 @@
+ static time_t
+ get_time_from_property (ICalComponent *ical,
+ ICalPropertyKind prop_kind,
++#if ICAL_CHECK_VERSION(4, 0, 0)
++ ICalTime * (* get_prop_func) (const ICalProperty *prop),
++#else
+ ICalTime * (* get_prop_func) (ICalProperty *prop),
++#endif
+ ICalTimezone *default_zone)
+ {
+ ICalProperty *prop;
+@@ -614,7 +618,11 @@
+
+ duration = i_cal_property_get_duration (prop);
+
++#if ICAL_CHECK_VERSION(4, 0, 0)
++ retval = i_cal_duration_as_seconds (duration) % 86400 == 0;
++#else
+ retval = i_cal_duration_as_int (duration) % 86400 == 0;
++#endif
+
+ g_object_unref (duration);
+ g_object_unref (prop);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/almanah.git/commitdiff/48d979d25d33f097521871ce0355e0926d433221
More information about the pld-cvs-commit
mailing list