diff options
-rw-r--r-- | meta-gnome/recipes-connectivity/geary/geary/0001-meson-Do-not-check-for-iso-xml-files-during-build.patch | 31 | ||||
-rw-r--r-- | meta-gnome/recipes-connectivity/geary/geary_40.0.bb | 5 |
2 files changed, 35 insertions, 1 deletions
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 @@ | |||
1 | From 474cd5a9d22ef9f25c37194d3c8ce1bc4d18102d Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 22 Nov 2024 00:44:49 -0800 | ||
4 | Subject: [PATCH] meson: Do not check for iso xml files during build | ||
5 | |||
6 | These files are needed during runtime and may exist in a different | ||
7 | path ( staging area ) when cross-compiled, therefore its not completely | ||
8 | valid to check for these files to exist during build-time | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | |||
13 | Adapted for Kirkstone - Geary v40 | ||
14 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
15 | --- | ||
16 | meson.build | 2 -- | ||
17 | 1 file changed, 2 deletions(-) | ||
18 | |||
19 | diff --git a/meson.build b/meson.build | ||
20 | index d0af9eef8..46c8106fa 100644 | ||
21 | --- a/meson.build | ||
22 | +++ b/meson.build | ||
23 | @@ -221,8 +221,6 @@ if iso_3166_xml == '' | ||
24 | iso_3166_xml = iso_codes_dir / 'iso_3166.xml' | ||
25 | endif | ||
26 | |||
27 | -files(iso_639_xml, iso_3166_xml) # Check to make sure these exist | ||
28 | - | ||
29 | # Post-install scripts | ||
30 | meson.add_install_script('build-aux' / 'post_install.py') | ||
31 | |||
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 = " \ | |||
36 | git://github.com/GNOME/geary.git;branch=main;protocol=https \ | 36 | git://github.com/GNOME/geary.git;branch=main;protocol=https \ |
37 | file://0001-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch \ | 37 | file://0001-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch \ |
38 | file://0002-Fix-accessibility-issues-with-initializer-of-constan.patch \ | 38 | file://0002-Fix-accessibility-issues-with-initializer-of-constan.patch \ |
39 | file://0001-meson-Do-not-check-for-iso-xml-files-during-build.patch \ | ||
39 | " | 40 | " |
40 | 41 | ||
41 | S = "${WORKDIR}/git" | 42 | S = "${WORKDIR}/git" |
@@ -45,7 +46,9 @@ SRCREV = "e561775c1580a9f60a726355b2b897bfc9cb3382" | |||
45 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11" | 46 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11" |
46 | 47 | ||
47 | GIR_MESON_OPTION = "" | 48 | GIR_MESON_OPTION = "" |
48 | EXTRA_OEMESON = "-Dprofile=release" | 49 | EXTRA_OEMESON = "-Dprofile=release \ |
50 | -Diso_639_xml=${datadir}/xml/iso-codes/iso_639.xml \ | ||
51 | -Diso_3166_xml=${datadir}/xml/iso-codes/iso_3166.xml" | ||
49 | 52 | ||
50 | PACKAGECONFIG[libunwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" | 53 | PACKAGECONFIG[libunwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" |
51 | PACKAGECONFIG[tnef] = "-Dtnef=enabled,-Dtnef=disabled,libytnef" | 54 | PACKAGECONFIG[tnef] = "-Dtnef=enabled,-Dtnef=disabled,libytnef" |