From be6024e133cc2d8306e30494798e628f746c7185 Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Sat, 6 Sep 2025 17:14:27 +0200 Subject: geary: don't check iso codes xml at build time In case the iso_639_xml and iso_3166_xml files are not present on the build machine, then meson fails the compilation - however these files are used only during runtime. To avoid this, add a patch not to check the existence of these files during building, but also specify where these files will be located using build arguments. This patch is a backport from master branch 73c46b265d1cb35c43956d1723c338a137f6ef56 Signed-off-by: Gyorgy Sarvari --- ...-not-check-for-iso-xml-files-during-build.patch | 31 ++++++++++++++++++++++ .../recipes-connectivity/geary/geary_40.0.bb | 5 +++- 2 files changed, 35 insertions(+), 1 deletion(-) 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..af11fa9eb1 --- /dev/null +++ b/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Do-not-check-for-iso-xml-files-during-build.patch @@ -0,0 +1,31 @@ +From 474cd5a9d22ef9f25c37194d3c8ce1bc4d18102d Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 + +Adapted for Kirkstone - Geary v40 +Signed-off-by: Gyorgy Sarvari +--- + meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/meson.build b/meson.build +index d0af9eef8..46c8106fa 100644 +--- a/meson.build ++++ b/meson.build +@@ -221,8 +221,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 scripts + meson.add_install_script('build-aux' / 'post_install.py') + diff --git a/meta-gnome/recipes-connectivity/geary/geary_40.0.bb b/meta-gnome/recipes-connectivity/geary/geary_40.0.bb index 7faa69c55c..3712e4e27e 100644 --- a/meta-gnome/recipes-connectivity/geary/geary_40.0.bb +++ b/meta-gnome/recipes-connectivity/geary/geary_40.0.bb @@ -36,6 +36,7 @@ SRC_URI = " \ git://github.com/GNOME/geary.git;branch=main;protocol=https \ file://0001-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch \ file://0002-Fix-accessibility-issues-with-initializer-of-constan.patch \ + file://0001-meson-Do-not-check-for-iso-xml-files-during-build.patch \ " S = "${WORKDIR}/git" @@ -45,7 +46,9 @@ SRCREV = "e561775c1580a9f60a726355b2b897bfc9cb3382" REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11" GIR_MESON_OPTION = "" -EXTRA_OEMESON = "-Dprofile=release" +EXTRA_OEMESON = "-Dprofile=release \ + -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" PACKAGECONFIG[tnef] = "-Dtnef=enabled,-Dtnef=disabled,libytnef" -- cgit v1.2.3-54-g00ecf