diff options
author | Bobby Rong <rjl931189261@126.com> | 2023-08-12 13:48:12 +0000 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2023-11-21 08:41:49 +0100 |
commit | dac768c92daf27f8feef8c4192d344e9a3a77ffd (patch) | |
tree | 1fe01375f29c172c7a9e64f252bcf186559b53ae | |
parent | ede0ce8aba2b1c2885bc7c83676c980da62cb207 (diff) |
evolution-data-server: 3.48.4 → 3.49.2
https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.48.4...3.49.2 The major build change will be "Add gi-docgen based documentation for all the libraries". ENABLE_GI_DOCGEN defaults to false. https://github.com/GNOME/evolution-data-server/commit/97a152b83bfa1143ad80d39439104a1371960765 Changelog-reviewed-by: Bobby Rong <rjl931189261@126.com> Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
-rw-r--r-- | pkgs/desktops/gnome/core/evolution-data-server/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch | 76 |
2 files changed, 64 insertions, 16 deletions
diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index a604efb9cc59e..b22ec37248541 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -50,13 +50,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.48.4"; + version = "3.49.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "mX4/k7F++wr/zAF77oeAul+iwAnjZVG7yRoIrlUtbWA="; + sha256 = "qSpw64nbRPRt5Ss3avusRkzP5Q/xPz5frzx6VkAMf7Q="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch index 15a42fe4e2a64..8781ebd586efe 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch @@ -128,10 +128,10 @@ 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 4aaabee..dd6ce6d 100644 +index 63e1016..0492756 100644 --- a/src/addressbook/libedata-book/e-book-meta-backend.c +++ b/src/addressbook/libedata-book/e-book-meta-backend.c -@@ -143,7 +143,18 @@ ebmb_is_power_saver_enabled (void) +@@ -144,7 +144,18 @@ ebmb_is_power_saver_enabled (void) GSettings *settings; gboolean enabled = FALSE; @@ -175,11 +175,37 @@ index 42f3457..b4926af 100644 cbc->priv->notifyid = 0; cbc->priv->update_alarms_id = 0; cbc->priv->alarm_enabled = FALSE; +diff --git a/src/calendar/backends/file/e-cal-backend-file.c b/src/calendar/backends/file/e-cal-backend-file.c +index 2525856..7ecc1a8 100644 +--- a/src/calendar/backends/file/e-cal-backend-file.c ++++ b/src/calendar/backends/file/e-cal-backend-file.c +@@ -3682,7 +3682,20 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend, + if (is_declined) { + GSettings *settings; + +- settings = g_settings_new ("org.gnome.evolution-data-server.calendar"); ++ { ++ 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, ++ "org.gnome.evolution-data-server.calendar", ++ FALSE); ++ settings = g_settings_new_full(schema, ++ NULL, ++ NULL); ++ } + can_delete = g_settings_get_boolean (settings, "delete-meeting-on-decline"); + g_clear_object (&settings); + } diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c -index 5087de1..5c24b87 100644 +index 5a08490..34c51f4 100644 --- a/src/calendar/libecal/e-reminder-watcher.c +++ b/src/calendar/libecal/e-reminder-watcher.c -@@ -2578,7 +2578,19 @@ e_reminder_watcher_init (EReminderWatcher *watcher) +@@ -2592,7 +2592,19 @@ e_reminder_watcher_init (EReminderWatcher *watcher) watcher->priv = e_reminder_watcher_get_instance_private (watcher); watcher->priv->cancellable = g_cancellable_new (); @@ -201,7 +227,7 @@ index 5087de1..5c24b87 100644 watcher->priv->default_zone = e_cal_util_copy_timezone (zone); watcher->priv->timers_enabled = TRUE; diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c -index cd91f07..79ede04 100644 +index 27fa153..3679d72 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) @@ -224,11 +250,33 @@ index cd91f07..79ede04 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, + if (is_declined) { + GSettings *settings; + +- settings = g_settings_new ("org.gnome.evolution-data-server.calendar"); ++ { ++ 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, ++ "org.gnome.evolution-data-server.calendar", ++ FALSE); ++ settings = g_settings_new_full(schema, ++ NULL, ++ NULL); ++ } + is_declined = g_settings_get_boolean (settings, "delete-meeting-on-decline"); + g_clear_object (&settings); + } diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c -index 8013ba7..1bba6d1 100644 +index bef9188..ce92f6c 100644 --- a/src/camel/camel-cipher-context.c +++ b/src/camel/camel-cipher-context.c -@@ -1625,7 +1625,18 @@ camel_cipher_can_load_photos (void) +@@ -1631,7 +1631,18 @@ camel_cipher_can_load_photos (void) GSettings *settings; gboolean load_photos; @@ -249,10 +297,10 @@ index 8013ba7..1bba6d1 100644 g_clear_object (&settings); diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c -index 205372e..f75a88e 100644 +index fd7ec52..338a73b 100644 --- a/src/camel/camel-gpg-context.c +++ b/src/camel/camel-gpg-context.c -@@ -582,7 +582,18 @@ gpg_ctx_get_executable_name (void) +@@ -747,7 +747,18 @@ gpg_ctx_get_executable_name (void) GSettings *settings; gchar *path; @@ -298,11 +346,11 @@ 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 78abb89..9f2a891 100644 +index 3180db6..ba3d679 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c -@@ -5591,7 +5591,18 @@ camel_imapx_server_skip_old_flags_update (CamelStore *store) - if (!skip_old_flags_update) { +@@ -5618,7 +5618,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) + if (do_old_flags_update) { GSettings *eds_settings; - eds_settings = g_settings_new ("org.gnome.evolution-data-server"); @@ -322,10 +370,10 @@ index 78abb89..9f2a891 100644 if (g_settings_get_boolean (eds_settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; diff --git a/src/camel/providers/smtp/camel-smtp-transport.c b/src/camel/providers/smtp/camel-smtp-transport.c -index effaf06..1b2a003 100644 +index 6556f1e..90f0a5e 100644 --- a/src/camel/providers/smtp/camel-smtp-transport.c +++ b/src/camel/providers/smtp/camel-smtp-transport.c -@@ -1462,7 +1462,18 @@ smtp_helo (CamelSmtpTransport *transport, +@@ -1471,7 +1471,18 @@ smtp_helo (CamelSmtpTransport *transport, transport->authtypes = NULL; } |