evolution-data-server: 3.45.1 → 3.45.2

- Replaced libgdata by custom functions w/ json-glib: 6b62b6e32f

https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.45.1...3.45.2

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>

pkgs/desktops/gnome/core/evolution-data-server/default.nix

@@ -45,20 +45,19 @@
 , libphonenumber
 , gnome-online-accounts
 , libgweather
-, libgdata
 , boost
 , protobuf
 }:
 
 stdenv.mkDerivation rec {
   pname = "evolution-data-server";
-  version = "3.45.1";
+  version = "3.45.2";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "M0t2QR8hDzcEYDsSpCwU/DKY+hL/6abk+/uYeeP+SyI=";
+    sha256 = "bBMkIoUAYzvgBz/67Z4ZNWFr8mghFbJVcc6aBJw6s6k=";
   };
 
   patches = [
@@ -93,9 +92,7 @@ stdenv.mkDerivation rec {
     gcr_4
     p11-kit
     libgweather
-    libgdata
     libaccounts-glib
-    json-glib
     icu
     sqlite
     libkrb5
@@ -120,9 +117,9 @@ stdenv.mkDerivation rec {
     nss
     nspr
     libical
-    libgdata # needed for GObject inspection, https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/57/diffs
     libsoup_3
     libxml2
+    json-glib
   ];
 
   cmakeFlags = [

pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch

@@ -298,7 +298,7 @@ index e61160c..d17871a 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 1eeff8d..6d1d58b 100644
+index 2ed68cf..5dad98f 100644
 --- a/src/camel/providers/imapx/camel-imapx-server.c
 +++ b/src/camel/providers/imapx/camel-imapx-server.c
 @@ -5573,7 +5573,18 @@ camel_imapx_server_skip_old_flags_update (CamelStore *store)
@@ -442,7 +442,7 @@ index 8e4ee81..bb8f8f7 100644
  		g_object_unref (settings);
  
 diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c
-index 290534d..36331b6 100644
+index 5a21872..a56d589 100644
 --- a/src/libedataserver/e-oauth2-service.c
 +++ b/src/libedataserver/e-oauth2-service.c
 @@ -90,7 +90,18 @@ eos_default_guess_can_process (EOAuth2Service *service,
@@ -491,10 +491,10 @@ index 6701a3a..6b8ee33 100644
  	g_signal_connect (
  		registry->priv->settings, "changed",
 diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e-reminders-widget.c
-index c0c1aea..14e6806 100644
+index 14b6481..6dc55bb 100644
 --- a/src/libedataserverui/e-reminders-widget.c
 +++ b/src/libedataserverui/e-reminders-widget.c
-@@ -1956,7 +1956,19 @@ static void
+@@ -1986,7 +1986,19 @@ static void
  e_reminders_widget_init (ERemindersWidget *reminders)
  {
  	reminders->priv = e_reminders_widget_get_instance_private (reminders);

pkgs/desktops/gnome/core/gnome-contacts/default.nix

@@ -15,7 +15,6 @@
 , gnome-online-accounts
 , wrapGAppsHook
 , folks
-, libgdata
 , libxml2
 , gnome
 , vala

pkgs/development/libraries/folks/default.nix

@@ -18,7 +18,6 @@
 , dbus
 , libgee
 , evolution-data-server
-, libgdata
 , libsecret
 , db
 , python3
@@ -62,7 +61,6 @@ stdenv.mkDerivation rec {
     db
     dbus-glib
     evolution-data-server
-    libgdata # required for some backends transitively
     libsecret
     libsoup
     libxml2