dist-git conversion

#2781)

.gitignore

@@ -1 +1 @@
-/evolution-*.tar.xz
+evolution-2.24.5.tar.bz2

configurable-dbus-prefix.patch

@@ -1,42 +0,0 @@
-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

@@ -0,0 +1,12 @@
+diff -up evolution-2.24.1/configure.ldaphack evolution-2.24.1/configure
+--- evolution-2.24.1/configure.ldaphack	2008-10-19 23:37:55.000000000 -0400
++++ evolution-2.24.1/configure	2008-10-21 13:16:16.000000000 -0400
+@@ -28471,7 +28471,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set}
+   $as_echo_n "(cached) " >&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
+ /* confdefs.h.  */
+ _ACEOF

evolution-2.23.4-experimental-plugins.patch

@@ -0,0 +1,38 @@
+diff -up evolution-2.23.4/configure.experimental-plugins evolution-2.23.4/configure
+--- evolution-2.23.4/configure.experimental-plugins	2008-06-19 08:34:44.000000000 -0400
++++ evolution-2.23.4/configure	2008-06-19 08:35:07.000000000 -0400
+@@ -38556,13 +38556,13 @@ plugins_base_always="calendar-file calen
+ plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN "
+ all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono"
+ 
+-plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates"
++plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore templates"
+ 
+ plugins_standard="$plugins_standard_always"
+ all_plugins_standard="$plugins_standard"
+ 
+ plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments external-editor hula-account-setup"
+-plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN"
++plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN email-custom-header"
+ all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments"
+ 
+ case x"$enable_plugins" in
+diff -up evolution-2.23.4/configure.in.experimental-plugins evolution-2.23.4/configure.in
+--- evolution-2.23.4/configure.in.experimental-plugins	2008-06-19 08:34:01.000000000 -0400
++++ evolution-2.23.4/configure.in	2008-06-19 08:34:35.000000000 -0400
+@@ -1732,13 +1732,13 @@ plugins_base_always="calendar-file calen
+ plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " 
+ all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono"
+ 
+-plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates" 
++plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore templates" 
+ 
+ plugins_standard="$plugins_standard_always"
+ all_plugins_standard="$plugins_standard"
+ 
+ plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments external-editor hula-account-setup"
+-plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN"
++plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN email-custom-header"
+ all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments"
+ 
+ case x"$enable_plugins" in

evolution-2.24.5-google-account-setup.patch

