rebuild for F44 https://fedoraproject.org/wiki/Changes/cmark-0.31

[skip changelog]

.cvsignore

@@ -1 +0,0 @@
-evolution-2.5.91.tar.bz2

.gitignore

@@ -0,0 +1 @@
+/evolution-*.tar.xz

Makefile

@@ -1,6 +0,0 @@
-# Makefile for source rpm: evolution
-# $Id$
-NAME := evolution
-SPECFILE = $(firstword $(wildcard *.spec))
-
-include ../common/Makefile.common

configurable-dbus-prefix.patch

@@ -0,0 +1,42 @@
+diff -up evolution-3.48.1 evolution-3.48
+diff -up evolution-3.48.1/docs/evolution.1 evolution-3.48.1/docs/evolution
+diff -up evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c.1 evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c
+--- evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c.1	2023-11-27 13:12:25.099463743 -0500
++++ evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c	2023-11-27 13:14:38.640243434 -0500
+@@ -674,7 +674,7 @@ get_source_manager_reload_command (void)
+ 			g_string_free (tmp, TRUE);
+ 			tmp = NULL;
+ 
+-			base_filename = g_strdup (EDS_SOURCES_DBUS_SERVICE_NAME);
++			base_filename = g_ascii_strdown (EDS_SOURCES_DBUS_SERVICE_NAME, -1);
+ 
+ 			if (!base_filename || !*base_filename) {
+ 				g_free (base_filename);
+@@ -690,14 +690,16 @@ get_source_manager_reload_command (void)
+ 
+ 			while (!tmp) {
+ 				const gchar *name;
++				gchar *name_down;
+ 
+ 				name = g_dir_read_name (dir);
++				name_down = g_ascii_strdown (name, -1);
+ 
+ 				if (!name)
+ 					break;
+ 
+-				if (g_ascii_strncasecmp (name, base_filename, base_filename_len) == 0 &&
+-				    g_ascii_strncasecmp (name + strlen (name) - 8, ".service", 8) == 0) {
++				if (strstr (name_down, base_filename) != NULL &&
++				    strncmp (name_down + strlen (name) - 8, ".service", 8) == 0) {
+ 					gchar *filename;
+ 
+ 					filename = g_strconcat ("$DBUSDATADIR", G_DIR_SEPARATOR_S, name, NULL);
+@@ -724,6 +726,8 @@ get_source_manager_reload_command (void)
+ 						g_free (str);
+ 					}
+ 				}
++
++				g_free (name_down);
+ 			}
+ 
+ 			g_free (base_filename);

evolution-1.4.4-ldap-x86_64-hack.patch

@@ -1,11 +0,0 @@
---- evolution-1.4.4/configure.ldaphack	2003-08-05 02:06:26.000000000 -0400
-+++ evolution-1.4.4/configure	2003-08-05 02:06:45.000000000 -0400
-@@ -12135,7 +12135,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
-+LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */

evolution-2.0.2-fix-145552.patch

@@ -1,26 +0,0 @@
---- evolution-2.0.2/mail/em-utils.c.fix-145552	2004-09-24 11:49:29.000000000 -0400
-+++ evolution-2.0.2/mail/em-utils.c	2005-08-02 22:42:04.000000000 -0400
-@@ -1919,10 +1919,22 @@
- 	 * try to do better with the filename check.
- 	 */
- 	
-+	/* RH bug 145552:  code based on _gnome_vfs_get_mime_type_internal:
-+	 * So many file types come compressed by gzip 
-+	 * that extensions are more reliable than magic
-+	 * typing. If the file has a suffix, then use
-+	 * the type from the suffix:
-+	 */
- 	if (magic_type) {
- 		if (name_type
- 		    && (!strcmp(magic_type, "text/plain")
--			|| !strcmp(magic_type, "application/octet-stream")))
-+			|| !strcmp(magic_type, "application/octet-stream")
-+ 			|| !strcmp(magic_type, "application/octet-stream")
-+ 			|| !strcmp(magic_type, "application/x-ole-storage")
-+ 			|| !strcmp(magic_type, "text/xml")
-+ 			|| !strcmp(magic_type, "application/x-bzip")
-+ 			|| !strcmp(magic_type, "application/x-gzip")
-+ 			|| !strcmp(magic_type, "application/zip")))
- 			return name_type;
- 		else
- 			return magic_type;

evolution-2.4.1-hide-switcher-buttons-by-default.patch

@@ -1,11 +0,0 @@
---- evolution-2.4.1/shell/apps_evolution_shell.schemas.in.in.hide-switcher-buttons-by-default	2005-10-26 16:21:15.000000000 -0400
-+++ evolution-2.4.1/shell/apps_evolution_shell.schemas.in.in	2005-10-26 16:21:22.000000000 -0400
-@@ -99,7 +99,7 @@
-       <applyto>/apps/evolution/shell/view_defaults/buttons_visible</applyto>
-       <owner>evolution</owner>
-       <type>bool</type>
--      <default>TRUE</default>
-+      <default>FALSE</default>
-       <locale name="C">
-         <short>Window buttons are visible</short>
-         <long>Whether the window buttons should be visible.</long>

