diff options
Diffstat (limited to 'meta-gnome/recipes-connectivity/geary')
| -rw-r--r-- | meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch | 51 | ||||
| -rw-r--r-- | meta-gnome/recipes-connectivity/geary/geary_44.0.bb | 61 |
2 files changed, 112 insertions, 0 deletions
diff --git a/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch b/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch new file mode 100644 index 0000000000..1e0640a666 --- /dev/null +++ b/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch @@ -0,0 +1,51 @@ +From a300be5877f35379bb569313eec901bda9c8d762 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 30 Apr 2023 22:08:39 -0700 +Subject: [PATCH] meson: Use PKG_CONFIG_SYSROOT_DIR when using pkg-config + +OE cross-builds and absolute paths found by pkg-config points to +non-sysroot'ed locations which are not correct as they point into native +sysroot from build machine which is incorrect. + +Upstream-Status: Inappropriate [OE-specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + meson.build | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index d563dd08..9b72aeb4 100644 +--- a/meson.build ++++ b/meson.build +@@ -38,6 +38,9 @@ metadata_dir = meson.project_source_root() / 'bindings'/ 'metadata' + po_dir = meson.project_source_root() / 'po' + vapi_dir = meson.project_source_root() / 'bindings' / 'vapi' + ++# pkg-config sysroot location ++pkgconf_sysroot = run_command('python3', '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() ++ + # Compiler configuration + add_project_arguments([ + # Make sure Meson can find custom VAPIs +@@ -120,7 +123,7 @@ icu_uc = declare_dependency( + if libunwind_dep.found() + # We need to add native lib to the search path for these so Flatpak + # builds can find it. +- unwind_lib = libunwind_dep.get_variable(pkgconfig: 'libdir') ++ unwind_lib = pkgconf_sysroot + libunwind_dep.get_variable(pkgconfig: 'libdir') + libunwind = declare_dependency( + dependencies: [ + valac.find_library('libunwind', dirs: [vapi_dir, unwind_lib]), +@@ -207,8 +210,7 @@ vala_unit_proj = subproject( + vala_unit_dep = vala_unit_proj.get_variable('vala_unit_dep') + + # Language detection +- +-iso_codes_dir = iso_codes.get_variable(pkgconfig: 'prefix')/'share'/'xml'/'iso-codes' ++iso_codes_dir = pkgconf_sysroot + iso_codes.get_variable(pkgconfig: 'prefix')/'share'/'xml'/'iso-codes' + + iso_639_xml = get_option('iso_639_xml') + if iso_639_xml == '' +-- +2.40.1 + diff --git a/meta-gnome/recipes-connectivity/geary/geary_44.0.bb b/meta-gnome/recipes-connectivity/geary/geary_44.0.bb new file mode 100644 index 0000000000..a585929092 --- /dev/null +++ b/meta-gnome/recipes-connectivity/geary/geary_44.0.bb @@ -0,0 +1,61 @@ +SUMMARY = "Geary is an email application built around conversations, for the GNOME 3 desktop." +SECTION = "network" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=2a2244d5a13871ad950c55877546a6a2" + +DEPENDS = " \ + appstream-glib \ + cairo \ + desktop-file-utils-native \ + enchant2 \ + evolution-data-server \ + folks \ + gcr3 \ + gmime \ + gnome-online-accounts \ + gsound \ + gspell \ + gtk+3 \ + icu \ + iso-codes \ + json-glib \ + libhandy \ + libical \ + libpeas \ + libsecret \ + libstemmer \ + libxml2 \ + sqlite3 \ + webkitgtk3 \ +" + +RDEPENDS:${PN} = "gnome-keyring" + +inherit meson pkgconfig mime-xdg gtk-icon-cache gobject-introspection vala features_check + +SRC_URI = " \ + git://github.com/GNOME/geary.git;nobranch=1;protocol=https \ + file://0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch \ +" + +S = "${WORKDIR}/git" +SRCREV = "b72db2a5e87f2269e6359af434a4fc02fca9e9df" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data opengl" + +GIR_MESON_OPTION = "" +EXTRA_OEMESON = "-Dprofile=release" + +PACKAGECONFIG[libunwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" +PACKAGECONFIG[tnef] = "-Dtnef=enabled,-Dtnef=disabled,libytnef" +PACKAGECONFIG[valadoc] = "-Dvaladoc=enabled,-Dvaladoc=disabled" + +PACKAGECONFIG ??= "" +# rfc822/rfc822-message.c:2097:12: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'gboolean' (aka 'int') [-Wint-conversion] +#| return NULL; +#| ^~~~ +CFLAGS:append:toolchain-clang = " -Wno-error=int-conversion" + +FILES:${PN} += "${datadir}" + |