diff options
-rw-r--r-- | meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch | 21 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/libgweather/libgweather4_4.2.0.bb (renamed from meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb) | 6 |
2 files changed, 10 insertions, 17 deletions
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 | |||
11 | Upstream-Status: Inappropriate [OE-specific] | 11 | Upstream-Status: Inappropriate [OE-specific] |
12 | 12 | ||
13 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | 13 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> |
14 | --- | 14 | Signed-off-by: Markus Volk <f_l_k@t-online.de> |
15 | libgweather/meson.build | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | 15 | ||
18 | diff --git a/libgweather/meson.build b/libgweather/meson.build | 16 | --- a/meson.build 2022-09-18 14:48:53.000000000 +0200 |
19 | index 08311af..ef554f2 100644 | 17 | +++ b/meson.build 2022-11-26 14:05:13.302487232 +0100 |
20 | --- a/libgweather/meson.build | 18 | @@ -51,7 +51,7 @@ |
21 | +++ b/libgweather/meson.build | 19 | gen_locations_variant = find_program('build-aux/meson/gen_locations_variant.py') |
22 | @@ -208,7 +208,7 @@ lib_libgweather = library('gweather-4', | ||
23 | ) | ||
24 | 20 | ||
25 | g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection')) | 21 | g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection')) |
26 | -build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build() | 22 | -build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build() |
27 | +build_gir = get_option('introspection') and g_ir_scanner.found() | 23 | +build_gir = get_option('introspection') and g_ir_scanner.found() |
24 | build_docs = get_option('gtk_doc') and build_gir | ||
28 | 25 | ||
29 | enable_vala = get_option('enable_vala') | 26 | schemas_srcdir = meson.project_source_root() / 'schemas' |
30 | vapigen = find_program('vapigen', required: enable_vala == 'true') | ||
31 | -- | ||
32 | 2.34.1 | ||
33 | |||
diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb b/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}" | |||
10 | inherit gnomebase gsettings gobject-introspection gettext gtk-doc vala | 10 | inherit gnomebase gsettings gobject-introspection gettext gtk-doc vala |
11 | 11 | ||
12 | SRC_URI += "file://0001-Allow-building-gir-in-cross-environments.patch" | 12 | SRC_URI += "file://0001-Allow-building-gir-in-cross-environments.patch" |
13 | SRC_URI[archive.sha256sum] = "440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c" | 13 | SRC_URI[archive.sha256sum] = "af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203" |
14 | 14 | ||
15 | GTKDOC_MESON_OPTION = "gtk_doc" | 15 | GTKDOC_MESON_OPTION = "gtk_doc" |
16 | 16 | ||
17 | DEPENDS = " \ | 17 | DEPENDS = " \ |
18 | geocode-glib \ | 18 | geocode-glib \ |
19 | gtk+3 \ | 19 | gtk4 \ |
20 | json-glib \ | 20 | json-glib \ |
21 | libsoup-2.4 \ | 21 | libsoup-3.0 \ |
22 | python3-pygobject-native \ | 22 | python3-pygobject-native \ |
23 | " | 23 | " |
24 | 24 | ||