evolution-2.5.4-fix-conduit-dir.patch

@@ -1,44 +0,0 @@
---- evolution-2.5.4/addressbook/conduit/Makefile.am.fix-conduit-dir	2004-12-02 22:39:53.000000000 -0500
-+++ evolution-2.5.4/addressbook/conduit/Makefile.am	2006-01-11 00:21:25.000000000 -0500
-@@ -28,7 +28,7 @@
- 	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
- 	    $< > $@
- 
--conduitdir = $(datadir)/gnome-pilot/conduits/
-+conduitdir = $(libdir)/gnome-pilot/conduits/
- conduit_DATA = e-address-$(BASE_VERSION).conduit
- 
- BUILT_SOURCES = $(conduit_DATA)
---- evolution-2.5.4/calendar/conduits/calendar/Makefile.am.fix-conduit-dir	2005-06-26 20:43:06.000000000 -0400
-+++ evolution-2.5.4/calendar/conduits/calendar/Makefile.am	2006-01-11 00:21:25.000000000 -0500
-@@ -24,7 +24,7 @@
- 	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
- 	    $< > $@
- 
--conduitdir = $(datadir)/gnome-pilot/conduits/
-+conduitdir = $(libdir)/gnome-pilot/conduits/
- conduit_DATA = e-calendar-$(BASE_VERSION).conduit
- 
- BUILT_SOURCES = $(conduit_DATA)
---- evolution-2.5.4/calendar/conduits/todo/Makefile.am.fix-conduit-dir	2005-06-26 20:43:07.000000000 -0400
-+++ evolution-2.5.4/calendar/conduits/todo/Makefile.am	2006-01-11 00:21:25.000000000 -0500
-@@ -24,7 +24,7 @@
- 	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
- 	    $< > $@
- 
--conduitdir = $(datadir)/gnome-pilot/conduits/
-+conduitdir = $(libdir)/gnome-pilot/conduits/
- conduit_DATA = e-todo-$(BASE_VERSION).conduit
- 
- BUILT_SOURCES = $(conduit_DATA)
---- evolution-2.5.4/calendar/conduits/memo/Makefile.am.fix-conduit-dir	2006-01-11 00:22:26.000000000 -0500
-+++ evolution-2.5.4/calendar/conduits/memo/Makefile.am	2006-01-11 00:22:39.000000000 -0500
-@@ -24,7 +24,7 @@
- 	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
- 	    $< > $@
- 
--conduitdir = $(datadir)/gnome-pilot/conduits/
-+conduitdir = $(libdir)/gnome-pilot/conduits/
- conduit_DATA = e-memo-$(BASE_VERSION).conduit
- 
- BUILT_SOURCES = $(conduit_DATA)

evolution-2.5.4-fix-conduits.patch

