[evolution-data-server/wip/mcrha/soup3] Bump dependency for WebKitGTK and libgweather

[Milan Crha <mcrha src gnome org>]

commit 186cc49c8ca8114cb630739048c699a2aa31e11c
Author: Milan Crha <mcrha redhat com>
Date:   Thu Nov 11 12:44:34 2021 +0100

    Bump dependency for WebKitGTK and libgweather

 CMakeLists.txt                                   | 25 +++++++++---------------
 config.h.in                                      |  3 ---
 src/calendar/backends/weather/e-weather-source.c |  9 +--------
 3 files changed, 10 insertions(+), 27 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 079a07d98..6ce45d245 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,11 +118,11 @@ set(sqlite_minimum_version 3.7.17)
 
 # Optional Packages
 set(goa_minimum_version 3.8)
-set(gweather_minimum_version 3.10)
+set(gweather_minimum_version 3.90)
 set(libaccounts_glib_minimum_version 1.4)
 set(libsignon_glib_minimum_version 1.8)
 set(json_glib_minimum_version 1.0.4)
-set(webkit2gtk_minimum_version 2.28.0)
+set(webkit2gtk_minimum_version 2.34.0)
 set(libcanberra_gtk_minimum_version 0.25)
 
 # Load modules from the source tree
@@ -400,7 +400,7 @@ if(ENABLE_OAUTH2)
        )
 
        pkg_check_modules_for_option(ENABLE_OAUTH2 "OAuth2 authentication support" OAUTH2_WEBKIT2GTK
-               webkit2gtk-4.0>=${webkit2gtk_minimum_version}
+               webkit2gtk-4.1>=${webkit2gtk_minimum_version}
        )
 
        add_printable_variable(WITH_GOOGLE_CLIENT_ID "Google OAuth 2.0 client id" "")
@@ -752,20 +752,13 @@ endif(NOT have_addrinfo)
 add_printable_option(ENABLE_WEATHER "Build the weather calendar backend" ON)
 
 if(ENABLE_WEATHER)
-       pkg_check_modules_for_option(ENABLE_WEATHER "weather calendar backend" LIBGWEATHER 
gweather-3.0>=${gweather_minimum_version})
+       pkg_check_modules_for_option(ENABLE_WEATHER "weather calendar backend" LIBGWEATHER 
gweather4>=${gweather_minimum_version})
 
-       set(CMAKE_REQUIRED_INCLUDES ${LIBGWEATHER_INCLUDE_DIRS})
-       set(CMAKE_REQUIRED_LIBRARIES ${LIBGWEATHER_LDFLAGS})
-       CHECK_C_SOURCE_COMPILES("#define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
-                               #include <libgweather/gweather.h>
-                               #undef GWEATHER_I_KNOW_THIS_IS_UNSTABLE
-
-                               int main(void) {
-                                       gweather_info_new (NULL);
-                                       return 0;
-                               }" HAVE_ONE_ARG_GWEATHER_INFO_NEW)
-       unset(CMAKE_REQUIRED_INCLUDES)
-       unset(CMAKE_REQUIRED_LIBRARIES)
+       # compatibility check
+       pkg_check_variable(gweather_soupapiversion gweather4 soupapiversion)
+       if(NOT "${gweather_soupapiversion}" STREQUAL "3.0")
+               message(FATAL_ERROR "Requires libgweather compiled with libsoup 3.0 API, but found version 
'${gweather_soupapiversion}' instead. If you want to disable weather calendar backend, please use 
-DENABLE_WEATHER=OFF argument to cmake command.")
+       endif(NOT "${gweather_soupapiversion}" STREQUAL "3.0")
 endif(ENABLE_WEATHER)
 
 # ************************************************
diff --git a/config.h.in b/config.h.in
index dfe787d19..f8c92f097 100644
--- a/config.h.in
+++ b/config.h.in
@@ -194,9 +194,6 @@
 #define O_LARGEFILE 0
 #endif /* HAVE_O_LARGEFILE */
 
-/* gweather_info_new() has only one argument */
-#cmakedefine HAVE_ONE_ARG_GWEATHER_INFO_NEW 1
-
 /* evolution-alarm-notify - Define if using Canberra-GTK for sound */
 #cmakedefine HAVE_CANBERRA 1
 
diff --git a/src/calendar/backends/weather/e-weather-source.c 
b/src/calendar/backends/weather/e-weather-source.c
index 3052d034c..e7548cd03 100644
--- a/src/calendar/backends/weather/e-weather-source.c
+++ b/src/calendar/backends/weather/e-weather-source.c
@@ -202,16 +202,9 @@ e_weather_source_parse (EWeatherSource *source,
        source->priv->done = done;
 
        if (source->priv->info == NULL) {
-               source->priv->info = gweather_info_new (
-                       source->priv->location
-               #ifndef HAVE_ONE_ARG_GWEATHER_INFO_NEW
-                       , GWEATHER_FORECAST_LIST
-               #endif
-               );
-               #if GWEATHER_CHECK_VERSION(3, 39, 0)
+               source->priv->info = gweather_info_new (source->priv->location);
                gweather_info_set_application_id (source->priv->info, "org.gnome.Evolution-data-server");
                gweather_info_set_contact_info (source->priv->info, "evolution-hackers gnome org");
-               #endif
                gweather_info_set_enabled_providers (source->priv->info, GWEATHER_PROVIDER_METAR | 
GWEATHER_PROVIDER_IWIN);
                g_signal_connect_object (
                        source->priv->info, "updated",