From 5183447fae587fbd36622c8a515ec5b90fc02486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20=22Capypara=22=20K=C3=B6pcke?= Date: Mon, 7 Sep 2026 17:51:08 +0000 Subject: [PATCH] evolution-data-server: 3.60.2 -> 3.61.3 https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.60.2...3.61.3 --- .../hardcode-gsettings.patch | 94 +++++++++---------- .../ev/evolution-data-server/package.nix | 4 +- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch index c259dd0f1269e..4e7825882f290 100644 --- a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch @@ -1,8 +1,8 @@ diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c -index 12fc59c..3fc80a5 100644 +index 9a9910b..51b5fea 100644 --- a/src/addressbook/libebook/e-book-client.c +++ b/src/addressbook/libebook/e-book-client.c -@@ -1944,7 +1944,18 @@ e_book_client_get_self (ESourceRegistry *registry, +@@ -1930,7 +1930,18 @@ e_book_client_get_self (ESourceRegistry *registry, *out_client = book_client; @@ -22,7 +22,7 @@ index 12fc59c..3fc80a5 100644 uid = g_settings_get_string (settings, SELF_UID_KEY); g_object_unref (settings); -@@ -2012,7 +2023,18 @@ e_book_client_set_self (EBookClient *client, +@@ -1998,7 +2009,18 @@ e_book_client_set_self (EBookClient *client, g_return_val_if_fail ( e_contact_get_const (contact, E_CONTACT_UID) != NULL, FALSE); @@ -42,7 +42,7 @@ index 12fc59c..3fc80a5 100644 g_settings_set_string ( settings, SELF_UID_KEY, e_contact_get_const (contact, E_CONTACT_UID)); -@@ -2048,8 +2070,20 @@ e_book_client_is_self (EContact *contact) +@@ -2034,8 +2056,20 @@ e_book_client_is_self (EContact *contact) * unfortunately the API doesn't allow that. */ g_mutex_lock (&mutex); @@ -66,10 +66,10 @@ index 12fc59c..3fc80a5 100644 g_mutex_unlock (&mutex); diff --git a/src/addressbook/libebook/e-book.c b/src/addressbook/libebook/e-book.c -index 9d986d2..d63902a 100644 +index 89d4415..126e76b 100644 --- a/src/addressbook/libebook/e-book.c +++ b/src/addressbook/libebook/e-book.c -@@ -2593,7 +2593,18 @@ e_book_get_self (ESourceRegistry *registry, +@@ -2585,7 +2585,18 @@ e_book_get_self (ESourceRegistry *registry, return FALSE; } @@ -89,7 +89,7 @@ index 9d986d2..d63902a 100644 uid = g_settings_get_string (settings, SELF_UID_KEY); g_object_unref (settings); -@@ -2648,7 +2659,18 @@ e_book_set_self (EBook *book, +@@ -2640,7 +2651,18 @@ e_book_set_self (EBook *book, g_return_val_if_fail (E_IS_BOOK (book), FALSE); g_return_val_if_fail (E_IS_CONTACT (contact), FALSE); @@ -109,7 +109,7 @@ index 9d986d2..d63902a 100644 g_settings_set_string ( settings, SELF_UID_KEY, e_contact_get_const (contact, E_CONTACT_UID)); -@@ -2676,7 +2698,18 @@ e_book_is_self (EContact *contact) +@@ -2668,7 +2690,18 @@ e_book_is_self (EContact *contact) g_return_val_if_fail (E_IS_CONTACT (contact), FALSE); @@ -130,10 +130,10 @@ index 9d986d2..d63902a 100644 g_object_unref (settings); diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c -index c24a37a..e5cf57e 100644 +index b333983..ae02db6 100644 --- a/src/addressbook/libedata-book/e-book-meta-backend.c +++ b/src/addressbook/libedata-book/e-book-meta-backend.c -@@ -148,7 +148,18 @@ ebmb_is_power_saver_enabled (void) +@@ -137,7 +137,18 @@ ebmb_is_power_saver_enabled (void) GSettings *settings; gboolean enabled = FALSE; @@ -154,10 +154,10 @@ index c24a37a..e5cf57e 100644 if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c -index b16756f..f3d2d6b 100644 +index 8bf2aed..5090738 100644 --- a/src/calendar/backends/contacts/e-cal-backend-contacts.c +++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c -@@ -1433,7 +1433,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) +@@ -1420,7 +1420,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) (GDestroyNotify) g_free, (GDestroyNotify) contact_record_free); @@ -178,10 +178,10 @@ index b16756f..f3d2d6b 100644 cbc->priv->update_alarms_id = 0; cbc->priv->alarm_enabled = FALSE; diff --git a/src/calendar/backends/file/e-cal-backend-file.c b/src/calendar/backends/file/e-cal-backend-file.c -index 2e2dd0b..b5f99ab 100644 +index ccf87f0..228c546 100644 --- a/src/calendar/backends/file/e-cal-backend-file.c +++ b/src/calendar/backends/file/e-cal-backend-file.c -@@ -3701,7 +3701,20 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend, +@@ -3698,7 +3698,20 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend, if (is_declined) { GSettings *settings; @@ -204,10 +204,10 @@ index 2e2dd0b..b5f99ab 100644 g_clear_object (&settings); } diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c -index 92d68e2..d1e1fa4 100644 +index a51c457..13cb4fe 100644 --- a/src/calendar/libecal/e-reminder-watcher.c +++ b/src/calendar/libecal/e-reminder-watcher.c -@@ -2882,8 +2882,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher) +@@ -2871,8 +2871,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher) watcher->priv = e_reminder_watcher_get_instance_private (watcher); watcher->priv->cancellable = g_cancellable_new (); @@ -244,10 +244,10 @@ index 92d68e2..d1e1fa4 100644 g_signal_connect_object ( watcher->priv->desktop_settings, diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c -index 866afd1..e57d877 100644 +index 5e5db03..3279dcf 100644 --- a/src/calendar/libedata-cal/e-cal-meta-backend.c +++ b/src/calendar/libedata-cal/e-cal-meta-backend.c -@@ -160,7 +160,18 @@ ecmb_is_power_saver_enabled (void) +@@ -149,7 +149,18 @@ ecmb_is_power_saver_enabled (void) GSettings *settings; gboolean enabled = FALSE; @@ -267,7 +267,7 @@ index 866afd1..e57d877 100644 if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; -@@ -2617,7 +2628,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend, +@@ -2606,7 +2617,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend, if (is_declined) { GSettings *settings; @@ -290,10 +290,10 @@ index 866afd1..e57d877 100644 g_clear_object (&settings); } diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c -index a830f89..b9abaa2 100644 +index 01420f5..cf489d1 100644 --- a/src/camel/camel-cipher-context.c +++ b/src/camel/camel-cipher-context.c -@@ -1638,7 +1638,18 @@ camel_cipher_can_load_photos (void) +@@ -1648,7 +1648,18 @@ camel_cipher_can_load_photos (void) GSettings *settings; gboolean load_photos; @@ -314,10 +314,10 @@ index a830f89..b9abaa2 100644 g_clear_object (&settings); diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c -index 94f0769..8de758b 100644 +index 4fce4dd..5eeb917 100644 --- a/src/camel/camel-gpg-context.c +++ b/src/camel/camel-gpg-context.c -@@ -748,7 +748,18 @@ gpg_ctx_get_executable_name (void) +@@ -736,7 +736,18 @@ gpg_ctx_get_executable_name (void) GSettings *settings; gchar *path; @@ -338,10 +338,10 @@ index 94f0769..8de758b 100644 g_clear_object (&settings); diff --git a/src/camel/camel-utils.c b/src/camel/camel-utils.c -index 3de034a..b6732ba 100644 +index bf8fc53..19c8cac 100644 --- a/src/camel/camel-utils.c +++ b/src/camel/camel-utils.c -@@ -363,7 +363,19 @@ void +@@ -352,7 +352,19 @@ void _camel_utils_initialize (void) { G_LOCK (mi_user_headers); @@ -363,10 +363,10 @@ index 3de034a..b6732ba 100644 G_CALLBACK (mi_user_headers_settings_changed_cb), NULL); G_UNLOCK (mi_user_headers); diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c -index e3f2391..374c72d 100644 +index f1c3c4a..24368db 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c -@@ -5682,7 +5682,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) +@@ -5758,7 +5758,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) if (do_old_flags_update) { GSettings *eds_settings; @@ -387,10 +387,10 @@ index e3f2391..374c72d 100644 if (g_settings_get_boolean (eds_settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; diff --git a/src/camel/providers/smtp/camel-smtp-transport.c b/src/camel/providers/smtp/camel-smtp-transport.c -index f7c5d3c..67732c3 100644 +index a255fb0..3a8fa63 100644 --- a/src/camel/providers/smtp/camel-smtp-transport.c +++ b/src/camel/providers/smtp/camel-smtp-transport.c -@@ -1471,7 +1471,18 @@ smtp_helo (CamelSmtpTransport *transport, +@@ -1457,7 +1457,18 @@ smtp_helo (CamelSmtpTransport *transport, transport->authtypes = NULL; } @@ -411,10 +411,10 @@ index f7c5d3c..67732c3 100644 g_clear_object (&settings); diff --git a/src/libedataserver/e-network-monitor.c b/src/libedataserver/e-network-monitor.c -index e9cb145..8fc30d5 100644 +index 9644e99..776a045 100644 --- a/src/libedataserver/e-network-monitor.c +++ b/src/libedataserver/e-network-monitor.c -@@ -260,7 +260,18 @@ e_network_monitor_constructed (GObject *object) +@@ -249,7 +249,18 @@ e_network_monitor_constructed (GObject *object) /* Chain up to parent's method. */ G_OBJECT_CLASS (e_network_monitor_parent_class)->constructed (object); @@ -435,10 +435,10 @@ index e9cb145..8fc30d5 100644 settings, "network-monitor-gio-name", object, "gio-name", diff --git a/src/libedataserver/e-oauth2-service-google.c b/src/libedataserver/e-oauth2-service-google.c -index 9624d86..6baa019 100644 +index f2936a9..85d31c1 100644 --- a/src/libedataserver/e-oauth2-service-google.c +++ b/src/libedataserver/e-oauth2-service-google.c -@@ -72,7 +72,18 @@ eos_google_read_settings (EOAuth2Service *service, +@@ -61,7 +61,18 @@ eos_google_read_settings (EOAuth2Service *service, if (!value) { GSettings *settings; @@ -459,10 +459,10 @@ index 9624d86..6baa019 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service-outlook.c b/src/libedataserver/e-oauth2-service-outlook.c -index 7342577..915d8bd 100644 +index 3115880..4b93967 100644 --- a/src/libedataserver/e-oauth2-service-outlook.c +++ b/src/libedataserver/e-oauth2-service-outlook.c -@@ -75,7 +75,18 @@ eos_outlook_read_settings (EOAuth2Service *service, +@@ -64,7 +64,18 @@ eos_outlook_read_settings (EOAuth2Service *service, if (!value) { GSettings *settings; @@ -483,10 +483,10 @@ index 7342577..915d8bd 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service-yahoo.c b/src/libedataserver/e-oauth2-service-yahoo.c -index 3738359..f9ce2d9 100644 +index d354463..1c02ad1 100644 --- a/src/libedataserver/e-oauth2-service-yahoo.c +++ b/src/libedataserver/e-oauth2-service-yahoo.c -@@ -67,7 +67,18 @@ eos_yahoo_read_settings (EOAuth2Service *service, +@@ -56,7 +56,18 @@ eos_yahoo_read_settings (EOAuth2Service *service, if (!value) { GSettings *settings; @@ -507,10 +507,10 @@ index 3738359..f9ce2d9 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c -index 9f56da2..f82921a 100644 +index 801fc67..281125b 100644 --- a/src/libedataserver/e-oauth2-service.c +++ b/src/libedataserver/e-oauth2-service.c -@@ -95,7 +95,18 @@ eos_default_guess_can_process (EOAuth2Service *service, +@@ -89,7 +89,18 @@ eos_default_guess_can_process (EOAuth2Service *service, name_len = strlen (name); hostname_len = strlen (hostname); @@ -531,10 +531,10 @@ index 9f56da2..f82921a 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c -index bcc2df7..42489da 100644 +index d336cc9..42dd5ab 100644 --- a/src/libedataserver/e-source-registry.c +++ b/src/libedataserver/e-source-registry.c -@@ -1751,7 +1751,19 @@ e_source_registry_init (ESourceRegistry *registry) +@@ -1738,7 +1738,19 @@ e_source_registry_init (ESourceRegistry *registry) g_mutex_init (®istry->priv->sources_lock); @@ -556,10 +556,10 @@ index bcc2df7..42489da 100644 g_signal_connect ( registry->priv->settings, "changed", diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e-reminders-widget.c -index 302aacf..ed4a7fa 100644 +index 9049c01..d3f6530 100644 --- a/src/libedataserverui/e-reminders-widget.c +++ b/src/libedataserverui/e-reminders-widget.c -@@ -2133,7 +2133,19 @@ static void +@@ -2122,7 +2122,19 @@ static void e_reminders_widget_init (ERemindersWidget *reminders) { reminders->priv = e_reminders_widget_get_instance_private (reminders); @@ -581,10 +581,10 @@ index 302aacf..ed4a7fa 100644 reminders->priv->is_empty = TRUE; reminders->priv->is_mapped = FALSE; diff --git a/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c b/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c -index 6f03053..b5db6b2 100644 +index 41ae657..6695d90 100644 --- a/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c +++ b/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c -@@ -706,7 +706,18 @@ evolution_source_registry_merge_autoconfig_sources (ESourceRegistryServer *serve +@@ -692,7 +692,18 @@ evolution_source_registry_merge_autoconfig_sources (ESourceRegistryServer *serve gchar *autoconfig_directory; gint ii; @@ -605,10 +605,10 @@ index 6f03053..b5db6b2 100644 autoconfig_sources = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, e_autoconfig_free_merge_source_data); diff --git a/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c b/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c -index d531cb9..c96f1d5 100644 +index 37c6616..6931c85 100644 --- a/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c +++ b/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c -@@ -61,7 +61,18 @@ evolution_source_registry_migrate_proxies (ESourceRegistryServer *server) +@@ -48,7 +48,18 @@ evolution_source_registry_migrate_proxies (ESourceRegistryServer *server) extension_name = E_SOURCE_EXTENSION_PROXY; extension = e_source_get_extension (source, extension_name); diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index 65178d7ce4cc5..9cae9cbe79803 100644 --- a/pkgs/by-name/ev/evolution-data-server/package.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "evolution-data-server"; - version = "3.60.2"; + version = "3.61.3"; outputs = [ "out" @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor finalAttrs.version}/evolution-data-server-${finalAttrs.version}.tar.xz"; - hash = "sha256-IITb2sOWNxs2XVBMH/RYZrqNyi8SUuXaHT2cM6vcEoY="; + hash = "sha256-HLnJtqEvpTRz9cAzKsOf/zJYb7Iqkyomqpc8JguxOoM="; }; patches = [