diff options
| author | Bobby Rong <rjl931189261@126.com> | 2023-04-15 05:48:16 +0000 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2023-04-15 16:37:23 +0800 |
| commit | 7d67d51c6dd450c62a09dc7f60bdb74661da705a (patch) | |
| tree | b28e9f08666a72df0252e0dc2aa803c730c8b644 /pkgs/applications/networking/mailreaders/evolution/evolution-ews | |
| parent | fe2ecaf706a5907b5e54d979fbde4924d84b65fc (diff) | |
evolution-ews: 3.46.4 → 3.48.0
https://gitlab.gnome.org/GNOME/evolution-ews/-/compare/3.46.4...3.48.0
Diffstat (limited to 'pkgs/applications/networking/mailreaders/evolution/evolution-ews')
| -rw-r--r-- | pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch | 24 |
2 files changed, 26 insertions, 2 deletions
diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 49e8852fd0ce4..fdec80717e745 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.46.4"; + version = "3.48.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "bLYE99MKkh7MgxA9ZPKOj1+1VcFT9mHSQvayB/9Hy58="; + sha256 = "FmFlu+oUQbuS8qk0jZp97EiCoNMTGc0lZlcdpnd+8t4="; }; 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 c5fb77fc2a510..dae88b9e2bae6 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch @@ -70,3 +70,27 @@ index ff1b8e3..4f876c0 100644 strv = g_settings_get_strv (settings, "labels"); for (ii = 0; strv && strv[ii]; ii++) { +diff --git a/src/Microsoft365/common/e-m365-tz-utils.c b/src/Microsoft365/common/e-m365-tz-utils.c +index 7a1d7f4..3c0d5e1 100644 +--- a/src/Microsoft365/common/e-m365-tz-utils.c ++++ b/src/Microsoft365/common/e-m365-tz-utils.c +@@ -192,7 +192,18 @@ e_m365_tz_utils_get_user_timezone (void) + gchar *location; + ICalTimezone *zone = NULL; + +- 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 (); |