@@ -1,515 +0,0 @@
---- evolution-2.5.4/addressbook/conduit/address-conduit.c.fix-conduits	2005-12-08 03:15:02.000000000 -0500
-+++ evolution-2.5.4/addressbook/conduit/address-conduit.c	2006-01-10 19:33:44.000000000 -0500
-@@ -462,14 +462,19 @@
- {
- 	static char buff[ 4096 ];
- 	struct Address addr;
-+	pi_buffer_t piBuf;
- 
- 	if (remote == NULL) {
- 		sprintf (buff, "[NULL]");
- 		return buff;
- 	}
- 
-+	piBuf.data = remote->record;
-+	piBuf.allocated = remote->length;
-+	piBuf.used = remote->length;
-+
- 	memset (&addr, 0, sizeof (struct Address));
--	unpack_Address (&addr, remote->record, remote->length);
-+	unpack_Address (&addr, &piBuf, address_v1);
- 
- 	g_snprintf (buff, 4096, "['%s' '%s' '%s']",
- 		    addr.entry[entryLastname] ?
-@@ -791,7 +796,8 @@
- 			      EAddrConduitContext *ctxt)
- {
- 	GnomePilotRecord p;
--	static char record[0xffff];
-+	static unsigned char record[0xffff];
-+	pi_buffer_t piBuf;
- 	
- 	g_assert (local->addr != NULL );
- 	
-@@ -803,9 +809,17 @@
- 	p.archived = local->local.archived;
- 	p.secret = local->local.secret;
- 
-+	memset (&piBuf, 0, sizeof (piBuf));
-+	memset (record, 0, sizeof (record));
-+	pack_Address (local->addr, &piBuf, address_v1);
-+
- 	/* Generate pilot record structure */
-+	if (piBuf.used > 0)
-+		memcpy (record, piBuf.data, piBuf.used);
- 	p.record = record;
--	p.length = pack_Address (local->addr, p.record, 0xffff);
-+	p.length = piBuf.used;
-+	if (piBuf.data)
-+		free (piBuf.data);
- 
- 	return p;	
- }
-@@ -834,16 +848,16 @@
- 	 */
- 	if (local->local.ID != 0) {
- 		struct Address addr;
--		char record[0xffff];
-+		pi_buffer_t *buffer = pi_buffer_new (0xffff);
- 		int cat = 0;
- 		
- 		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
- 					ctxt->dbi->db_handle,
--					local->local.ID, &record, 
--					NULL, NULL, NULL, &cat) > 0) {
-+					local->local.ID, buffer, 
-+					NULL, NULL, &cat) > 0) {
- 			local->local.category = cat;
- 			memset (&addr, 0, sizeof (struct Address));
--			unpack_Address (&addr, record, 0xffff);
-+			unpack_Address (&addr, buffer, address_v1);
- 			for (i = 0; i < 5; i++) {
- 				if (addr.entry[entryPhone1 + i])
- 					local->addr->entry[entryPhone1 + i] = 
-@@ -858,6 +872,8 @@
- 			}
- 			free_Address (&addr);
- 		}
-+
-+		pi_buffer_free (buffer);
- 	}
- 
- 	local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_GIVEN_NAME));
-@@ -1019,10 +1035,16 @@
- 	EContactField next_mail, next_home, next_work, next_fax;
- 	EContactField next_other, next_main, next_pager, next_mobile;
- 	int i;
-+	pi_buffer_t piBuf;
- 
- 	g_return_val_if_fail(remote!=NULL,NULL);
- 	memset (&address, 0, sizeof (struct Address));
--	unpack_Address (&address, remote->record, remote->length);
-+
-+	piBuf.data = remote->record;
-+	piBuf.allocated = remote->length;
-+	piBuf.used = remote->length;
-+
-+	unpack_Address (&address, &piBuf, address_v1);
- 
- 	if (in_contact == NULL)
- 		contact = e_contact_new ();
-@@ -1212,7 +1234,7 @@
- 	EBookQuery *query;
-     	GList *l;
- 	int len;
--	unsigned char *buf;
-+	pi_buffer_t *buffer;
- 	char *filename;
- 	char *change_id;
- 	char *auth;
-@@ -1302,9 +1324,9 @@
-   	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
-   	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
- 
--	buf = (unsigned char*)g_malloc (0xffff);
-+	buffer = pi_buffer_new (0xffff);
- 	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
--			      (unsigned char *)buf, 0xffff);
-+				-1, buffer);
- 	
- 	if (len < 0) {
- 		WARN (_("Could not read pilot's Address application block"));
-@@ -1313,8 +1335,8 @@
- 					   _("Could not read pilot's Address application block"));
- 		return -1;
- 	}
--	unpack_AddressAppInfo (&(ctxt->ai), buf, len);
--	g_free (buf);
-+	unpack_AddressAppInfo (&(ctxt->ai), buffer->data, len);
-+	pi_buffer_free (buffer);
- 
-   	check_for_slow_setting (conduit, ctxt);
- 	if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
---- evolution-2.5.4/calendar/conduits/calendar/calendar-conduit.c.fix-conduits	2006-01-02 06:38:57.000000000 -0500
-+++ evolution-2.5.4/calendar/conduits/calendar/calendar-conduit.c	2006-01-10 19:33:44.000000000 -0500
-@@ -413,14 +413,20 @@
- {
- 	static char buff[ 4096 ];
- 	struct Appointment appt;
-+	pi_buffer_t piBuf;
- 
- 	if (remote == NULL) {
- 		sprintf (buff, "[NULL]");
- 		return buff;
- 	}
- 
-+
-+	piBuf.data = remote->record;
-+	piBuf.allocated = remote->length;
-+	piBuf.used = remote->length;
-+
- 	memset (&appt, 0, sizeof (struct Appointment));
--	unpack_Appointment (&appt, remote->record, remote->length);
-+	unpack_Appointment (&appt, &piBuf, datebook_v1);
- 
- 	g_snprintf (buff, 4096, "[%ld %ld '%s' '%s']",
- 		    mktime (&appt.begin),
-@@ -818,7 +824,8 @@
- 			      ECalConduitContext *ctxt)
- {
- 	GnomePilotRecord p;
--	static char record[0xffff];
-+	static unsigned char record[0xffff];
-+	pi_buffer_t piBuf;
- 
- 	g_assert (local->comp != NULL);
- 	g_assert (local->appt != NULL );
-@@ -829,9 +836,17 @@
- 	p.archived = local->local.archived;
- 	p.secret = local->local.secret;
- 
-+	memset (&piBuf, 0, sizeof (piBuf));
-+	memset (record, 0, sizeof (record));
-+	pack_Appointment (local->appt, &piBuf, datebook_v1);
-+
- 	/* Generate pilot record structure */
-+	if (piBuf.used > 0)
-+		memcpy (record, piBuf.data, piBuf.used);
- 	p.record = record;
--	p.length = pack_Appointment (local->appt, p.record, 0xffff);
-+	p.length = piBuf.used;
-+	if (piBuf.data)
-+		free (piBuf.data);
- 
- 	return p;	
- }
-@@ -867,22 +882,24 @@
-          * we don't overwrite them 
- 	 */
- 	if (local->local.ID != 0) {
--		struct Appointment appt;		
--		char record[0xffff];
-+		struct Appointment appt;
-+		pi_buffer_t *buffer = pi_buffer_new (0xffff);
- 		int cat = 0;
- 		
- 		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
- 					ctxt->dbi->db_handle,
--					local->local.ID, &record, 
--					NULL, NULL, NULL, &cat) > 0) {
-+					local->local.ID, buffer,
-+					NULL, NULL, &cat) > 0) {
- 			local->local.category = cat;
- 			memset (&appt, 0, sizeof (struct Appointment));
--			unpack_Appointment (&appt, record, 0xffff);
-+			unpack_Appointment (&appt, buffer, datebook_v1);
- 			local->appt->alarm = appt.alarm;
- 			local->appt->advance = appt.advance;
- 			local->appt->advanceUnits = appt.advanceUnits;
- 			free_Appointment (&appt);
- 		}
-+
-+		pi_buffer_free (buffer);
- 	}
- 
- 	/* STOP: don't replace these with g_strdup, since free_Appointment
-@@ -1140,11 +1157,17 @@
- 	GSList *edl = NULL;	
- 	char *txt;
- 	int pos, i;
-+	pi_buffer_t piBuf;
- 	
- 	g_return_val_if_fail (remote != NULL, NULL);
- 
-+
-+	piBuf.data = remote->record;
-+	piBuf.allocated = remote->length;
-+	piBuf.used = remote->length;
-+
- 	memset (&appt, 0, sizeof (struct Appointment));
--	unpack_Appointment (&appt, remote->record, remote->length);
-+	unpack_Appointment (&appt, &piBuf, datebook_v1);
- 
- 	if (in_comp == NULL) {
- 		comp = e_cal_component_new ();
-@@ -1409,7 +1432,7 @@
- 	GnomePilotConduitSyncAbs *abs_conduit;
- 	GList *removed = NULL, *added = NULL, *l;
- 	int len;
--	unsigned char *buf;
-+	pi_buffer_t *buffer;
- 	char *filename, *change_id;
- 	icalcomponent *icalcomp;
- 	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-@@ -1521,9 +1544,9 @@
- 	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
- 	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
- 
--	buf = (unsigned char*)g_malloc (0xffff);
-+	buffer = pi_buffer_new (0xffff);
- 	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
--			      (unsigned char *)buf, 0xffff);
-+				-1, buffer);
- 	
- 	if (len < 0) {
- 		WARN (_("Could not read pilot's Calendar application block"));
-@@ -1532,8 +1555,8 @@
- 					   _("Could not read pilot's Calendar application block"));
- 		return -1;
- 	}
--	unpack_AppointmentAppInfo (&(ctxt->ai), buf, len);
--	g_free (buf);
-+	unpack_AppointmentAppInfo (&(ctxt->ai), buffer->data, len);
-+	pi_buffer_free (buffer);
- 
- 	check_for_slow_setting (conduit, ctxt);
- 	if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
---- evolution-2.5.4/calendar/conduits/todo/todo-conduit.c.fix-conduits	2005-12-08 03:15:03.000000000 -0500
-+++ evolution-2.5.4/calendar/conduits/todo/todo-conduit.c	2006-01-10 19:33:44.000000000 -0500
-@@ -402,14 +402,19 @@
- {
- 	static char buff[ 4096 ];
- 	struct ToDo todo;
-+	pi_buffer_t piBuf;
- 
- 	if (remote == NULL) {
- 		sprintf (buff, "[NULL]");
- 		return buff;
- 	}
- 
-+	piBuf.data = remote->record;
-+	piBuf.allocated = remote->length;
-+	piBuf.used = remote->length;
-+
- 	memset (&todo, 0, sizeof (struct ToDo));
--	unpack_ToDo (&todo, remote->record, remote->length);
-+	unpack_ToDo (&todo, &piBuf, todo_v1);
- 
- 	g_snprintf (buff, 4096, "[%d %ld %d %d '%s' '%s' %d]",
- 		    todo.indefinite,
-@@ -594,7 +599,8 @@
- 			      EToDoConduitContext *ctxt)
- {
- 	GnomePilotRecord p;
--	static char record[0xffff];
-+	static unsigned char record[0xffff];
-+	pi_buffer_t piBuf;
- 
- 	g_assert (local->comp != NULL);
- 	g_assert (local->todo != NULL );
-@@ -607,9 +613,17 @@
- 	p.archived = local->local.archived;
- 	p.secret = local->local.secret;
- 
-+	memset (&piBuf, 0, sizeof (piBuf));
-+	memset (record, 0, sizeof (record));
-+	pack_ToDo (local->todo, &piBuf, todo_v1);
-+
- 	/* Generate pilot record structure */
-+	if (piBuf.used > 0)
-+		memcpy (record, piBuf.data, piBuf.used);
- 	p.record = record;
--	p.length = pack_ToDo (local->todo, p.record, 0xffff);
-+	p.length = piBuf.used;
-+	if (piBuf.data)
-+		free (piBuf.data);
- 
- 	return p;	
- }
-@@ -696,15 +710,17 @@
- 
- 	/* Don't overwrite the category */
- 	if (local->local.ID != 0) {
--		char record[0xffff];
-+		pi_buffer_t *buffer = pi_buffer_new (0xffff);  		
- 		int cat = 0;
- 		
- 		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
- 					ctxt->dbi->db_handle,
--					local->local.ID, &record, 
--					NULL, NULL, NULL, &cat) > 0) {
-+					local->local.ID, buffer, 
-+					NULL, NULL, &cat) > 0) {
- 			local->local.category = cat;
- 		}
-+
-+		pi_buffer_free (buffer);
- 	}
- 	
- 	/*
-@@ -859,12 +875,17 @@
- 	icaltimezone *utc_zone;
- 	int priority;
- 	char *txt;
-+	pi_buffer_t piBuf;
- 	char *category;
- 	
- 	g_return_val_if_fail (remote != NULL, NULL);
- 
-+	piBuf.data = remote->record;
-+	piBuf.allocated = remote->length;
-+	piBuf.used = remote->length;
-+
- 	memset (&todo, 0, sizeof (struct ToDo));
--	unpack_ToDo (&todo, remote->record, remote->length);
-+	unpack_ToDo (&todo, &piBuf, todo_v1);
- 
- 	utc_zone = icaltimezone_get_utc_timezone ();
- 	now = icaltime_from_timet_with_zone (time (NULL), FALSE, 
-@@ -1014,7 +1035,7 @@
- 	GnomePilotConduitSyncAbs *abs_conduit;
- 	GList *l;
- 	int len;
--	unsigned char *buf;
-+	pi_buffer_t *buffer;
- 	char *filename, *change_id;
- 	icalcomponent *icalcomp;
- 	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-@@ -1104,9 +1125,9 @@
- 	g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
- 			num_records, add_records, mod_records, del_records);
- 
--	buf = (unsigned char*)g_malloc (0xffff);
-+	buffer = pi_buffer_new (0xffff);
- 	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
--			      (unsigned char *)buf, 0xffff);
-+				-1, buffer);
- 	
- 	if (len < 0) {
- 		WARN (_("Could not read pilot's ToDo application block"));
-@@ -1115,8 +1136,8 @@
- 					   _("Could not read pilot's ToDo application block"));
- 		return -1;
- 	}
--	unpack_ToDoAppInfo (&(ctxt->ai), buf, len);
--	g_free (buf);
-+	unpack_ToDoAppInfo (&(ctxt->ai), buffer->data, len);
-+	pi_buffer_free (buffer);
- 	
- 	lastDesktopUniqueID = 128;
- 
---- evolution-2.5.4/calendar/conduits/memo/memo-conduit.c.fix-conduits	2006-01-10 22:52:28.000000000 -0500
-+++ evolution-2.5.4/calendar/conduits/memo/memo-conduit.c	2006-01-10 23:11:47.000000000 -0500
-@@ -331,14 +331,19 @@
- {
- 	static char buff[ 64 ];
- 	struct Memo memo;
-+	pi_buffer_t piBuf;
- 
- 	if (remote == NULL) {
- 		sprintf (buff, "[NULL]");
- 		return buff;
- 	}
- 
-+	piBuf.data = remote->record;
-+	piBuf.allocated = remote->length;
-+	piBuf.used = remote->length;
-+
- 	memset (&memo, 0, sizeof (struct Memo));
--	unpack_Memo (&memo, remote->record, remote->length);
-+	unpack_Memo (&memo, &piBuf, memo_v1);
- 
- 	g_snprintf (buff, 64, "['%s']",
- 		    memo.text ?
-@@ -451,7 +456,8 @@
- 			      EMemoConduitContext *ctxt)
- {
- 	GnomePilotRecord p;
--	static char record[0xffff];
-+	static unsigned char record[0xffff];
-+	pi_buffer_t piBuf;  		
- 
- 	g_assert (local->comp != NULL);
- 	g_assert (local->memo != NULL );
-@@ -466,8 +472,14 @@
- 
- 	/* Generate pilot record structure */
- 	p.record = record;
--	p.length = pack_Memo (local->memo, p.record, 0xffff);
--
-+	memset (&piBuf, 0, sizeof (piBuf));
-+	memset (record, 0, sizeof (record));
-+	p.length = pack_Memo (local->memo, &piBuf, memo_v1);
-+	if (piBuf.used > 0)
-+		memcpy (record, piBuf.data, piBuf.used);
-+	p.length = piBuf.used;
-+	if (piBuf.data)
-+		free (piBuf.data);
- 	return p;	
- }
- 
-@@ -568,16 +580,17 @@
- 
- 	/* Don't overwrite the category */
- 	if (local->local.ID != 0) {
--		char record[0xffff];
-+		pi_buffer_t *buffer = pi_buffer_new (0xffff);
- 		int cat = 0;
- 		
- 		LOG(fprintf(stderr, "local_record_from_comp: calling dlp_ReadRecordById\n"));
- 		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
- 					ctxt->dbi->db_handle,
--					local->local.ID, &record, 
--					NULL, NULL, NULL, &cat) > 0) {
-+					local->local.ID, buffer, 
-+					NULL, NULL, &cat) > 0) {
- 			local->local.category = cat;
- 		}
-+		pi_buffer_free (buffer);
- 		LOG(fprintf(stderr, "local_record_from_comp: done calling dlp_ReadRecordById\n"));
- 	}
- 	
-@@ -699,6 +712,7 @@
- {
- 	ECalComponent *comp;
- 	struct Memo memo;
-+	pi_buffer_t piBuf;
- 	struct icaltimetype now;
- 	icaltimezone *utc_zone;
- 	char *txt, *txt2, *txt3;
-@@ -707,8 +721,12 @@
- 	
- 	g_return_val_if_fail (remote != NULL, NULL);
- 
-+	piBuf.data = remote->record;
-+	piBuf.allocated = remote->length;
-+	piBuf.used = remote->length;
-+
- 	memset (&memo, 0, sizeof (struct Memo));
--	unpack_Memo (&memo, remote->record, remote->length);
-+	unpack_Memo (&memo, &piBuf, memo_v1);
- 
- 	utc_zone = icaltimezone_get_utc_timezone ();
- 	now = icaltime_from_timet_with_zone (time (NULL), FALSE, 
-@@ -836,7 +854,7 @@
- 	GnomePilotConduitSyncAbs *abs_conduit;
- 	GList *l;
- 	int len;
--	unsigned char *buf;
-+	pi_buffer_t *buffer;
- 	char *filename, *change_id;
- 	icalcomponent *icalcomp;
- 	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-@@ -929,9 +947,9 @@
- 	g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
- 		num_records, add_records, mod_records, del_records);
- 
--	buf = (unsigned char*)g_malloc (0xffff);
-+	buffer = pi_buffer_new (0xffff);
- 	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
--			      (unsigned char *)buf, 0xffff);
-+				-1, buffer);
- 	
- 	if (len < 0) {
- 		WARN (_("Could not read pilot's Memo application block"));
-@@ -940,8 +958,8 @@
- 					   _("Could not read pilot's Memo application block"));
- 		return -1;
- 	}
--	unpack_MemoAppInfo (&(ctxt->ai), buf, len);
--	g_free (buf);
-+	unpack_MemoAppInfo (&(ctxt->ai), buffer->data, len);
-+	pi_buffer_free (buffer);
- 	
- 	lastDesktopUniqueID = 128;
- 

