diff options
Diffstat (limited to 'meta-openembedded/meta-gnome/recipes-gnome')
8 files changed, 48 insertions, 20 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb index 681a61c33a..28d4c2152b 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb @@ -1,10 +1,12 @@ require ${BPN}.inc -inherit native +inherit_defer native DEPENDS = "glib-2.0-native" # build native helpers +do_configure[noexec] = "1" + do_compile() { cd ${S}/src/camel sed -i 's:#include "evolution-data-server-config.h"::g' camel-gen-tables.c diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb index 11a52b455e..0c3cc53030 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb @@ -6,7 +6,7 @@ DEPENDS = " \ dbus db virtual/libiconv zlib libsoup-3.0 libical nss libsecret \ " -inherit pkgconfig gsettings gobject-introspection features_check cmake gtk-doc gettext perlnative vala +inherit pkgconfig gsettings gobject-introspection features_check gtk-doc gettext perlnative vala ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" REQUIRED_DISTRO_FEATURES = "opengl" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc index 2f3bf61982..33190c461c 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ file://src/camel/camel.h;endline=24;md5=342fc5e9357254bc30c24e43ae47d9a1 \ file://src/libedataserver/e-data-server-util.h;endline=20;md5=8f21a9c80ea82a4fb80b5f959f672543" -GNOMEBASEBUILDCLASS = "autotools" +GNOMEBASEBUILDCLASS = "cmake" inherit gnomebase upstream-version-is-even SRC_URI[archive.sha256sum] = "91f4ffc38a1b8d2fe8939834449ac541c0bff4a39b444edc2a9529344a28e98a" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/files/0001-remove-pointless-check.patch b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/files/0001-remove-pointless-check.patch new file mode 100644 index 0000000000..8230bbbd16 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/files/0001-remove-pointless-check.patch @@ -0,0 +1,38 @@ +From 397751846130f79d5fbe8d617b788f3bcbb36816 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Tue, 9 Jan 2024 22:20:03 +0000 +Subject: [PATCH] meson: remove pointless gtk-doc check + +There's no point explicitly checking for gtk-doc, for two reasons: + +1) In cross-compiled environments this looks for a target gtk-doc, not a + native gtk-doc, so it should set native:true. + +2) The gnome.gtkdoc() function checks for gtk-doc itself. + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gtksourceview/-/merge_requests/351] +Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + meson.build | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/meson.build b/meson.build +index ba07da70..1109daea 100644 +--- a/meson.build ++++ b/meson.build +@@ -107,12 +107,6 @@ else + vapigen_dep = [] + endif + +-if build_gtk_doc +- gtk_doc_dep = dependency('gtk-doc', version: gtk_doc_req) +-else +- gtk_doc_dep = [] +-endif +- + # Look for the libxml2 library manually on Visual Studio if + # its pkg-config file could not be found, as the NMake + # Makefiles of libxml2 do not generate the pkg-config files +-- +2.34.1 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb index 353f02f1ba..38ca4a39e6 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb @@ -10,27 +10,15 @@ PNAME = "gtksourceview" S = "${WORKDIR}/${PNAME}-${PV}" - inherit gnomebase lib_package gettext features_check gtk-doc gobject-introspection vala ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI = "https://download.gnome.org/sources/gtksourceview/4.8/${PNAME}-${PV}.tar.xz" +SRC_URI = "https://download.gnome.org/sources/gtksourceview/4.8/${PNAME}-${PV}.tar.xz \ + file://0001-remove-pointless-check.patch" SRC_URI[sha256sum] = "7ec9d18fb283d1f84a3a3eff3b7a72b09a10c9c006597b3fbabbb5958420a87d" GIR_MESON_OPTION = 'gir' GTKDOC_MESON_OPTION = "gtk_doc" -# Override the definition in meson.bbclass. The dependencies in mason.build are incomplete -# and the recipe will not build with "-j 1". This fix is benign but should be reviewed when -# updating versions. -# -meson_do_compile() { - bbnote "========== generating gtksourceview-gresources.h ========" - bbnote "PARALLEL_MAKE is ${PARALLEL_MAKE}" - ninja ${PARALLEL_MAKE} gtksourceview/gtksourceview-gresources.h - bbnote "========== compiling target all ========" - ninja ${PARALLEL_MAKE} -} - FILES:${PN} += "${datadir}/gtksourceview-4" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.52.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.52.1.bb index 627b499fe8..7ac6c3ef21 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.52.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.52.1.bb @@ -58,7 +58,7 @@ PACKAGECONFIG[admin] = "-Dadmin=true, -Dadmin=false, libcap polkit" PACKAGECONFIG[afc] = "-Dafc=true, -Dafc=false, libimobiledevice libplist" PACKAGECONFIG[archive] = "-Darchive=true, -Darchive=false, libarchive" PACKAGECONFIG[dnssd] = "-Ddnssd=true, -Ddnssd=false, avahi" -PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr3, gnome-keyring" +PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr3" PACKAGECONFIG[gcrypt] = "-Dgcrypt=true, -Dgcrypt=false, libgcrypt" PACKAGECONFIG[goa] = "-Dgoa=true, -Dgoa=false, gnome-online-accounts" PACKAGECONFIG[google] = "-Dgoogle=true, -Dgoogle=false, libgdata" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb index 8655affdbb..d7f47002f8 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb @@ -9,7 +9,7 @@ PACKAGECONFIG ??= "startup-notification" PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" GNOMEBASEBUILDCLASS = "autotools" -inherit gnomebase gobject-introspection features_check +inherit gnomebase gobject-introspection features_check gtk-doc REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[archive.md5sum] = "f03e1139296e2a3a92e3b65a3080cd32" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb index 7955663f26..f52c210ed4 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" DEPENDS = "xkbcomp gtk+ iso-codes libxi libxml2" -inherit autotools pkgconfig gettext gobject-introspection features_check +inherit autotools pkgconfig gettext gobject-introspection features_check gtk-doc REQUIRED_DISTRO_FEATURES = "x11" |