[geary] build: Fix building against libsoup3

[Cédric Bellegarde <cbellegarde src gnome org>]

commit 796845aaa7148076132af0ff074e9218d0c3f8b8
Author: Cédric Bellegarde <cedric bellegarde adishatz org>
Date:   Wed Jul 13 20:10:02 2022 +0200

    build: Fix building against libsoup3
    
    - Move to WebKitGTK 4.1
    - Remove commit hold on EDS

 meson.build          | 6 +++---
 org.gnome.Geary.json | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/meson.build b/meson.build
index 92b987925..27043e575 100644
--- a/meson.build
+++ b/meson.build
@@ -67,7 +67,7 @@ glib = dependency('glib-2.0', version: '>=' + target_glib)
 gmime = dependency('gmime-3.0', version: '>= 3.2.4')
 gtk = dependency('gtk+-3.0', version: '>=' + target_gtk)
 sqlite = dependency('sqlite3', version: '>= 3.24')
-webkit2gtk = dependency('webkit2gtk-4.0', version: '>=' + target_webkit)
+webkit2gtk = dependency('webkit2gtk-4.1', version: '>=' + target_webkit)
 
 # Secondary deps - keep sorted alphabetically
 # We need appdata.its from appstream-glib:
@@ -87,7 +87,7 @@ gspell = dependency('gspell-1')
 gthread = dependency('gthread-2.0', version: '>=' + target_glib)
 icu_uc = dependency('icu-uc', version: '>=60')
 iso_codes = dependency('iso-codes')
-javascriptcoregtk = dependency('javascriptcoregtk-4.0', version: '>=' + target_webkit)
+javascriptcoregtk = dependency('javascriptcoregtk-4.1', version: '>=' + target_webkit)
 json_glib = dependency('json-glib-1.0', version: '>= 1.0')
 libhandy = dependency('libhandy-1', version: '>= 1.2.1', required: false)
 libmath = cc.find_library('m')
@@ -103,7 +103,7 @@ libunwind_generic_dep = dependency(
 libxml = dependency('libxml-2.0', version: '>= 2.7.8')
 libytnef = dependency('libytnef', version: '>= 1.9.3', required: get_option('tnef'))
 posix = valac.find_library('posix')
-webkit2gtk_web_extension = dependency('webkit2gtk-web-extension-4.0', version: '>=' + target_webkit)
+webkit2gtk_web_extension = dependency('webkit2gtk-web-extension-4.1', version: '>=' + target_webkit)
 
 # System dependencies above ensures appropriate versions for the
 # following libraries, but the declared dependency is what we actually
diff --git a/org.gnome.Geary.json b/org.gnome.Geary.json
index 616929333..08a714c2e 100644
--- a/org.gnome.Geary.json
+++ b/org.gnome.Geary.json
@@ -120,7 +120,6 @@
                 "-DENABLE_CANBERRA=OFF",
                 "-DENABLE_EXAMPLES=OFF",
                 "-DENABLE_GOA=ON",
-                "-DENABLE_GOOGLE=OFF",
                 "-DENABLE_GTK=ON",
                 "-DENABLE_GTK_DOC=OFF",
                 "-DENABLE_INSTALLED_TESTS=OFF",
@@ -133,8 +132,7 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/evolution-data-server.git";,
-                    "branch": "a4e8d81239ba9168a7b42e87b29ec65243d52e64"
+                    "url": "https://gitlab.gnome.org/GNOME/evolution-data-server.git";
                 }
             ],
             "cleanup": [