Add patch for RH bug #814663 (broken result of Save as mbox)

.gitignore

@@ -1 +1,28 @@
-/evolution-*.tar.xz
+evolution-2.31.5.tar.bz2
+/evolution-2.31.91.tar.bz2
+/evolution-2.31.92.tar.bz2
+/evolution-2.91.0.tar.bz2
+/evolution-2.91.1.tar.bz2
+/evolution-2.91.2.tar.bz2
+/evolution-2.91.3.tar.bz2
+/evolution-2.91.4.tar.bz2
+/evolution-2.91.5.tar.bz2
+/evolution-2.91.6.tar.bz2
+/evolution-2.91.6.1.tar.bz2
+/evolution-2.91.6.2.tar.bz2
+/evolution-2.91.90.tar.bz2
+/evolution-2.91.91.tar.bz2
+/evolution-2.91.92.tar.bz2
+/evolution-3.0.0.tar.bz2
+/evolution-3.1.1.tar.bz2
+/evolution-3.1.2.tar.bz2
+/evolution-3.1.3.tar.bz2
+/evolution-3.1.4.tar.bz2
+/evolution-3.1.5.tar.bz2
+/evolution-3.1.90.tar.xz
+/evolution-3.1.91.tar.xz
+/evolution-3.1.92.tar.xz
+/evolution-3.2.0.tar.xz
+/evolution-3.2.1.tar.xz
+/evolution-3.2.2.tar.xz
+/evolution-3.2.3.tar.xz

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.31.1/configure.ldaphack evolution-2.31.1/configure
+--- evolution-2.31.1/configure.ldaphack	2010-05-03 12:43:34.000000000 +0200
++++ evolution-2.31.1/configure	2010-05-03 19:22:55.000000000 +0200
+@@ -15797,7 +15797,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.  */
+ 
+@@ -16129,7 +16129,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,19 @@
+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,15 @@ e_shell_window_actions_init (EShellWindo
+ 	if (path == NULL)
+ 		gtk_action_set_visible (ACTION (SUBMIT_BUG), 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, "gnome", "help",
++		PACKAGE, "C", "index.page", NULL);
++	if (!g_file_test (path, G_FILE_TEST_IS_REGULAR))
++		gtk_action_set_visible (ACTION (CONTENTS), FALSE);
++	g_free (path);
+ }
+ 
+ static GList *

evolution-3.2.3-composer-dirty.patch

