From a530fa938fab2fc91ea68c5b30ce5b4df798ac9e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 8 Jan 2025 08:57:48 +0000 Subject: [PATCH] =?UTF-8?q?evolution-data-server:=203.54.2=20=E2=86=92=203?= =?UTF-8?q?.54.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.54.2...3.54.3 --- .../hardcode-gsettings.patch | 26 ++++++++++--------- .../ev/evolution-data-server/package.nix | 4 +-- 2 files changed, 16 insertions(+), 14 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 6ef66f2c3cb6..0f6e40630f62 100644 --- a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch @@ -1,5 +1,5 @@ diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c -index 5e65ec8..8ca28c6 100644 +index 5e65ec8..2cae29d 100644 --- a/src/addressbook/libebook/e-book-client.c +++ b/src/addressbook/libebook/e-book-client.c @@ -1924,7 +1924,18 @@ e_book_client_get_self (ESourceRegistry *registry, @@ -42,23 +42,25 @@ index 5e65ec8..8ca28c6 100644 g_settings_set_string ( settings, SELF_UID_KEY, e_contact_get_const (contact, E_CONTACT_UID)); -@@ -2028,8 +2050,18 @@ e_book_client_is_self (EContact *contact) +@@ -2028,8 +2050,20 @@ e_book_client_is_self (EContact *contact) * unfortunately the API doesn't allow that. */ g_mutex_lock (&mutex); - if (!settings) - settings = g_settings_new (SELF_UID_PATH_ID); + if (!settings) { -+ g_autoptr(GSettingsSchemaSource) schema_source; -+ g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ SELF_UID_PATH_ID, -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ SELF_UID_PATH_ID, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ } + } uid = g_settings_get_string (settings, SELF_UID_KEY); g_mutex_unlock (&mutex); diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index d2cfda341cd8..b034d3cc0202 100644 --- a/pkgs/by-name/ev/evolution-data-server/package.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.54.2"; + version = "3.54.3"; outputs = [ "out" @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/evolution-data-server-${version}.tar.xz"; - hash = "sha256-EfAlMInIq/RWz/2j/mWKNaDeK4rpPY8lfWsCCueWPSA="; + hash = "sha256-UQjcOO5cwfjvkVXof2xBKflkRVCglixa4j/4B7V8uNA="; }; patches = [