[packages/evolution-etesync] Rel 2
arekm
arekm at pld-linux.org
Sat Aug 22 23:15:04 CEST 2026
commit 8066135036833d24cacd6eafd4e68cd6762c4fb9
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Aug 22 23:14:50 2026 +0200
Rel 2
evolution-etesync-mtime-int64.patch | 100 ++++++++++++++++++++++++++++++++++++
evolution-etesync-notes-mtime.patch | 24 +++++++++
evolution-etesync.spec | 6 ++-
3 files changed, 129 insertions(+), 1 deletion(-)
---
diff --git a/evolution-etesync.spec b/evolution-etesync.spec
index 8c79813..bbec8e6 100644
--- a/evolution-etesync.spec
+++ b/evolution-etesync.spec
@@ -2,12 +2,14 @@ Summary: Module for accessing EteSync accounts through Evolution
Summary(pl.UTF-8): Moduł pozwalający na dostęp do kont EteSync z poziomu Evolution
Name: evolution-etesync
Version: 1.1.2
-Release: 1
+Release: 2
License: LGPL v2+
Group: X11/Applications/Mail
#Source0Download: https://gitlab.gnome.org/GNOME/evolution-etesync/-/tags
Source0: https://gitlab.gnome.org/GNOME/evolution-etesync/-/archive/%{version}/%{name}-%{version}.tar.bz2
# Source0-md5: f2ffe597588ccc1f4a5e7b2173258aa7
+Patch0: %{name}-mtime-int64.patch
+Patch1: %{name}-notes-mtime.patch
URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
BuildRequires: cmake >= 3.15
BuildRequires: evolution-data-server-devel >= 3.34.0
@@ -32,6 +34,8 @@ Moduł pozwalający na dostęp do kont EteSync z poziomu Evolution.
%prep
%setup -q
+%patch -P0 -p1
+%patch -P1 -p1
%build
install -d build
diff --git a/evolution-etesync-mtime-int64.patch b/evolution-etesync-mtime-int64.patch
new file mode 100644
index 0000000..1b6526b
--- /dev/null
+++ b/evolution-etesync-mtime-int64.patch
@@ -0,0 +1,100 @@
+* Etebase mtime is an int64_t count of milliseconds since epoch, not a time_t.
+ Where time_t is 32-bit the millisecond value does not even fit, and GCC 14+
+ rejects the time_t* -> const int64_t* argument (-Wincompatible-pointer-types).
+
+--- evolution-etesync-1.1.2.orig/src/common/e-etesync-connection.c 2026-01-09 07:49:42.000000000 +0100
++++ evolution-etesync-1.1.2/src/common/e-etesync-connection.c 2026-08-22 23:02:23.523840529 +0200
+@@ -436,7 +436,7 @@
+ EtebaseCollection *col_obj;
+ EtebaseItemMetadata *item_metadata;
+ gboolean success = TRUE;
+- time_t now;
++ int64_t now;
+
+ g_return_val_if_fail (connection != NULL, FALSE);
+ g_return_val_if_fail (display_name != NULL, FALSE);
+@@ -489,7 +489,7 @@
+ {
+ EtebaseItemMetadata *item_metadata;
+ gboolean success = TRUE;
+- time_t now;
++ int64_t now;
+ GError *local_error = NULL;
+
+ g_return_val_if_fail (connection != NULL, FALSE);
+@@ -537,7 +537,7 @@
+ {
+ EtebaseItemMetadata *item_metadata;
+ gboolean success = TRUE;
+- time_t now;
++ int64_t now;
+
+ g_return_val_if_fail (connection != NULL, FALSE);
+ g_return_val_if_fail (col_obj != NULL, FALSE);
+@@ -745,7 +745,7 @@
+ EtebaseItemMetadata *item_meta;
+ const gchar *summary;
+ gchar *ical_str;
+- time_t now;
++ int64_t now;
+
+ item_meta = etebase_item_get_meta (item);
+ summary = etebase_item_metadata_get_name (item_meta);
+@@ -892,7 +892,7 @@
+ EtebaseItemMetadata *item_meta;
+ const gchar *summary;
+ gchar *ical_str;
+- time_t now;
++ int64_t now;
+
+ item_meta = etebase_item_get_meta (item);
+ summary = etebase_item_metadata_get_name (item_meta);
+@@ -992,7 +992,7 @@
+ if (item_mgr) {
+ EtebaseItemMetadata *item_metadata = NULL;
+ EtebaseItem *item;
+- time_t now;
++ int64_t now;
+ gchar *item_name, *item_content; /* Added to support EteSync notes type */
+
+ e_etesync_utils_get_time_now (&now);
+@@ -1112,7 +1112,7 @@
+ if (item_mgr) {
+ EtebaseItem *items[content_len];
+ guint ii;
+- time_t now;
++ int64_t now;
+
+ e_etesync_utils_get_time_now (&now);
+
+@@ -1247,7 +1247,7 @@
+ if (item_mgr) {
+ EtebaseItem *items[content_len];
+ guint ii;
+- time_t now;
++ int64_t now;
+
+ e_etesync_utils_get_time_now (&now);
+
+--- evolution-etesync-1.1.2.orig/src/common/e-etesync-utils.c 2026-01-09 07:49:42.000000000 +0100
++++ evolution-etesync-1.1.2/src/common/e-etesync-utils.c 2026-08-22 23:02:23.521542153 +0200
+@@ -24,7 +24,7 @@
+ "My Notes"};
+
+ void
+-e_etesync_utils_get_time_now (time_t *now)
++e_etesync_utils_get_time_now (int64_t *now)
+ {
+ *now = g_get_real_time() / 1000;
+ }
+--- evolution-etesync-1.1.2.orig/src/common/e-etesync-utils.h 2026-01-09 07:49:42.000000000 +0100
++++ evolution-etesync-1.1.2/src/common/e-etesync-utils.h 2026-08-22 23:02:23.519153766 +0200
+@@ -23,7 +23,7 @@
+
+ G_BEGIN_DECLS
+
+-void e_etesync_utils_get_time_now (time_t *now);
++void e_etesync_utils_get_time_now (int64_t *now);
+ gboolean e_etesync_utils_get_component_uid_revision
+ (const gchar *content,
+ gchar **out_component_uid,
diff --git a/evolution-etesync-notes-mtime.patch b/evolution-etesync-notes-mtime.patch
new file mode 100644
index 0000000..c3fff40
--- /dev/null
+++ b/evolution-etesync-notes-mtime.patch
@@ -0,0 +1,24 @@
+* e_etesync_utils_get_time_now() yields milliseconds, while
+ e_etesync_connection_notes_new_ical_string() takes seconds, so notes got
+ CREATED/LAST-MODIFIED some 55000 years in the future.
+
+--- evolution-etesync-1.1.2.orig/src/common/e-etesync-connection.c 2026-08-22 23:02:23.523840529 +0200
++++ evolution-etesync-1.1.2/src/common/e-etesync-connection.c 2026-08-22 23:02:23.540910650 +0200
+@@ -753,7 +753,7 @@
+ e_etesync_utils_get_time_now (&now);
+
+ /* change plain text to a icomp vjournal object */
+- ical_str = e_etesync_connection_notes_new_ical_string ((time_t) now, (time_t) now, data_uid, NULL, summary, content ? content : buf);
++ ical_str = e_etesync_connection_notes_new_ical_string ((time_t) (now / 1000), (time_t) (now / 1000), data_uid, NULL, summary, content ? content : buf);
+ nfo = e_cal_meta_backend_info_new (data_uid, NULL, ical_str, item_cache_b64);
+
+ g_free (ical_str);
+@@ -900,7 +900,7 @@
+ e_etesync_utils_get_time_now (&now);
+
+ /* change plain text to a icomp vjournal object */
+- ical_str = e_etesync_connection_notes_new_ical_string ((time_t) now, (time_t) now, data_uid, NULL, summary, content ? content : buf);
++ ical_str = e_etesync_connection_notes_new_ical_string ((time_t) (now / 1000), (time_t) (now / 1000), data_uid, NULL, summary, content ? content : buf);
+ nfo = e_cal_meta_backend_info_new (data_uid, NULL, ical_str, item_cache_b64);
+
+ g_free (ical_str);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/evolution-etesync.git/commitdiff/8066135036833d24cacd6eafd4e68cd6762c4fb9
More information about the pld-cvs-commit
mailing list