evolution-2.5.5.1-commit-enter-on-calendar.patch

@@ -1,242 +0,0 @@
---- evolution-2.5.5.1/calendar/gui/e-day-view.c.commit-enter-on-calendar	2006-01-16 09:42:17.000000000 -0500
-+++ evolution-2.5.5.1/calendar/gui/e-day-view.c	2006-01-25 23:48:24.000000000 -0500
-@@ -334,6 +334,10 @@
- 					    gint event_num,
- 					    gchar *initial_text);
- static void e_day_view_stop_editing_event (EDayView *day_view);
-+static gboolean e_day_view_text_keypress (GnomeCanvasItem *item,
-+					  guint             keyval,
-+					  guint             state,
-+					  EDayView         *day_view);
- static gboolean e_day_view_on_text_item_event (GnomeCanvasItem *item,
- 					       GdkEvent *event,
- 					       EDayView *day_view);
-@@ -4484,6 +4488,8 @@
- 				  G_CALLBACK (e_day_view_on_text_item_event), day_view);
- 		g_signal_emit_by_name (G_OBJECT(day_view),
- 				       "event_added", event);
-+		g_signal_connect (event->canvas_item, "keypress",
-+				  G_CALLBACK (e_day_view_text_keypress), day_view);
- 
- 		e_day_view_update_long_event_label (day_view, event_num);
- 	}
-@@ -4667,6 +4673,8 @@
- 					  G_CALLBACK (e_day_view_on_text_item_event), day_view);
- 			g_signal_emit_by_name (G_OBJECT(day_view),
- 					       "event_added", event);
-+			g_signal_connect (event->canvas_item, "keypress",
-+					  G_CALLBACK (e_day_view_text_keypress), day_view);
- 
- 			e_day_view_update_event_label (day_view, day, event_num);
- 		}
-@@ -5824,46 +5832,74 @@
- }
- 
- static gboolean
-+e_day_view_text_keypress (GnomeCanvasItem *item,
-+			  guint            keyval,
-+			  guint            state,
-+			  EDayView        *day_view)
-+{
-+	gboolean retval = FALSE;
-+
-+	tooltip_destroy (day_view, item);
-+
-+	if (keyval == GDK_Return) {
-+		EText *text = E_TEXT (item);
-+		gint new_pos = 0;
-+
-+		/*
-+		 * HACK: last character which should be \n needs to be deleted
-+		 * here so that GDK_Return was already processed on EText
-+		 * before E_TEXT_KEYPRESS event is emitted.
-+		 */
-+		if (text->selection_end >= 1)
-+			new_pos = text->selection_end - 1;
-+
-+		text->selection_end = e_text_model_validate_position (text->model, new_pos);
-+		e_text_delete_selection (text);
-+
-+		day_view->resize_event_num = -1;
-+
-+		/* We set the keyboard focus to the EDayView, so the
-+		   EText item loses it and stops the edit. */
-+		gtk_widget_grab_focus (GTK_WIDGET (day_view));
-+
-+		/* Stop the signal last or we will also stop any
-+		   other events getting to the EText item. */
-+		gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-+					      "event");
-+
-+		retval = TRUE;
-+	} else if (keyval == GDK_Escape) {
-+		cancel_editing (day_view);
-+		gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
-+		/* focus should go to day view when stop editing */
-+		gtk_widget_grab_focus (GTK_WIDGET (day_view));
-+
-+		retval = TRUE;
-+	} else if ((keyval == GDK_Up)
-+		   && (state & GDK_SHIFT_MASK)
-+		   && (state & GDK_CONTROL_MASK)
-+		   && !(state & GDK_MOD1_MASK)) {
-+		e_day_view_change_event_end_time_up (day_view);
-+
-+		retval = TRUE;
-+	} else if ((keyval == GDK_Down)
-+		   && (state & GDK_SHIFT_MASK)
-+		   && (state & GDK_CONTROL_MASK)
-+		   && !(state & GDK_MOD1_MASK)) {
-+		e_day_view_change_event_end_time_down (day_view);
-+
-+		retval = TRUE;
-+	}
-+
-+	return retval;
-+}
-+
-+static gboolean
- e_day_view_on_text_item_event (GnomeCanvasItem *item,
- 			       GdkEvent *event,
- 			       EDayView *day_view)
- {
- 	switch (event->type) {
--	case GDK_KEY_PRESS:
--		tooltip_destroy (day_view, item);
--		if (event && event->key.keyval == GDK_Return) {
--			day_view->resize_event_num = -1;
--			day_view->resize_event_num = -1;
--
--			/* We set the keyboard focus to the EDayView, so the
--			   EText item loses it and stops the edit. */
--			gtk_widget_grab_focus (GTK_WIDGET (day_view));
--
--			/* Stop the signal last or we will also stop any
--			   other events getting to the EText item. */
--			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
--						      "event");
--			return TRUE;
--		} else if (event->key.keyval == GDK_Escape) {
--			cancel_editing (day_view);
--			gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
--			/* focus should go to day view when stop editing */
--			gtk_widget_grab_focus (GTK_WIDGET (day_view));
--			return TRUE;
--               } else if ((event->key.keyval == GDK_Up)
--                          && (event->key.state & GDK_SHIFT_MASK)
--                          && (event->key.state & GDK_CONTROL_MASK)
--                          && !(event->key.state & GDK_MOD1_MASK)) {
--                       e_day_view_change_event_end_time_up (day_view);
--                       return TRUE;
--               } else if ((event->key.keyval == GDK_Down)
--                          && (event->key.state & GDK_SHIFT_MASK)
--                          && (event->key.state & GDK_CONTROL_MASK)
--                          && !(event->key.state & GDK_MOD1_MASK)) {
--                       e_day_view_change_event_end_time_down (day_view);
--                       return TRUE;
--		}
--		break;
- 	case GDK_2BUTTON_PRESS:
- #if 0
- 		g_print ("Item got double-click\n");
---- evolution-2.5.5.1/calendar/gui/e-week-view.c.commit-enter-on-calendar	2006-01-16 09:42:17.000000000 -0500
-+++ evolution-2.5.5.1/calendar/gui/e-week-view.c	2006-01-25 23:46:43.000000000 -0500
-@@ -175,6 +175,10 @@
- 						const gchar *uid,
- 						EWeekViewForeachEventCallback callback,
- 						gpointer data);
-+static gboolean e_week_view_text_keypress (GnomeCanvasItem *item,
-+					   guint            keyval,
-+					   guint            state,
-+					   EWeekView       *week_view);
- static gboolean e_week_view_on_text_item_event (GnomeCanvasItem *item,
- 						GdkEvent *event,
- 						EWeekView *week_view);
-@@ -2771,6 +2775,8 @@
- 				  week_view);
- 		g_signal_emit_by_name (G_OBJECT(week_view),
- 				       "event_added", event);
-+		g_signal_connect (span->text_item, "keypress",
-+				  G_CALLBACK (e_week_view_text_keypress), week_view);
- 
- 	}
- 
-@@ -3028,6 +3034,51 @@
- }
- 
- static gboolean
-+e_week_view_text_keypress (GnomeCanvasItem *item,
-+			   guint            keyval,
-+			   guint            state,
-+			   EWeekView       *week_view)
-+{
-+	gboolean retval = FALSE;
-+
-+	tooltip_destroy (week_view, item);
-+
-+	if (keyval == GDK_Return) {
-+		EText *text = E_TEXT (item);
-+		gint new_pos = 0;
-+
-+		/*
-+		 * HACK: last charater which should be \n needs to be deleted
-+		 * here so that GDK_Return was already processed on EText
-+		 * before E_TEXT_KEYPRESS event is emitted.
-+		 */
-+		if (text->selection_end >= 1)
-+			new_pos = text->selection_end - 1;
-+
-+		text->selection_end = e_text_model_validate_position (text->model, new_pos);
-+		e_text_delete_selection (text);
-+
-+		/* We set the keyboard focus to the EDayView, so the
-+		   EText item loses it and stops the edit. */
-+		gtk_widget_grab_focus (GTK_WIDGET (week_view));
-+
-+		/* Stop the signal last or we will also stop any
-+		   other events getting to the EText item. */
-+		gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-+					      "event");
-+		retval = TRUE;
-+	} else if (keyval == GDK_Escape) {
-+		cancel_editing (week_view);
-+		gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
-+		/* focus should go to week view when stop editing */
-+		gtk_widget_grab_focus (GTK_WIDGET (week_view));
-+		retval = TRUE;
-+	}
-+
-+	return retval;
-+}
-+
-+static gboolean
- e_week_view_on_text_item_event (GnomeCanvasItem *item,
- 				GdkEvent *gdkevent,
- 				EWeekView *week_view)
-@@ -3044,26 +3095,6 @@
- #endif
- 	
- 	switch (gdkevent->type) {
--	case GDK_KEY_PRESS:
--		tooltip_destroy (week_view, item);
--		if (gdkevent && gdkevent->key.keyval == GDK_Return) {
--			/* We set the keyboard focus to the EDayView, so the
--			   EText item loses it and stops the edit. */
--			gtk_widget_grab_focus (GTK_WIDGET (week_view));
--
--			/* Stop the signal last or we will also stop any
--			   other events getting to the EText item. */
--			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
--						      "event");
--			return TRUE;
--		} else if (gdkevent->key.keyval == GDK_Escape) {
--			cancel_editing (week_view);
--			gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
--			/* focus should go to week view when stop editing */
--			gtk_widget_grab_focus (GTK_WIDGET (week_view));
--			return TRUE;
--		}
--		break;
- 	case GDK_2BUTTON_PRESS:
- 		if (!e_week_view_find_event_from_item (week_view, item,
- 						       &event_num, &span_num))

