MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-12-17 07:45:47 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

geary: Specify iso codes xml file locations

Browse Source 
Do not check for these files to exist during build time, they are
needed during runtime.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Markus Volk <f_l_k@t-online.de>
This commit is contained in:
Khem Raj 2024-11-22 00:50:17 -08:00
parent 34962ffbbe
commit 73c46b265d
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
meta-gnome/recipes-connectivity/geary/geary/0001-meson-Do-not-check-for-iso-xml-files-during-build.patch Normal file
View File

@ -0,0 +1,28 @@
From 474cd5a9d22ef9f25c37194d3c8ce1bc4d18102d Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
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 <raj.khem@gmail.com>
---
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,

5
meta-gnome/recipes-connectivity/geary/geary_46.0.bb
View File

@ -38,6 +38,7 @@ inherit meson pkgconfig mime-xdg gsettings gtk-icon-cache gobject-introspection
SRC_URI = " \ SRC_URI = " \
git://github.com/GNOME/geary.git;nobranch=1;protocol=https \ git://github.com/GNOME/geary.git;nobranch=1;protocol=https \
file://0001-application-client.vala-hardcode-some-paths.patch \ 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" S = "${WORKDIR}/git"
@ -48,8 +49,8 @@ REQUIRED_DISTRO_FEATURES = "gobject-introspection-data opengl"
GIR_MESON_OPTION = "" GIR_MESON_OPTION = ""
EXTRA_OEMESON = "-Dprofile=release \ EXTRA_OEMESON = "-Dprofile=release \
-Diso_639_xml=${STAGING_DATADIR}/xml/iso-codes/iso_639.xml \ -Diso_639_xml=${datadir}/xml/iso-codes/iso_639.xml \
-Diso_3166_xml=${STAGING_DATADIR}/xml/iso-codes/iso_3166.xml \ -Diso_3166_xml=${datadir}/xml/iso-codes/iso_3166.xml \
" "
PACKAGECONFIG[libunwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" PACKAGECONFIG[libunwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"