@@ -0,0 +1,26 @@
+diff -U0 evolution-2.24.5/plugins/google-account-setup/ChangeLog.google-account-setup evolution-2.24.5/plugins/google-account-setup/ChangeLog
+diff -up evolution-2.24.5/plugins/google-account-setup/google-contacts-source.c.google-account-setup evolution-2.24.5/plugins/google-account-setup/google-contacts-source.c
+--- evolution-2.24.5/plugins/google-account-setup/google-contacts-source.c.google-account-setup	2009-02-25 06:55:23.000000000 -0500
++++ evolution-2.24.5/plugins/google-account-setup/google-contacts-source.c	2009-06-01 08:38:03.000000000 -0400
+@@ -300,7 +300,7 @@ plugin_google_contacts (EPlugin         
+ 
+     g_object_set_data (G_OBJECT (epl), "gwidget", NULL);
+ 
+-    if (strcmp (base_uri, "google://")) {
++    if (g_ascii_strncasecmp ("google://", base_uri, 9) != 0) {
+         return NULL;
+     }
+ 
+diff -up evolution-2.24.5/plugins/google-account-setup/google-source.c.google-account-setup evolution-2.24.5/plugins/google-account-setup/google-source.c
+--- evolution-2.24.5/plugins/google-account-setup/google-source.c.google-account-setup	2009-01-29 07:41:23.000000000 -0500
++++ evolution-2.24.5/plugins/google-account-setup/google-source.c	2009-06-01 08:38:03.000000000 -0400
+@@ -574,8 +574,7 @@ plugin_google  (EPlugin                 
+ 	group = e_source_peek_group (source);
+ 
+ 	widget = NULL;
+-	if (!g_str_has_prefix (e_source_group_peek_base_uri (group),
+-			       "Google")) {
++	if (g_ascii_strncasecmp ("google://", e_source_group_peek_base_uri (group), 9) != 0) {
+ 		return NULL;
+ 	}
+ 

evolution-2.5.4-fix-conduit-dir.patch

@@ -0,0 +1,96 @@
+diff -up evolution-2.23.4/addressbook/conduit/Makefile.am.fix-conduit-dir evolution-2.23.4/addressbook/conduit/Makefile.am
+--- evolution-2.23.4/addressbook/conduit/Makefile.am.fix-conduit-dir	2008-06-15 23:20:16.000000000 -0400
++++ evolution-2.23.4/addressbook/conduit/Makefile.am	2008-07-18 09:10:29.000000000 -0400
+@@ -25,7 +25,7 @@ e-address.conduit: e-address.conduit.in
+ 	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
+ 	    $< > $@
+ 
+-conduitdir = $(datadir)/gnome-pilot/conduits/
++conduitdir = $(libdir)/gnome-pilot/conduits/
+ conduit_DATA = e-address.conduit
+ 
+ BUILT_SOURCES = $(conduit_DATA)
+diff -up evolution-2.23.4/addressbook/conduit/Makefile.in.fix-conduit-dir evolution-2.23.4/addressbook/conduit/Makefile.in
+--- evolution-2.23.4/addressbook/conduit/Makefile.in.fix-conduit-dir	2008-06-16 07:11:50.000000000 -0400
++++ evolution-2.23.4/addressbook/conduit/Makefile.in	2008-07-18 09:10:29.000000000 -0400
+@@ -421,7 +421,7 @@ libeaddress_conduit_la_LIBADD = \
+ 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
+ 	$(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
+ 
+-conduitdir = $(datadir)/gnome-pilot/conduits/
++conduitdir = $(libdir)/gnome-pilot/conduits/
+ conduit_DATA = e-address.conduit
+ BUILT_SOURCES = $(conduit_DATA)
+ CLEANFILES = $(BUILT_SOURCES)
+diff -up evolution-2.23.4/calendar/conduits/calendar/Makefile.am.fix-conduit-dir evolution-2.23.4/calendar/conduits/calendar/Makefile.am
+--- evolution-2.23.4/calendar/conduits/calendar/Makefile.am.fix-conduit-dir	2008-06-15 23:22:48.000000000 -0400
++++ evolution-2.23.4/calendar/conduits/calendar/Makefile.am	2008-07-18 09:10:29.000000000 -0400
+@@ -28,7 +28,7 @@ e-calendar.conduit: e-calendar.conduit.i
+ 	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
+ 	    $< > $@
+ 
+-conduitdir = $(datadir)/gnome-pilot/conduits/
++conduitdir = $(libdir)/gnome-pilot/conduits/
+ conduit_DATA = e-calendar.conduit
+ 
+ BUILT_SOURCES = $(conduit_DATA)
+diff -up evolution-2.23.4/calendar/conduits/calendar/Makefile.in.fix-conduit-dir evolution-2.23.4/calendar/conduits/calendar/Makefile.in
+--- evolution-2.23.4/calendar/conduits/calendar/Makefile.in.fix-conduit-dir	2008-06-16 07:11:53.000000000 -0400
++++ evolution-2.23.4/calendar/conduits/calendar/Makefile.in	2008-07-18 09:13:04.000000000 -0400
+@@ -426,7 +426,7 @@ libecalendar_conduit_la_LIBADD = \
+ 	$(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la	\
+ 	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
+ 
+-conduitdir = $(datadir)/gnome-pilot/conduits/
++conduitdir = $(libdir)/gnome-pilot/conduits/
+ conduit_DATA = e-calendar.conduit
+ BUILT_SOURCES = $(conduit_DATA)
+ CLEANFILES = $(BUILT_SOURCES)
+diff -up evolution-2.23.4/calendar/conduits/memo/Makefile.am.fix-conduit-dir evolution-2.23.4/calendar/conduits/memo/Makefile.am
+--- evolution-2.23.4/calendar/conduits/memo/Makefile.am.fix-conduit-dir	2008-06-15 23:22:48.000000000 -0400
++++ evolution-2.23.4/calendar/conduits/memo/Makefile.am	2008-07-18 09:10:29.000000000 -0400
+@@ -28,7 +28,7 @@ e-memo.conduit: e-memo.conduit.in
+ 	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
+ 	    $< > $@
+ 
+-conduitdir = $(datadir)/gnome-pilot/conduits/
++conduitdir = $(libdir)/gnome-pilot/conduits/
+ conduit_DATA = e-memo.conduit
+ 
+ BUILT_SOURCES = $(conduit_DATA)
+diff -up evolution-2.23.4/calendar/conduits/memo/Makefile.in.fix-conduit-dir evolution-2.23.4/calendar/conduits/memo/Makefile.in
+--- evolution-2.23.4/calendar/conduits/memo/Makefile.in.fix-conduit-dir	2008-06-16 07:11:53.000000000 -0400
++++ evolution-2.23.4/calendar/conduits/memo/Makefile.in	2008-07-18 09:12:17.000000000 -0400
+@@ -424,7 +424,7 @@ libememo_conduit_la_LIBADD = \
+ 	$(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la	\
+ 	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
+ 
+-conduitdir = $(datadir)/gnome-pilot/conduits/
++conduitdir = $(libdir)/gnome-pilot/conduits/
+ conduit_DATA = e-memo.conduit
+ BUILT_SOURCES = $(conduit_DATA)
+ CLEANFILES = $(BUILT_SOURCES)
+diff -up evolution-2.23.4/calendar/conduits/todo/Makefile.am.fix-conduit-dir evolution-2.23.4/calendar/conduits/todo/Makefile.am
+--- evolution-2.23.4/calendar/conduits/todo/Makefile.am.fix-conduit-dir	2008-06-15 23:22:48.000000000 -0400
++++ evolution-2.23.4/calendar/conduits/todo/Makefile.am	2008-07-18 09:10:29.000000000 -0400
+@@ -28,7 +28,7 @@ e-todo.conduit: e-todo.conduit.in
+ 	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
+ 	    $< > $@
+ 
+-conduitdir = $(datadir)/gnome-pilot/conduits/
++conduitdir = $(libdir)/gnome-pilot/conduits/
+ conduit_DATA = e-todo.conduit
+ 
+ BUILT_SOURCES = $(conduit_DATA)
+diff -up evolution-2.23.4/calendar/conduits/todo/Makefile.in.fix-conduit-dir evolution-2.23.4/calendar/conduits/todo/Makefile.in
+--- evolution-2.23.4/calendar/conduits/todo/Makefile.in.fix-conduit-dir	2008-06-16 07:11:53.000000000 -0400
++++ evolution-2.23.4/calendar/conduits/todo/Makefile.in	2008-07-18 09:11:53.000000000 -0400
+@@ -424,7 +424,7 @@ libetodo_conduit_la_LIBADD = \
+ 	$(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la	\
+ 	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
+ 
+-conduitdir = $(datadir)/gnome-pilot/conduits/
++conduitdir = $(libdir)/gnome-pilot/conduits/
+ conduit_DATA = e-todo.conduit
+ BUILT_SOURCES = $(conduit_DATA)
+ CLEANFILES = $(BUILT_SOURCES)

evolution-2.5.4-fix-conduits.patch

@@ -0,0 +1,515 @@
+--- 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.7.1-no-gnome-common.patch

@@ -0,0 +1,155 @@
+diff -up evolution-2.24.1/configure.in.no-gnome-common evolution-2.24.1/configure.in
+--- evolution-2.24.1/configure.in.no-gnome-common	2008-10-19 23:27:24.000000000 -0400
++++ evolution-2.24.1/configure.in	2008-10-21 13:16:54.000000000 -0400
+@@ -1332,9 +1332,6 @@ AC_SUBST_FILE(EVO_MARSHAL_RULE)
+ dnl *************************
+ dnl CFLAGS and LIBS and stuff
+ dnl *************************
+-
+-GNOME_COMPILE_WARNINGS(yes)
+-CFLAGS="$CFLAGS $WARN_CFLAGS"
+ case $CFLAGS in
+ *-Wall*)
+ 	# Turn off the annoying "comparison between signed and unsigned"
+diff -up evolution-2.24.1/configure.no-gnome-common evolution-2.24.1/configure
+--- evolution-2.24.1/configure.no-gnome-common	2008-10-21 13:16:54.000000000 -0400
++++ evolution-2.24.1/configure	2008-10-21 13:17:55.000000000 -0400
+@@ -33230,138 +33230,6 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk
+ 
+ 
+ 
+-    # Check whether --enable-compile-warnings was given.
+-if test "${enable_compile_warnings+set}" = set; then
+-  enableval=$enable_compile_warnings;
+-else
+-  enable_compile_warnings="yes"
+-fi
+-
+-
+-    warnCFLAGS=
+-    if test "x$GCC" != xyes; then
+-	enable_compile_warnings=no
+-    fi
+-
+-    warning_flags=
+-    realsave_CFLAGS="$CFLAGS"
+-
+-    case "$enable_compile_warnings" in
+-    no)
+-	warning_flags=
+-	;;
+-    minimum)
+-	warning_flags="-Wall"
+-	;;
+-    yes)
+-	warning_flags="-Wall -Wmissing-prototypes"
+-	;;
+-    maximum|error)
+-	warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
+-	CFLAGS="$warning_flags $CFLAGS"
+-	for option in -Wno-sign-compare; do
+-		SAVE_CFLAGS="$CFLAGS"
+-		CFLAGS="$CFLAGS $option"
+-		{ $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
+-$as_echo_n "checking whether gcc understands $option... " >&6; }
+-		cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  has_option=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	has_option=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-		CFLAGS="$SAVE_CFLAGS"
+-		{ $as_echo "$as_me:$LINENO: result: $has_option" >&5
+-$as_echo "$has_option" >&6; }
+-		if test $has_option = yes; then
+-		  warning_flags="$warning_flags $option"
+-		fi
+-		unset has_option
+-		unset SAVE_CFLAGS
+-	done
+-	unset option
+-	if test "$enable_compile_warnings" = "error" ; then
+-	    warning_flags="$warning_flags -Werror"
+-	fi
+-	;;
+-    *)
+-	{ { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
+-$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
+-   { (exit 1); exit 1; }; }
+-	;;
+-    esac
+-    CFLAGS="$realsave_CFLAGS"
+-    { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
+-$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
+-    { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5
+-$as_echo "$warning_flags" >&6; }
+-
+-    # Check whether --enable-iso-c was given.
+-if test "${enable_iso_c+set}" = set; then
+-  enableval=$enable_iso_c;
+-else
+-  enable_iso_c=no
+-fi
+-
+-
+-    { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
+-$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
+-    complCFLAGS=
+-    if test "x$enable_iso_c" != "xno"; then
+-	if test "x$GCC" = "xyes"; then
+-	case " $CFLAGS " in
+-	    *\ \	-ansi\ \	*) ;;
+-	    *) complCFLAGS="$complCFLAGS -ansi" ;;
+-	esac
+-	case " $CFLAGS " in
+-	    *\ \	-pedantic\ \	*) ;;
+-	    *) complCFLAGS="$complCFLAGS -pedantic" ;;
+-	esac
+-	fi
+-    fi
+-    { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5
+-$as_echo "$complCFLAGS" >&6; }
+-
+-    WARN_CFLAGS="$warning_flags $complCFLAGS"
+-
+-
+-CFLAGS="$CFLAGS $WARN_CFLAGS"
+ case $CFLAGS in
+ *-Wall*)
+ 	# Turn off the annoying "comparison between signed and unsigned"

evolution-2.9.1-im-context-reset.patch

@@ -0,0 +1,12 @@
+--- evolution-2.9.1/calendar/gui/e-day-view.c.im-context-reset	2006-11-06 10:14:26.000000000 -0500
++++ evolution-2.9.1/calendar/gui/e-day-view.c	2006-11-06 10:15:39.000000000 -0500
+@@ -6928,6 +6928,9 @@
+ 	if (!event->canvas_item)
+ 		return;
+ 
++	/* Reset IM context. */
++	gtk_im_context_reset (E_TEXT (event->canvas_item)->im_context);
++
+ 	/* We must grab the focus before setting the initial text, since
+ 	   grabbing the focus will result in a call to
+ 	   e_day_view_on_editing_started(), which will reset the text to get

flatpak-evolution-fix-service-names.sh

@@ -1,10 +0,0 @@
-#!/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

@@ -1,29 +0,0 @@
-#!/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

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

sources

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