diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch b/meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch index 6c6a643edf..3a075de651 100644 --- a/meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch +++ b/meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch @@ -11,23 +11,16 @@ For us this works perfectly fine Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Andreas Müller ---- - libgweather/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) +Signed-off-by: Markus Volk -diff --git a/libgweather/meson.build b/libgweather/meson.build -index 08311af..ef554f2 100644 ---- a/libgweather/meson.build -+++ b/libgweather/meson.build -@@ -208,7 +208,7 @@ lib_libgweather = library('gweather-4', - ) +--- a/meson.build 2022-09-18 14:48:53.000000000 +0200 ++++ b/meson.build 2022-11-26 14:05:13.302487232 +0100 +@@ -51,7 +51,7 @@ + gen_locations_variant = find_program('build-aux/meson/gen_locations_variant.py') g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection')) -build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build() +build_gir = get_option('introspection') and g_ir_scanner.found() + build_docs = get_option('gtk_doc') and build_gir - enable_vala = get_option('enable_vala') - vapigen = find_program('vapigen', required: enable_vala == 'true') --- -2.34.1 - + schemas_srcdir = meson.project_source_root() / 'schemas' diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb b/meta-gnome/recipes-gnome/libgweather/libgweather4_4.2.0.bb similarity index 82% rename from meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb rename to meta-gnome/recipes-gnome/libgweather/libgweather4_4.2.0.bb index 708d27a61f..34d259ff33 100644 --- a/meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb +++ b/meta-gnome/recipes-gnome/libgweather/libgweather4_4.2.0.bb @@ -10,15 +10,15 @@ S = "${WORKDIR}/${GNOMEBN}-${PV}" inherit gnomebase gsettings gobject-introspection gettext gtk-doc vala SRC_URI += "file://0001-Allow-building-gir-in-cross-environments.patch" -SRC_URI[archive.sha256sum] = "440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c" +SRC_URI[archive.sha256sum] = "af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203" GTKDOC_MESON_OPTION = "gtk_doc" DEPENDS = " \ geocode-glib \ - gtk+3 \ + gtk4 \ json-glib \ - libsoup-2.4 \ + libsoup-3.0 \ python3-pygobject-native \ "