pyrox.dev / nixpkgs
lol
fork atom

evolution-data-server: 3.50.4 → 3.52.0

https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.50.4...3.52.0

libaccounts-glib cleanup already done in 3.50.3 bump.

authored by Bobby Rong and committed by Maxine Aubrey d3de5bb8 0e49a859

+21 -25
unified split
+2 -6
pkgs/desktops/gnome/core/evolution-data-server/default.nix
··· 50 50 51 51 stdenv.mkDerivation rec { 52 52 pname = "evolution-data-server"; 53 - version = "3.50.4"; 53 + version = "3.52.0"; 54 54 55 55 outputs = [ "out" "dev" ]; 56 56 57 57 src = fetchurl { 58 58 url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 59 - sha256 = "sha256-1+3/vgOgu87L7mc5MhS4McexjNiVuExNv+E4d3biV8U="; 59 + hash = "sha256-pdXhHHoeWFhG7+Jg88HGGng5m9i2I7/XmsHA/+p73gY="; 60 60 }; 61 61 62 62 patches = [ ··· 147 147 --replace "-Wl,--no-undefined" "" 148 148 substituteInPlace src/services/evolution-alarm-notify/e-alarm-notify.c \ 149 149 --replace "G_OS_WIN32" "__APPLE__" 150 - '' + lib.optionalString stdenv.cc.isClang '' 151 - # https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/513 152 - substituteInPlace src/addressbook/libebook-contacts/e-phone-number-private.cpp \ 153 - --replace "std::auto_ptr" "std::unique_ptr" 154 150 ''; 155 151 156 152 postInstall = lib.optionalString stdenv.isDarwin ''
+19 -19
pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch
··· 1 1 diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c 2 - index bd479d8..bd049b3 100644 2 + index 5e65ec8..8ca28c6 100644 3 3 --- a/src/addressbook/libebook/e-book-client.c 4 4 +++ b/src/addressbook/libebook/e-book-client.c 5 - @@ -1997,7 +1997,18 @@ e_book_client_get_self (ESourceRegistry *registry, 5 + @@ -1924,7 +1924,18 @@ e_book_client_get_self (ESourceRegistry *registry, 6 6 7 7 *out_client = book_client; 8 8 ··· 22 22 uid = g_settings_get_string (settings, SELF_UID_KEY); 23 23 g_object_unref (settings); 24 24 25 - @@ -2065,7 +2076,18 @@ e_book_client_set_self (EBookClient *client, 25 + @@ -1992,7 +2003,18 @@ e_book_client_set_self (EBookClient *client, 26 26 g_return_val_if_fail ( 27 27 e_contact_get_const (contact, E_CONTACT_UID) != NULL, FALSE); 28 28 ··· 42 42 g_settings_set_string ( 43 43 settings, SELF_UID_KEY, 44 44 e_contact_get_const (contact, E_CONTACT_UID)); 45 - @@ -2101,8 +2123,18 @@ e_book_client_is_self (EContact *contact) 45 + @@ -2028,8 +2050,18 @@ e_book_client_is_self (EContact *contact) 46 46 * unfortunately the API doesn't allow that. 47 47 */ 48 48 g_mutex_lock (&mutex); ··· 128 128 g_object_unref (settings); 129 129 130 130 diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c 131 - index 63e1016..0492756 100644 131 + index 5b4debf..77c8d9c 100644 132 132 --- a/src/addressbook/libedata-book/e-book-meta-backend.c 133 133 +++ b/src/addressbook/libedata-book/e-book-meta-backend.c 134 134 @@ -144,7 +144,18 @@ ebmb_is_power_saver_enabled (void) ··· 152 152 if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { 153 153 GPowerProfileMonitor *power_monitor; 154 154 diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c 155 - index 42f3457..b4926af 100644 155 + index 43bd383..4dce824 100644 156 156 --- a/src/calendar/backends/contacts/e-cal-backend-contacts.c 157 157 +++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c 158 - @@ -1387,7 +1387,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) 158 + @@ -1369,7 +1369,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) 159 159 (GDestroyNotify) g_free, 160 160 (GDestroyNotify) contact_record_free); 161 161 ··· 202 202 g_clear_object (&settings); 203 203 } 204 204 diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c 205 - index ade0a73..d7c3e73 100644 205 + index 44ba49c..dfac2a2 100644 206 206 --- a/src/calendar/libecal/e-reminder-watcher.c 207 207 +++ b/src/calendar/libecal/e-reminder-watcher.c 208 - @@ -2626,8 +2626,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher) 208 + @@ -2826,8 +2826,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher) 209 209 210 210 watcher->priv = e_reminder_watcher_get_instance_private (watcher); 211 211 watcher->priv->cancellable = g_cancellable_new (); ··· 242 242 g_signal_connect_object ( 243 243 watcher->priv->desktop_settings, 244 244 diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c 245 - index 27fa153..3679d72 100644 245 + index b9145af..350fcd3 100644 246 246 --- a/src/calendar/libedata-cal/e-cal-meta-backend.c 247 247 +++ b/src/calendar/libedata-cal/e-cal-meta-backend.c 248 248 @@ -156,7 +156,18 @@ ecmb_is_power_saver_enabled (void) ··· 265 265 266 266 if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { 267 267 GPowerProfileMonitor *power_monitor; 268 - @@ -2633,7 +2644,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend, 268 + @@ -2632,7 +2643,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend, 269 269 if (is_declined) { 270 270 GSettings *settings; 271 271 ··· 288 288 g_clear_object (&settings); 289 289 } 290 290 diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c 291 - index bef9188..ce92f6c 100644 291 + index d5a0823..2ae03f8 100644 292 292 --- a/src/camel/camel-cipher-context.c 293 293 +++ b/src/camel/camel-cipher-context.c 294 294 @@ -1631,7 +1631,18 @@ camel_cipher_can_load_photos (void) ··· 312 312 g_clear_object (&settings); 313 313 314 314 diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c 315 - index 4deae76..ebe0a1b 100644 315 + index cecd740..9a15180 100644 316 316 --- a/src/camel/camel-gpg-context.c 317 317 +++ b/src/camel/camel-gpg-context.c 318 318 @@ -747,7 +747,18 @@ gpg_ctx_get_executable_name (void) ··· 361 361 G_CALLBACK (mi_user_headers_settings_changed_cb), NULL); 362 362 G_UNLOCK (mi_user_headers); 363 363 diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c 364 - index 8518c90..6a655a9 100644 364 + index bbf214b..bed39d2 100644 365 365 --- a/src/camel/providers/imapx/camel-imapx-server.c 366 366 +++ b/src/camel/providers/imapx/camel-imapx-server.c 367 - @@ -5627,7 +5627,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) 367 + @@ -5661,7 +5661,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) 368 368 if (do_old_flags_update) { 369 369 GSettings *eds_settings; 370 370 ··· 433 433 settings, "network-monitor-gio-name", 434 434 object, "gio-name", 435 435 diff --git a/src/libedataserver/e-oauth2-service-google.c b/src/libedataserver/e-oauth2-service-google.c 436 - index ec08afe..7b31227 100644 436 + index 1453410..a3f06b0 100644 437 437 --- a/src/libedataserver/e-oauth2-service-google.c 438 438 +++ b/src/libedataserver/e-oauth2-service-google.c 439 - @@ -71,7 +71,18 @@ eos_google_read_settings (EOAuth2Service *service, 439 + @@ -72,7 +72,18 @@ eos_google_read_settings (EOAuth2Service *service, 440 440 if (!value) { 441 441 GSettings *settings; 442 442 ··· 529 529 g_object_unref (settings); 530 530 531 531 diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c 532 - index 4a9b398..e7cb404 100644 532 + index 1539f8b..77cf123 100644 533 533 --- a/src/libedataserver/e-source-registry.c 534 534 +++ b/src/libedataserver/e-source-registry.c 535 - @@ -1773,7 +1773,19 @@ e_source_registry_init (ESourceRegistry *registry) 535 + @@ -1754,7 +1754,19 @@ e_source_registry_init (ESourceRegistry *registry) 536 536 537 537 g_mutex_init (&registry->priv->sources_lock); 538 538