nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-26 06:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

evolution-data-server: 3.50.4 → 3.52.0

Browse Source 
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.
This commit is contained in:
Bobby Rong 2024-02-13 12:06:38 +00:00 committed by Maxine Aubrey
parent 0e49a859e7
commit d3de5bb8de
No known key found for this signature in database
GPG Key ID: F6FE033DFCB899F7
2 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/desktops/gnome/core/evolution-data-server/default.nix
View File

@ -50,13 +50,13 @@
stdenv.mkDerivation rec {
pname = "evolution-data-server";
version = "3.50.4";
version = "3.52.0";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-1+3/vgOgu87L7mc5MhS4McexjNiVuExNv+E4d3biV8U=";
hash = "sha256-pdXhHHoeWFhG7+Jg88HGGng5m9i2I7/XmsHA/+p73gY=";
};
patches = [
@ -147,10 +147,6 @@ stdenv.mkDerivation rec {
--replace "-Wl,--no-undefined" ""
substituteInPlace src/services/evolution-alarm-notify/e-alarm-notify.c \
--replace "G_OS_WIN32" "__APPLE__"
'' + lib.optionalString stdenv.cc.isClang ''
# https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/513
substituteInPlace src/addressbook/libebook-contacts/e-phone-number-private.cpp \
--replace "std::auto_ptr" "std::unique_ptr"
'';
postInstall = lib.optionalString stdenv.isDarwin ''

38
pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c
index bd479d8..bd049b3 100644
index 5e65ec8..8ca28c6 100644
--- a/src/addressbook/libebook/e-book-client.c
+++ b/src/addressbook/libebook/e-book-client.c
@@ -1997,7 +1997,18 @@ e_book_client_get_self (ESourceRegistry *registry,
@@ -1924,7 +1924,18 @@ e_book_client_get_self (ESourceRegistry *registry,
*out_client = book_client;
@ -22,7 +22,7 @@ index bd479d8..bd049b3 100644
uid = g_settings_get_string (settings, SELF_UID_KEY);
g_object_unref (settings);
@@ -2065,7 +2076,18 @@ e_book_client_set_self (EBookClient *client,
@@ -1992,7 +2003,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 bd479d8..bd049b3 100644
g_settings_set_string (
settings, SELF_UID_KEY,
e_contact_get_const (contact, E_CONTACT_UID));
@@ -2101,8 +2123,18 @@ e_book_client_is_self (EContact *contact)
@@ -2028,8 +2050,18 @@ e_book_client_is_self (EContact *contact)
* unfortunately the API doesn't allow that.
*/
g_mutex_lock (&mutex);
@ -128,7 +128,7 @@ index e85a56b..59d3fe2 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 63e1016..0492756 100644
index 5b4debf..77c8d9c 100644
--- a/src/addressbook/libedata-book/e-book-meta-backend.c
+++ b/src/addressbook/libedata-book/e-book-meta-backend.c
@@ -144,7 +144,18 @@ ebmb_is_power_saver_enabled (void)
@ -152,10 +152,10 @@ index 63e1016..0492756 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 42f3457..b4926af 100644
index 43bd383..4dce824 100644
--- a/src/calendar/backends/contacts/e-cal-backend-contacts.c
+++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c
@@ -1387,7 +1387,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc)
@@ -1369,7 +1369,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc)
(GDestroyNotify) g_free,
(GDestroyNotify) contact_record_free);
@ -202,10 +202,10 @@ index 2525856..7ecc1a8 100644
g_clear_object (&settings);
}
diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c
index ade0a73..d7c3e73 100644
index 44ba49c..dfac2a2 100644
--- a/src/calendar/libecal/e-reminder-watcher.c
+++ b/src/calendar/libecal/e-reminder-watcher.c
@@ -2626,8 +2626,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher)
@@ -2826,8 +2826,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher)
watcher->priv = e_reminder_watcher_get_instance_private (watcher);
watcher->priv->cancellable = g_cancellable_new ();
@ -242,7 +242,7 @@ index ade0a73..d7c3e73 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 27fa153..3679d72 100644
index b9145af..350fcd3 100644
--- a/src/calendar/libedata-cal/e-cal-meta-backend.c
+++ b/src/calendar/libedata-cal/e-cal-meta-backend.c
@@ -156,7 +156,18 @@ ecmb_is_power_saver_enabled (void)
@ -265,7 +265,7 @@ index 27fa153..3679d72 100644
if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) {
GPowerProfileMonitor *power_monitor;
@@ -2633,7 +2644,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend,
@@ -2632,7 +2643,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend,
if (is_declined) {
GSettings *settings;
@ -288,7 +288,7 @@ index 27fa153..3679d72 100644
g_clear_object (&settings);
}
diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c
index bef9188..ce92f6c 100644
index d5a0823..2ae03f8 100644
--- a/src/camel/camel-cipher-context.c
+++ b/src/camel/camel-cipher-context.c
@@ -1631,7 +1631,18 @@ camel_cipher_can_load_photos (void)
@ -312,7 +312,7 @@ index bef9188..ce92f6c 100644
g_clear_object (&settings);
diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c
index 4deae76..ebe0a1b 100644
index cecd740..9a15180 100644
--- a/src/camel/camel-gpg-context.c
+++ b/src/camel/camel-gpg-context.c
@@ -747,7 +747,18 @@ gpg_ctx_get_executable_name (void)
@ -361,10 +361,10 @@ index e61160c..b6553a4 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 8518c90..6a655a9 100644
index bbf214b..bed39d2 100644
--- a/src/camel/providers/imapx/camel-imapx-server.c
+++ b/src/camel/providers/imapx/camel-imapx-server.c
@@ -5627,7 +5627,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder)
@@ -5661,7 +5661,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder)
if (do_old_flags_update) {
GSettings *eds_settings;
@ -433,10 +433,10 @@ index 188f276..939f89b 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 ec08afe..7b31227 100644
index 1453410..a3f06b0 100644
--- a/src/libedataserver/e-oauth2-service-google.c
+++ b/src/libedataserver/e-oauth2-service-google.c
@@ -71,7 +71,18 @@ eos_google_read_settings (EOAuth2Service *service,
@@ -72,7 +72,18 @@ eos_google_read_settings (EOAuth2Service *service,
if (!value) {
GSettings *settings;
@ -529,10 +529,10 @@ index af59b0b..0c7e75e 100644
g_object_unref (settings);
diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c
index 4a9b398..e7cb404 100644
index 1539f8b..77cf123 100644
--- a/src/libedataserver/e-source-registry.c
+++ b/src/libedataserver/e-source-registry.c
@@ -1773,7 +1773,19 @@ e_source_registry_init (ESourceRegistry *registry)
@@ -1754,7 +1754,19 @@ e_source_registry_init (ESourceRegistry *registry)
g_mutex_init (&registry->priv->sources_lock);