Do not check for these files to exist during build time, they are needed during runtime.
Signed-off-by: Khem Raj <[email protected]> Cc: Markus Volk <[email protected]> --- ...check-for-iso-xml-files-during-build.patch | 28 +++++++++++++++++++ .../recipes-connectivity/geary/geary_46.0.bb | 5 ++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 meta-gnome/recipes-connectivity/geary/geary/0001-meson-Do-not-check-for-iso-xml-files-during-build.patch diff --git a/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Do-not-check-for-iso-xml-files-during-build.patch b/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Do-not-check-for-iso-xml-files-during-build.patch new file mode 100644 index 0000000000..ecab7155e6 --- /dev/null +++ b/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Do-not-check-for-iso-xml-files-during-build.patch @@ -0,0 +1,28 @@ +From 474cd5a9d22ef9f25c37194d3c8ce1bc4d18102d Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 22 Nov 2024 00:44:49 -0800 +Subject: [PATCH] meson: Do not check for iso xml files during build + +These files are needed during runtime and may exist in a different +path ( staging area ) when cross-compiled, therefore its not completely +valid to check for these files to exist during build-time + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> +--- + meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 87261baee..032629f5f 100644 +--- a/meson.build ++++ b/meson.build +@@ -219,8 +219,6 @@ if iso_3166_xml == '' + iso_3166_xml = iso_codes_dir / 'iso_3166.xml' + endif + +-files(iso_639_xml, iso_3166_xml) # Check to make sure these exist +- + # Post-install script + gnome.post_install( + gtk_update_icon_cache: true, diff --git a/meta-gnome/recipes-connectivity/geary/geary_46.0.bb b/meta-gnome/recipes-connectivity/geary/geary_46.0.bb index 6d6d9f5443..7474ee0bab 100644 --- a/meta-gnome/recipes-connectivity/geary/geary_46.0.bb +++ b/meta-gnome/recipes-connectivity/geary/geary_46.0.bb @@ -38,6 +38,7 @@ inherit meson pkgconfig mime-xdg gsettings gtk-icon-cache gobject-introspection SRC_URI = " \ git://github.com/GNOME/geary.git;nobranch=1;protocol=https \ file://0001-application-client.vala-hardcode-some-paths.patch \ + file://0001-meson-Do-not-check-for-iso-xml-files-during-build.patch \ " S = "${WORKDIR}/git" @@ -48,8 +49,8 @@ REQUIRED_DISTRO_FEATURES = "gobject-introspection-data opengl" GIR_MESON_OPTION = "" EXTRA_OEMESON = "-Dprofile=release \ - -Diso_639_xml=${STAGING_DATADIR}/xml/iso-codes/iso_639.xml \ - -Diso_3166_xml=${STAGING_DATADIR}/xml/iso-codes/iso_3166.xml \ + -Diso_639_xml=${datadir}/xml/iso-codes/iso_639.xml \ + -Diso_3166_xml=${datadir}/xml/iso-codes/iso_3166.xml \ " PACKAGECONFIG[libunwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#113991): https://lists.openembedded.org/g/openembedded-devel/message/113991 Mute This Topic: https://lists.openembedded.org/mt/109719559/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
