From 054716edca0ed56c171b5cb8d375c6bdf53eaa4b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 19 Mar 2025 18:28:49 -0700 Subject: [PATCH] libgweather4: Upgrade to 4.4.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fix deprecation warnings [!300] - Fix introspection annotation for async functions [!318] - Plug some memory leaks [!321] - Translation updates Use GI_TYPELIB_PATH to point to typlib paths in target sysroot Fixes | FAILED: data/Locations.bin | /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libgweather4/4.4.4/libgweather-4.4.4/build-aux/meson/gen_locations_variant.py ../libgweather-4.4.4/data/Locations.xml data/Locations.bin | Traceback (most recent call last): | File "/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libgweather4/4.4.4/libgweather-4.4.4/build-aux/meson/gen_locations_variant.py", line 7, in | from gi.repository import GLib | File "/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libgweather4/4.4.4/recipe-sysroot-native/usr/lib/python3.13/site-packages/gi/importer.py", line 133, in create_module | raise ImportError('cannot import name %s, ' | 'introspection typelib not found' % namespace) | ImportError: cannot import name GLib, introspection typelib not found Signed-off-by: Khem Raj Cc: Andreas Müller --- .../{libgweather4_4.4.2.bb => libgweather4_4.4.4.bb} | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) rename meta-gnome/recipes-gnome/libgweather/{libgweather4_4.4.2.bb => libgweather4_4.4.4.bb} (75%) diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.2.bb b/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.4.bb similarity index 75% rename from meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.2.bb rename to meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.4.bb index e0c8724a31..85bc21b5da 100644 --- a/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.2.bb +++ b/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.4.bb @@ -11,11 +11,13 @@ inherit gnomebase gsettings gobject-introspection gettext gi-docgen vala feature REQUIRED_DISTRO_FEATURES = "opengl" SRC_URI += "file://0001-Allow-building-gir-in-cross-environments.patch" -SRC_URI[archive.sha256sum] = "a6e427b4770ada48945f3aa906af710fc833cff0d42df91f1828302740d794ec" +SRC_URI[archive.sha256sum] = "7017677753cdf7d1fdc355e4bfcdb1eba8369793a8df24d241427a939cbf4283" GTKDOC_MESON_OPTION = "gtk_doc" VALA_MESON_OPTION = "enable_vala" +export GI_TYPELIB_PATH = "${STAGING_LIBDIR}/girepository-1.0/" + DEPENDS = " \ geocode-glib \ gtk4 \ @@ -28,7 +30,3 @@ FILES:${PN} += " \ ${datadir}/libgweather-4 \ ${libdir}/libgweather-4 \ " - -do_configure:prepend() { - cp -f ${STAGING_LIBDIR}/girepository-1.0/GLib*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/ -}