evolution-ews: 3.52.4 → 3.53.2

https://gitlab.gnome.org/GNOME/evolution-ews/-/compare/3.52.4...3.53.2
NixOS · Aug 28, 2024 · 3eb1476 · 3eb1476
1 parent 2cfbb10
commit 3eb1476
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 51 deletions.
diff --git 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.52.4";
+ version = "3.53.2";
 
  src = fetchurl {
  url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- hash = "sha256-QI1VBWyA5K1kR+PHeINodYIfbCYdNepxF1YocPAvY7o=";
+ hash = "sha256-rp+rw1FD7vz9mqMR4WScoZgqWXgV22U9CiFH8TiuyOY=";
  };
 
  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
@@ -1,28 +1,3 @@
-diff --git a/src/EWS/calendar/e-cal-backend-ews-utils.c b/src/EWS/calendar/e-cal-backend-ews-utils.c
-index 87b02c6..3fabca6 100644
---- a/src/EWS/calendar/e-cal-backend-ews-utils.c
-+++ b/src/EWS/calendar/e-cal-backend-ews-utils.c
-@@ -2484,7 +2484,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 44a20d6..90d5729 100644
 --- a/src/EWS/camel/camel-ews-utils.c
@@ -47,30 +22,6 @@ index 44a20d6..90d5729 100644
  strv = g_settings_get_strv (settings, "labels");
 
  for (ii = 0; strv && strv[ii]; ii++) {
-diff --git a/src/EWS/common/e-ews-calendar-utils.c b/src/EWS/common/e-ews-calendar-utils.c
-index 6deda60..9b44cc7 100644
---- a/src/EWS/common/e-ews-calendar-utils.c
-+++ b/src/EWS/common/e-ews-calendar-utils.c
-@@ -413,7 +413,18 @@ ews_get_configured_icaltimezone (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);
-+ }
- location = g_settings_get_string (settings, "timezone");
- if (location) {
- zone = i_cal_timezone_get_builtin_timezone (location);
 diff --git a/src/Microsoft365/camel/camel-m365-store.c b/src/Microsoft365/camel/camel-m365-store.c
 index 3db3564..a233d4d 100644
 --- a/src/Microsoft365/camel/camel-m365-store.c
@@ -119,3 +70,28 @@ index 7a1d7f4..3c0d5e1 100644
 
  if (g_settings_get_boolean (settings, "use-system-timezone"))
  location = e_cal_util_get_system_timezone_location ();
+diff --git a/src/common/e-ews-common-utils.c b/src/common/e-ews-common-utils.c
+index 5017d40..34547e3 100644
+--- a/src/common/e-ews-common-utils.c
++++ b/src/common/e-ews-common-utils.c
+@@ -218,7 +218,19 @@ e_ews_common_utils_get_configured_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 ();