Remove unneeded patches.

- Remove patch to fix the giant "mail-mark-notjunk" icon (fixed upstream)
- Remove patch for RH bug #588004 (fixed upstream)
- Remove patch for RH bug #590373 (fixed upstream)
- Remove patch for GNOME bug #618400 (fixed upstream)
- Remove patch for GNOME bug #618902 (fixed upstream)

.gitignore

@@ -1 +1,2 @@
-/evolution-*.tar.xz
+evolution-2.30.2.tar.bz2
+evolution-2.30.3.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,21 @@
+diff -up evolution-2.30.1/configure.ldaphack evolution-2.30.1/configure
+--- evolution-2.30.1/configure.ldaphack	2010-04-26 05:22:50.000000000 +0200
++++ evolution-2.30.1/configure	2010-04-26 09:52:22.000000000 +0200
+@@ -15791,7 +15791,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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -16123,7 +16123,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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 

evolution-2.30.1-help-contents.patch

@@ -0,0 +1,18 @@
+diff -up evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents evolution-2.30.1.2/shell/e-shell-window-actions.c
+--- evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents	2010-04-26 09:13:18.000000000 -0400
++++ evolution-2.30.1.2/shell/e-shell-window-actions.c	2010-05-07 21:29:06.269059830 -0400
+@@ -2001,6 +2001,14 @@ e_shell_window_actions_init (EShellWindo
+ 	if (path == NULL)
+ 		gtk_action_set_visible (ACTION (SYNC_OPTIONS), FALSE);
+ 	g_free (path);
++
++	/* Viewing user documentation requires the evolution-help
++	 * Fedora package.  Look for one of the files it installs. */
++	path = g_build_filename (
++		EVOLUTION_DATADIR, "omf", PACKAGE, "evolution-C.omf", NULL);
++	if (!g_file_test (path, G_FILE_TEST_IS_REGULAR))
++		gtk_action_set_visible (ACTION (CONTENTS), FALSE);
++	g_free (path);
+ }
+ 
+ static GList *

evolution-2.30.2-async-event-idle-cb.patch