flatpak-evolution-fix-service-names.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# see https://gitlab.gnome.org/GNOME/glib/issues/1737
+# previous versions used milliseconds instead of seconds as the timeout argument",
+(`pkg-config --atleast-version 2.60.1 gio-2.0` || `pkg-config --atleast-version 2.61.0 gio-2.0`) && TIMEOUTMULT= || TIMEOUTMULT=000
+
+sed -e "s|\@SOURCES_SERVICE\@|$(pkg-config --variable=sourcesdbusservicename evolution-data-server-1.2)|" \
+    -e "s|\@ADDRESSBOOK_SERVICE\@|$(pkg-config --variable=addressbookdbusservicename evolution-data-server-1.2)|" \
+    -e "s|\@CALENDAR_SERVICE\@|$(pkg-config --variable=calendardbusservicename evolution-data-server-1.2)|" \
+    -e "s|\@TIMEOUTMULT\@|${TIMEOUTMULT}|"

flatpak-evolution-wrapper.sh.in

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+if [ "$1" = "--quit" -o "$1" = "--force-shutdown" ]; then
+   /app/bin/evolution.bin "$@"
+else
+   export BOGOFILTER_DIR="${XDG_DATA_HOME}/bogofilter/"
+   export GIO_USE_NETWORK_MONITOR=base
+   gsettings reset org.gnome.evolution-data-server network-monitor-gio-name
+
+   LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @SOURCES_SERVICE@ | wc -l)
+   if [ "${LINES}" = "0" ]; then
+      /app/libexec/evolution-source-registry &
+      gdbus wait --session --timeout=1@TIMEOUTMULT@ @SOURCES_SERVICE@
+   fi
+
+   LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @ADDRESSBOOK_SERVICE@ | wc -l)
+   if [ "${LINES}" = "0" ]; then
+      /app/libexec/evolution-addressbook-factory -r &
+      gdbus wait --session --timeout=1@TIMEOUTMULT@ @ADDRESSBOOK_SERVICE@
+   fi
+
+   LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @CALENDAR_SERVICE@ | wc -l)
+   if [ "${LINES}" = "0" ]; then
+      /app/libexec/evolution-calendar-factory -r &
+      gdbus wait --session --timeout=1@TIMEOUTMULT@ @CALENDAR_SERVICE@
+   fi
+
+   /app/bin/evolution.bin "$@"
+fi

rpminspect.yaml

@@ -0,0 +1,5 @@
+---
+runpath:
+    allowed_paths:
+        - /usr/lib/evolution
+        - /usr/lib64/evolution

sources

@@ -1 +1 @@
-cea13421ea95707e89c0311100714573  evolution-2.5.91.tar.bz2
+SHA512 (evolution-3.59.1.tar.xz) = 26d6d4dfcdbc3d89f88d9e24096c7ff910d221119def75d7f80a397f682be96860726832c7c62b46769ce9cfcc15e5844cbcc016facc9b21b4eb9bbb2c17360d