From bdb5a10b14a386c32e1f9af7c49d1ce868b90bde Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 16 Sep 2023 09:17:08 +0000 Subject: evolution-ews: 3.49.2 → 3.50.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-ews/-/compare/3.49.2...3.50.0 It should be possible to split package as mentioned in https://github.com/GNOME/evolution-ews/commit/d28287dfc94cb0fa089ea27b657c013fb78cd37f Changelog-reviewed-by: Bobby Rong --- .../evolution/evolution-ews/default.nix | 4 ++-- .../evolution-ews/hardcode-gsettings.patch | 25 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/networking/mailreaders') diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index c219d758544b2..a5b8e988c1bf9 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.49.2"; + version = "3.50.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1CFv5/+N1QkyOAG/2h2hd3AvyO6YYlSYaoHkdLTqhPE="; + sha256 = "16oN6KeP7I5I7S1h6jcDqDwcy1rACv/7qyXsBRnCvqQ="; }; patches = [ diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch index f1182394b550a..aa1b1bcb89db9 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch @@ -1,3 +1,28 @@ +diff --git a/src/EWS/calendar/e-cal-backend-ews-utils.c b/src/EWS/calendar/e-cal-backend-ews-utils.c +index 653a8fb..ad80283 100644 +--- a/src/EWS/calendar/e-cal-backend-ews-utils.c ++++ b/src/EWS/calendar/e-cal-backend-ews-utils.c +@@ -2406,7 +2406,19 @@ e_cal_backend_ews_get_configured_evolution_icaltimezone (void) + if (schema) { + GSettings *settings; + +- settings = g_settings_new ("org.gnome.evolution.calendar"); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@evo@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution.calendar", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, ++ NULL); ++ } + + if (g_settings_get_boolean (settings, "use-system-timezone")) + location = e_cal_util_get_system_timezone_location (); diff --git a/src/EWS/camel/camel-ews-utils.c b/src/EWS/camel/camel-ews-utils.c index dbd9adb..a2372a4 100644 --- a/src/EWS/camel/camel-ews-utils.c -- cgit 1.4.1