@@ -0,0 +1,77 @@
+diff -up evolution-2.30.2/mail/mail-mt.c.async-event-idle-cb evolution-2.30.2/mail/mail-mt.c
+--- evolution-2.30.2/mail/mail-mt.c.async-event-idle-cb	2010-06-20 08:15:05.000000000 -0400
++++ evolution-2.30.2/mail/mail-mt.c	2010-06-24 11:18:16.718108542 -0400
+@@ -608,6 +608,7 @@ struct _proxy_msg {
+ 	mail_async_event_t type;
+ 
+ 	GThread *thread;
++	guint idle_id;
+ 
+ 	MailAsyncFunc func;
+ 	gpointer o;
+@@ -628,10 +629,11 @@ do_async_event(struct _proxy_msg *m)
+ }
+ 
+ static gint
+-idle_async_event(gpointer mm)
++idle_async_event (struct _proxy_msg *m)
+ {
+-	do_async_event(mm);
+-	mail_msg_unref(mm);
++	m->idle_id = 0;
++	do_async_event (m);
++	mail_msg_unref (m);
+ 
+ 	return FALSE;
+ }
+@@ -655,7 +657,7 @@ mail_async_event_new (void)
+ 	return ea;
+ }
+ 
+-gint
++guint
+ mail_async_event_emit (MailAsyncEvent *ea,
+                        mail_async_event_t type,
+                        MailAsyncFunc func,
+@@ -664,7 +666,7 @@ mail_async_event_emit (MailAsyncEvent *e
+                        gpointer data)
+ {
+ 	struct _proxy_msg *m;
+-	gint id;
++	guint id;
+ 
+ 	/* We dont have a reply port for this, we dont
+ 	 * care when/if it gets executed, just queue it. */
+@@ -687,7 +689,8 @@ mail_async_event_emit (MailAsyncEvent *e
+ 	 * overflow and deadlock us. */
+ 	if (type == MAIL_ASYNC_GUI) {
+ 		if (mail_in_main_thread ())
+-			g_idle_add(idle_async_event, m);
++			m->idle_id = g_idle_add (
++				(GSourceFunc) idle_async_event, m);
+ 		else
+ 			mail_msg_main_loop_push(m);
+ 	} else
+@@ -712,6 +715,10 @@ mail_async_event_destroy (MailAsyncEvent
+ 			errno = EDEADLK;
+ 			return -1;
+ 		}
++		if (m->idle_id > 0) {
++			g_source_remove (m->idle_id);
++			m->idle_id = 0;
++		}
+ 		g_mutex_unlock(ea->lock);
+ 		mail_msg_wait(id);
+ 		g_mutex_lock(ea->lock);
+diff -up evolution-2.30.2/mail/mail-mt.h.async-event-idle-cb evolution-2.30.2/mail/mail-mt.h
+--- evolution-2.30.2/mail/mail-mt.h.async-event-idle-cb	2010-06-20 08:15:04.000000000 -0400
++++ evolution-2.30.2/mail/mail-mt.h	2010-06-24 11:18:16.718108542 -0400
+@@ -102,7 +102,7 @@ typedef void (*MailAsyncFunc)(gpointer ,
+ /* create a new async event handler */
+ MailAsyncEvent *mail_async_event_new(void);
+ /* forward a camel event (or other call) to the gui thread */
+-gint mail_async_event_emit(MailAsyncEvent *ea, mail_async_event_t type, MailAsyncFunc func, gpointer , gpointer , gpointer );
++guint mail_async_event_emit(MailAsyncEvent *ea, mail_async_event_t type, MailAsyncFunc func, gpointer , gpointer , gpointer );
+ /* wait for all outstanding async events to complete */
+ gint mail_async_event_destroy(MailAsyncEvent *ea);
+ 

evolution-2.30.2-handle-startdate-uris.patch

@@ -0,0 +1,189 @@
+diff -up evolution-2.30.2/modules/calendar/e-cal-shell-backend.c.handle-startdate-uris evolution-2.30.2/modules/calendar/e-cal-shell-backend.c
+--- evolution-2.30.2/modules/calendar/e-cal-shell-backend.c.handle-startdate-uris	2010-06-20 08:14:46.000000000 -0400
++++ evolution-2.30.2/modules/calendar/e-cal-shell-backend.c	2010-06-24 13:26:43.866095974 -0400
+@@ -48,6 +48,7 @@
+ #include "e-cal-shell-content.h"
+ #include "e-cal-shell-migrate.h"
+ #include "e-cal-shell-settings.h"
++#include "e-cal-shell-sidebar.h"
+ #include "e-cal-shell-view.h"
+ 
+ #define E_CAL_SHELL_BACKEND_GET_PRIVATE(obj) \
+@@ -539,6 +540,8 @@ cal_shell_backend_handle_uri_cb (EShellB
+ 	gchar *source_uid = NULL;
+ 	gchar *comp_uid = NULL;
+ 	gchar *comp_rid = NULL;
++	GDate start_date;
++	GDate end_date;
+ 	gboolean handled = FALSE;
+ 	GError *error = NULL;
+ 
+@@ -553,6 +556,9 @@ cal_shell_backend_handle_uri_cb (EShellB
+ 	if (cp == NULL)
+ 		goto exit;
+ 
++	g_date_clear (&start_date, 1);
++	g_date_clear (&end_date, 1);
++
+ 	while (*cp != '\0') {
+ 		gchar *header;
+ 		gchar *content;
+@@ -572,7 +578,13 @@ cal_shell_backend_handle_uri_cb (EShellB
+ 		content_len = strcspn (cp, "&");
+ 
+ 		content = g_strndup (cp, content_len);
+-		if (g_ascii_strcasecmp (header, "source-uid") == 0)
++		if (g_ascii_strcasecmp (header, "startdate") == 0)
++			g_date_set_time_t (
++				&start_date, time_from_isodate (content));
++		else if (g_ascii_strcasecmp (header, "enddate") == 0)
++			g_date_set_time_t (
++				&end_date, time_from_isodate (content));
++		else if (g_ascii_strcasecmp (header, "source-uid") == 0)
+ 			source_uid = g_strdup (content);
+ 		else if (g_ascii_strcasecmp (header, "comp-uid") == 0)
+ 			comp_uid = g_strdup (content);
+@@ -588,6 +600,21 @@ cal_shell_backend_handle_uri_cb (EShellB
+ 		}
+ 	}
+ 
++	/* This is primarily for launching Evolution
++	 * from the calendar in the clock applet. */
++	if (g_date_valid (&start_date)) {
++		if (g_date_valid (&end_date))
++			e_cal_shell_backend_open_date_range (
++				E_CAL_SHELL_BACKEND (shell_backend),
++				&start_date, &end_date);
++		else
++			e_cal_shell_backend_open_date_range (
++				E_CAL_SHELL_BACKEND (shell_backend),
++				&start_date, NULL);
++		handled = TRUE;
++		goto exit;
++	}
++
+ 	if (source_uid == NULL || comp_uid == NULL)
+ 		goto exit;
+ 
+@@ -831,3 +858,57 @@ e_cal_shell_backend_get_source_list (ECa
+ 
+ 	return cal_shell_backend->priv->source_list;
+ }
++
++void
++e_cal_shell_backend_open_date_range (ECalShellBackend *cal_shell_backend,
++                                     const GDate *start_date,
++                                     const GDate *end_date)
++{
++	EShell *shell;
++	EShellView *shell_view;
++	EShellBackend *shell_backend;
++	EShellSidebar *shell_sidebar;
++	GtkWidget *shell_window = NULL;
++	ECalendar *navigator;
++	GList *watched_windows;
++
++	g_return_if_fail (E_IS_CAL_SHELL_BACKEND (cal_shell_backend));
++
++	shell_backend = E_SHELL_BACKEND (cal_shell_backend);
++	shell = e_shell_backend_get_shell (shell_backend);
++	watched_windows = e_shell_get_watched_windows (shell);
++
++	/* Try to find an EShellWindow already in calendar view. */
++	while (watched_windows != NULL) {
++		GtkWidget *window = GTK_WIDGET (watched_windows->data);
++
++		if (E_IS_SHELL_WINDOW (window)) {
++			const gchar *active_view;
++
++			active_view = e_shell_window_get_active_view (
++				E_SHELL_WINDOW (window));
++			if (g_strcmp0 (active_view, "calendar") == 0) {
++				gtk_window_present (GTK_WINDOW (window));
++				shell_window = window;
++				break;
++			}
++		}
++
++		watched_windows = g_list_next (watched_windows);
++	}
++
++	/* Otherwise create a new EShellWindow in calendar view. */
++	if (shell_window == NULL)
++		shell_window = e_shell_create_shell_window (shell, "calendar");
++
++	/* Now dig up the date navigator and select the date range. */
++
++	shell_view = e_shell_window_get_shell_view (
++		E_SHELL_WINDOW (shell_window), "calendar");
++	shell_sidebar = e_shell_view_get_shell_sidebar (shell_view);
++	navigator = e_cal_shell_sidebar_get_date_navigator (
++		E_CAL_SHELL_SIDEBAR (shell_sidebar));
++
++	e_calendar_item_set_selection (
++		navigator->calitem, start_date, end_date);
++}
+diff -up evolution-2.30.2/modules/calendar/e-cal-shell-backend.h.handle-startdate-uris evolution-2.30.2/modules/calendar/e-cal-shell-backend.h
+--- evolution-2.30.2/modules/calendar/e-cal-shell-backend.h.handle-startdate-uris	2010-06-20 08:14:47.000000000 -0400
++++ evolution-2.30.2/modules/calendar/e-cal-shell-backend.h	2010-06-24 13:26:43.867095475 -0400
+@@ -64,6 +64,10 @@ void		e_cal_shell_backend_register_type
+ 					(GTypeModule *type_module);
+ ESourceList *	e_cal_shell_backend_get_source_list
+ 					(ECalShellBackend *cal_shell_backend);
++void		e_cal_shell_backend_open_date_range
++					(ECalShellBackend *cal_shell_backend,
++					 const GDate *start_date,
++					 const GDate *end_date);
+ 
+ G_END_DECLS
+ 
+diff -up evolution-2.30.2/widgets/misc/e-calendar-item.c.handle-startdate-uris evolution-2.30.2/widgets/misc/e-calendar-item.c
+--- evolution-2.30.2/widgets/misc/e-calendar-item.c.handle-startdate-uris	2010-06-20 08:14:29.000000000 -0400
++++ evolution-2.30.2/widgets/misc/e-calendar-item.c	2010-06-24 13:26:43.871094945 -0400
+@@ -188,8 +188,8 @@ static void e_calendar_item_date_range_c
+ static void e_calendar_item_queue_signal_emission	(ECalendarItem	*calitem);
+ static gboolean e_calendar_item_signal_emission_idle_cb	(gpointer data);
+ static void e_calendar_item_set_selection_if_emission (ECalendarItem	*calitem,
+-						       GDate		*start_date,
+-						       GDate		*end_date,
++						       const GDate	*start_date,
++						       const GDate	*end_date,
+ 						       gboolean emission);
+ 
+ /* Our arguments. */
+@@ -3094,8 +3094,8 @@ e_calendar_item_get_selection		(ECalenda
+ 
+ static void
+ e_calendar_item_set_selection_if_emission (ECalendarItem	*calitem,
+-					   GDate		*start_date,
+-					   GDate		*end_date,
++					   const GDate		*start_date,
++					   const GDate		*end_date,
+ 					   gboolean emission)
+ {
+ 	gint start_year, start_month, start_day;
+@@ -3197,8 +3197,8 @@ e_calendar_item_style_set (GtkWidget *wi
+ 
+ void
+ e_calendar_item_set_selection (ECalendarItem	*calitem,
+-			       GDate		*start_date,
+-			       GDate		*end_date)
++			       const GDate	*start_date,
++			       const GDate	*end_date)
+ {
+ 	/* If the user is in the middle of a selection, we must abort it. */
+ 	if (calitem->selecting) {
+diff -up evolution-2.30.2/widgets/misc/e-calendar-item.h.handle-startdate-uris evolution-2.30.2/widgets/misc/e-calendar-item.h
+--- evolution-2.30.2/widgets/misc/e-calendar-item.h.handle-startdate-uris	2010-06-20 08:14:33.000000000 -0400
++++ evolution-2.30.2/widgets/misc/e-calendar-item.h	2010-06-24 13:26:43.871094945 -0400
+@@ -319,8 +319,8 @@ gboolean
+    the start of the selection is shown. If start_date is NULL it clears the
+    selection. */
+ void	e_calendar_item_set_selection		(ECalendarItem *calitem,
+-						 GDate *start_date,
+-						 GDate *end_date);
++						 const GDate *start_date,
++						 const GDate *end_date);
+ 
+ /* Marks a particular day. Passing E_CALENDAR_ITEM_MARK_BOLD as the day style
+    will result in the day being shown as bold by default. The style callback

evolution-2.30.2-unused-help-figure.patch

@@ -0,0 +1,22 @@
+diff -up evolution-2.30.2/help/Makefile.am.unused-help-figure evolution-2.30.2/help/Makefile.am
+--- evolution-2.30.2/help/Makefile.am.unused-help-figure	2010-07-25 06:29:21.199792883 -0400
++++ evolution-2.30.2/help/Makefile.am	2010-07-25 06:29:31.812054726 -0400
+@@ -42,7 +42,6 @@ DOC_FIGURES =  \
+ 	figures/evo_mboxreceive_a.png 		\
+ 	figures/evo_memo_a.png 			\
+ 	figures/evo_mhreceive_a.png 		\
+-	figures/evo_mail_notifier.png		\
+ 	figures/evo_memo_a.png			\
+ 	figures/evo_newmess_a.png 		\
+ 	figures/evo_newmail.png			\
+diff -up evolution-2.30.2/help/Makefile.in.unused-help-figure evolution-2.30.2/help/Makefile.in
+--- evolution-2.30.2/help/Makefile.in.unused-help-figure	2010-07-25 06:30:40.501792368 -0400
++++ evolution-2.30.2/help/Makefile.in	2010-07-25 06:30:57.463793008 -0400
+@@ -563,7 +563,6 @@ DOC_FIGURES = \
+ 	figures/evo_mboxreceive_a.png 		\
+ 	figures/evo_memo_a.png 			\
+ 	figures/evo_mhreceive_a.png 		\
+-	figures/evo_mail_notifier.png		\
+ 	figures/evo_memo_a.png			\
+ 	figures/evo_newmess_a.png 		\
+ 	figures/evo_newmail.png			\

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.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
+02d225cf130ed0cfcf90915b6ba977bf  evolution-2.30.3.tar.bz2