@@ -0,0 +1,128 @@
+diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
+index 9f32d8c..c9f41d5 100644
+--- a/composer/e-msg-composer.c
++++ b/composer/e-msg-composer.c
+@@ -3518,6 +3518,10 @@ msg_composer_send_cb (EMsgComposer *composer,
+ 
+ 	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message));
+ 
++	/* The callback can set editor 'changed' if anything failed. */
++	editor = GTKHTML_EDITOR (composer);
++	gtkhtml_editor_set_changed (editor, FALSE);
++
+ 	g_signal_emit (
+ 		composer, signals[SEND], 0,
+ 		message, context->activity);
+@@ -3525,10 +3529,6 @@ msg_composer_send_cb (EMsgComposer *composer,
+ 	g_object_unref (message);
+ 
+ 	async_context_free (context);
+-
+-	/* XXX This should be elsewhere. */
+-	editor = GTKHTML_EDITOR (composer);
+-	gtkhtml_editor_set_changed (editor, FALSE);
+ }
+ 
+ /**
+@@ -3610,6 +3610,10 @@ msg_composer_save_to_drafts_cb (EMsgComposer *composer,
+ 
+ 	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message));
+ 
++	/* The callback can set editor 'changed' if anything failed. */
++	editor = GTKHTML_EDITOR (composer);
++	gtkhtml_editor_set_changed (editor, FALSE);
++
+ 	g_signal_emit (
+ 		composer, signals[SAVE_TO_DRAFTS],
+ 		0, message, context->activity);
+@@ -3617,10 +3621,6 @@ msg_composer_save_to_drafts_cb (EMsgComposer *composer,
+ 	g_object_unref (message);
+ 
+ 	async_context_free (context);
+-
+-	/* XXX This should be elsewhere. */
+-	editor = GTKHTML_EDITOR (composer);
+-	gtkhtml_editor_set_changed (editor, FALSE);
+ }
+ 
+ /**
+diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
+index 23c1755..ef5476f 100644
+--- a/mail/em-composer-utils.c
++++ b/mail/em-composer-utils.c
+@@ -510,11 +510,13 @@ composer_send_completed (EMailSession *session,
+                          AsyncContext *context)
+ {
+ 	GError *error = NULL;
++	gboolean set_changed = FALSE;
+ 
+ 	e_mail_session_send_to_finish (session, result, &error);
+ 
+ 	if (e_activity_handle_cancellation (context->activity, error)) {
+ 		g_error_free (error);
++		set_changed = TRUE;
+ 		goto exit;
+ 	}
+ 
+@@ -549,6 +551,7 @@ composer_send_completed (EMailSession *session,
+ 		if (response == GTK_RESPONSE_ACCEPT)  /* Save to Outbox */
+ 			e_msg_composer_save_to_outbox (context->composer);
+ 		g_error_free (error);
++		set_changed = TRUE;
+ 		goto exit;
+ 	}
+ 
+@@ -561,6 +564,9 @@ composer_send_completed (EMailSession *session,
+ 		gtk_widget_destroy, context->composer);
+ 
+ exit:
++	if (set_changed)
++		gtkhtml_editor_set_changed (GTKHTML_EDITOR (context->composer), TRUE);
++
+ 	async_context_free (context);
+ }
+ 
+@@ -649,9 +655,11 @@ composer_save_to_drafts_complete (EMailSession *session,
+ 	e_mail_session_handle_draft_headers_finish (session, result, &error);
+ 
+ 	if (e_activity_handle_cancellation (context->activity, error)) {
++		gtkhtml_editor_set_changed (GTKHTML_EDITOR (context->composer), TRUE);
+ 		g_error_free (error);
+ 
+ 	} else if (error != NULL) {
++		gtkhtml_editor_set_changed (GTKHTML_EDITOR (context->composer), TRUE);
+ 		g_warning ("%s", error->message);
+ 		g_error_free (error);
+ 
+@@ -688,6 +696,7 @@ composer_save_to_drafts_cleanup (CamelFolder *drafts_folder,
+ 
+ 	if (e_activity_handle_cancellation (context->activity, error)) {
+ 		g_warn_if_fail (context->message_uid == NULL);
++		gtkhtml_editor_set_changed (GTKHTML_EDITOR (context->composer), TRUE);
+ 		async_context_free (context);
+ 		g_error_free (error);
+ 		return;
+@@ -698,6 +707,7 @@ composer_save_to_drafts_cleanup (CamelFolder *drafts_folder,
+ 			alert_sink,
+ 			"mail-composer:save-to-drafts-error",
+ 			error->message, NULL);
++		gtkhtml_editor_set_changed (GTKHTML_EDITOR (context->composer), TRUE);
+ 		async_context_free (context);
+ 		g_error_free (error);
+ 		return;
+@@ -761,6 +771,7 @@ composer_save_to_drafts_got_folder (EMailSession *session,
+ 
+ 	if (e_activity_handle_cancellation (context->activity, error)) {
+ 		g_warn_if_fail (drafts_folder == NULL);
++		gtkhtml_editor_set_changed (GTKHTML_EDITOR (context->composer), TRUE);
+ 		async_context_free (context);
+ 		g_error_free (error);
+ 		return;
+@@ -780,6 +791,7 @@ composer_save_to_drafts_got_folder (EMailSession *session,
+ 			GTK_WINDOW (context->composer),
+ 			"mail:ask-default-drafts", NULL);
+ 		if (response != GTK_RESPONSE_YES) {
++			gtkhtml_editor_set_changed (GTKHTML_EDITOR (context->composer), TRUE);
+ 			async_context_free (context);
+ 			return;
+ 		}

evolution-3.2.3-libpst-0.6.54.patch

@@ -0,0 +1,51 @@
+From 270b7b481529b23fced67a0624243da1c75c4c00 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Thu, 5 Jan 2012 12:00:07 +0100
+Subject: [PATCH] pst-import: Fix build with libpst 0.6.54 and require this
+ version
+
+pst_open() requires an additional argument now.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=667346
+---
+ configure.ac                      |    4 ++--
+ plugins/pst-import/pst-importer.c |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ce88950..b34ec77 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -47,7 +47,7 @@ m4_define([libgdata_minimum_version], [0.10])
+ m4_define([libsoup_minimum_version], [2.31.2])
+ m4_define([libxml_minimum_version], [2.7.3])
+ m4_define([shared_mime_info_minimum_version], [0.22])
+-m4_define([libpst_minimum_version], [0.6.41])
++m4_define([libpst_minimum_version], [0.6.54])
+ m4_define([libnotify_minimum_version], [0.5.1])
+ 
+ dnl Optional Packages
+@@ -1479,7 +1479,7 @@ AC_ARG_ENABLE([pst-import],
+ 	[enable_pst="$enableval"], [enable_pst=yes])
+ 
+ if test "x$enable_pst" = "xyes"; then
+-	PKG_CHECK_MODULES(LIBPST, libpst, have_pst=yes, have_pst=no)
++	PKG_CHECK_MODULES(LIBPST, libpst >= libpst_minimum_version, have_pst=yes, have_pst=no)
+ 	AC_SUBST(LIBPST_CFLAGS)
+ 	AC_SUBST(LIBPST_LIBS)
+ 
+diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
+index 5b99053..4305827 100644
+--- a/plugins/pst-import/pst-importer.c
++++ b/plugins/pst-import/pst-importer.c
+@@ -2219,7 +2219,7 @@ pst_init (pst_file *pst,
+ 	DEBUG_REGISTER_CLOSE ();
+ #endif
+ 
+-	if (pst_open (pst, filename) < 0) {
++	if (pst_open (pst, filename, NULL) < 0) {
+ 		pst_error_msg ("Error opening PST file %s", filename);
+ 		return -1;
+ 	}
+-- 
+1.7.7.3

evolution-3.2.3-save-as-mbox.patch

@@ -0,0 +1,67 @@
+diff -up evolution-3.2.3/mail/e-mail-folder-utils.c.save-as-mbox evolution-3.2.3/mail/e-mail-folder-utils.c
+--- evolution-3.2.3/mail/e-mail-folder-utils.c.save-as-mbox	2011-09-28 02:22:16.000000000 +0200
++++ evolution-3.2.3/mail/e-mail-folder-utils.c	2012-04-23 09:20:46.594366070 +0200
+@@ -1178,8 +1178,8 @@ e_mail_folder_save_messages_sync (CamelF
+                                   GError **error)
+ {
+ 	GFileOutputStream *file_output_stream;
++	CamelStream *base_stream = NULL;
+ 	GByteArray *byte_array;
+-	CamelStream *base_stream;
+ 	gboolean success = TRUE;
+ 	guint ii;
+ 
+@@ -1208,9 +1208,7 @@ e_mail_folder_save_messages_sync (CamelF
+ 		return FALSE;
+ 	}
+ 
+-	/* CamelStreamMem takes ownership of the GByteArray. */
+ 	byte_array = g_byte_array_new ();
+-	base_stream = camel_stream_mem_new_with_byte_array (byte_array);
+ 
+ 	for (ii = 0; ii < message_uids->len; ii++) {
+ 		CamelMimeMessage *message;
+@@ -1221,6 +1219,17 @@ e_mail_folder_save_messages_sync (CamelF
+ 		gint percent;
+ 		gint retval;
+ 
++		if (base_stream != NULL)
++			g_object_unref (base_stream);
++
++		/* CamelStreamMem does NOT take ownership of the byte
++		 * array when set with camel_stream_mem_set_byte_array().
++		 * This allows us to reuse the same memory slab for each
++		 * message, which is slightly more efficient. */
++		base_stream = camel_stream_mem_new ();
++		camel_stream_mem_set_byte_array (
++			CAMEL_STREAM_MEM (base_stream), byte_array);
++
+ 		uid = g_ptr_array_index (message_uids, ii);
+ 
+ 		message = camel_folder_get_message_sync (
+@@ -1278,18 +1287,19 @@ e_mail_folder_save_messages_sync (CamelF
+ 		percent = ((ii + 1) * 100) / message_uids->len;
+ 		camel_operation_progress (cancellable, percent);
+ 
+-		/* Flush the buffer for the next message.
+-		 * For memory streams this never fails. */
+-		g_seekable_seek (
+-			G_SEEKABLE (base_stream),
+-			0, G_SEEK_SET, NULL, NULL);
++		/* Reset the byte array for the next message. */
++		g_byte_array_set_size (byte_array, 0);
+ 
+ 		g_object_unref (message);
+ 	}
+ 
+ exit:
++	if (base_stream != NULL)
++		g_object_unref (base_stream);
++
++	g_byte_array_free (byte_array, TRUE);
++
+ 	g_object_unref (file_output_stream);
+-	g_object_unref (base_stream);
+ 
+ 	camel_operation_pop_message (cancellable);
+ 

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
+27b2e4ec00c7b9af03f9f034a3ad5dcd  evolution-3.2.3.tar.xz