[evolution] build: Update geocode-glib dependency
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] build: Update geocode-glib dependency
- Date: Fri, 1 Jul 2022 05:18:28 +0000 (UTC)
commit 5fb09faf9c468fd7761c9a5a4dddac47cb9c8402
Author: Milan Crha <mcrha redhat com>
Date: Fri Jul 1 07:16:27 2022 +0200
build: Update geocode-glib dependency
The libsoup3 version is named geocode-glib-2.0 now, thus reflect it
in the build scripts.
CMakeLists.txt | 8 ++++----
flatpak/org.gnome.Evolution-master.json | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c6bc663bd..e3cadb6ec7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,7 +88,7 @@ set(sqlite_minimum_version 3.7.17)
# Optional Packages
set(champlain_minimum_version 0.12)
set(clutter_gtk_minimum_version 0.90)
-set(geocode_glib_minimum_version 3.10)
+set(geocode_glib_minimum_version 3.26.3)
set(gladeui_minimum_version 3.10.0)
set(gnome_autoar_minimum_version 0.1.1)
set(gweather_minimum_version 3.91)
@@ -691,7 +691,7 @@ add_printable_option(ENABLE_WEATHER "Enable weather calendars" ON)
if(ENABLE_WEATHER)
pkg_check_modules_for_option(ENABLE_WEATHER "weather calendar" GWEATHER
gweather4>=${gweather_minimum_version})
- pkg_check_modules_for_option(ENABLE_WEATHER "weather calendar" GEO
geocode-glib-1.0>=${geocode_glib_minimum_version})
+ pkg_check_modules_for_option(ENABLE_WEATHER "weather calendar" GEO
geocode-glib-2.0>=${geocode_glib_minimum_version})
# compatibility check
pkg_check_variable(gweather_soupapiversion gweather4 soupapiversion)
@@ -700,7 +700,7 @@ if(ENABLE_WEATHER)
endif(NOT "${gweather_soupapiversion}" STREQUAL "3.0")
unset(gweather_soupapiversion)
- pkg_check_variable(geocode_glib_soupapiversion geocode-glib-1.0 soupapiversion)
+ pkg_check_variable(geocode_glib_soupapiversion geocode-glib-2.0 soupapiversion)
if(NOT "${geocode_glib_soupapiversion}" STREQUAL "3.0")
message(FATAL_ERROR "Requires geocode-glib compiled with libsoup 3.0 API, but found version
'${geocode_glib_soupapiversion}' instead. If you want to disable weather calendar, please use
-DENABLE_WEATHER=OFF argument to cmake command.")
endif(NOT "${geocode_glib_soupapiversion}" STREQUAL "3.0")
@@ -715,7 +715,7 @@ if(ENABLE_CONTACT_MAPS)
message("Contact maps auto-disabled due to no champlain-gtk, which uses libsoup3")
set(ENABLE_CONTACT_MAPS OFF)
# pkg_check_modules_for_option(ENABLE_CONTACT_MAPS "contact maps" CHAMPLAIN
champlain-gtk-0.12>=${champlain_minimum_version})
-# pkg_check_modules_for_option(ENABLE_CONTACT_MAPS "contact maps" GEO
geocode-glib-1.0>=${geocode_glib_minimum_version})
+# pkg_check_modules_for_option(ENABLE_CONTACT_MAPS "contact maps" GEO
geocode-glib-2.0>=${geocode_glib_minimum_version})
# pkg_check_modules_for_option(ENABLE_CONTACT_MAPS "contact maps" CLUTTER_GTK
clutter-gtk-1.0>=${clutter_gtk_minimum_version})
endif(ENABLE_CONTACT_MAPS)
diff --git a/flatpak/org.gnome.Evolution-master.json b/flatpak/org.gnome.Evolution-master.json
index 17dad2add9..56c45f1dd4 100644
--- a/flatpak/org.gnome.Evolution-master.json
+++ b/flatpak/org.gnome.Evolution-master.json
@@ -189,9 +189,9 @@
],
"sources": [
{
- "type": "git",
- "url": "https://gitlab.gnome.org/GNOME/geocode-glib.git",
- "branch": "master"
+ "type": "archive",
+ "url":
"https://download.gnome.org/sources/geocode-glib/3.26/geocode-glib-3.26.3.tar.xz",
+ "sha256":
"1dfeae83b90eccca1b6cf7dcf7c5e3b317828cf0b56205c4471ef0f911999766"
}
]
},
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]