diff options
author | Markus Volk <f_l_k@t-online.de> | 2022-06-01 11:11:18 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-06-01 08:43:01 -0700 |
commit | abdb05b6b4b31ff40c4219336b7096db014284f1 (patch) | |
tree | 05e7df4979e8033f6ef18ebf781e4ac12f15a597 /meta-gnome | |
parent | 57c97d65fdee90e4155c66f2295b0ea8c70c9471 (diff) | |
download | meta-openembedded-contrib-abdb05b6b4b31ff40c4219336b7096db014284f1.tar.gz |
unblock some recipes for wayland
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-gnome')
14 files changed, 24 insertions, 27 deletions
diff --git a/meta-gnome/recipes-connectivity/geary/geary_40.0.bb b/meta-gnome/recipes-connectivity/geary/geary_40.0.bb index 501b27a544..4b454dc02d 100644 --- a/meta-gnome/recipes-connectivity/geary/geary_40.0.bb +++ b/meta-gnome/recipes-connectivity/geary/geary_40.0.bb @@ -41,8 +41,8 @@ SRC_URI = " \ S = "${WORKDIR}/git" SRCREV = "e561775c1580a9f60a726355b2b897bfc9cb3382" -# for gnome-online-accounts -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" GIR_MESON_OPTION = "" EXTRA_OEMESON = "-Dprofile=release" diff --git a/meta-gnome/recipes-gimp/gegl/gegl_0.4.36.bb b/meta-gnome/recipes-gimp/gegl/gegl_0.4.36.bb index a6e5fa0300..64291bee52 100644 --- a/meta-gnome/recipes-gimp/gegl/gegl_0.4.36.bb +++ b/meta-gnome/recipes-gimp/gegl/gegl_0.4.36.bb @@ -17,7 +17,7 @@ GNOMEBASEBUILDCLASS = "meson" inherit features_check gnomebase vala gobject-introspection -REQUIRED_DISTRO_FEATURES = "x11" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" SHPV = "${@gnome_verdir("${PV}")}" diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb index b4931d796d..64774b0fe8 100644 --- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb @@ -8,7 +8,7 @@ DEPENDS = " \ inherit pkgconfig gsettings gobject-introspection features_check cmake gtk-doc gettext perlnative vala -REQUIRED_DISTRO_FEATURES = "x11" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" SRC_URI += " \ file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \ diff --git a/meta-gnome/recipes-gnome/gedit/gedit_42.1.bb b/meta-gnome/recipes-gnome/gedit/gedit_42.1.bb index e2bbf1889f..3efd2a9b35 100644 --- a/meta-gnome/recipes-gnome/gedit/gedit_42.1.bb +++ b/meta-gnome/recipes-gnome/gedit/gedit_42.1.bb @@ -24,8 +24,9 @@ def gnome_verdir(v): SRC_URI[archive.sha256sum] = "7f1fd43df5110d4c37de6541993f41f0fbc3efc790900e92053479ba069920e9" # gobject-introspection is mandatory and cannot be configured -# x11 is needed for tepl and gtksourceview4 -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11" +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + GIR_MESON_OPTION = "" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_40.0.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_40.0.bb index 5aa52d1a50..b6d9a58e81 100644 --- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_40.0.bb +++ b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_40.0.bb @@ -19,7 +19,7 @@ DEPENDS = " \ inherit gnomebase gsettings features_check remove-libtool gettext -REQUIRED_DISTRO_FEATURES = "x11" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" SRC_URI[archive.sha256sum] = "a3d24db08ee2fdf240fbbf0971a98c8ee295aa0e1a774537f4ea938038a3b931" SRC_URI += " \ diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.44.0.bb b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.44.0.bb index 64aa2f4d9a..451670e64f 100644 --- a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.44.0.bb +++ b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.44.0.bb @@ -6,8 +6,7 @@ GNOMEBASEBUILDCLASS = "autotools" inherit gnomebase gsettings gobject-introspection gsettings gtk-doc vala gettext features_check -# for webkitgtk -REQUIRED_DISTRO_FEATURES = "x11" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" DEPENDS = "glib-2.0" diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_42.0.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_42.0.bb index 219a069b6a..32ecc90eb7 100644 --- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_42.0.bb +++ b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_42.0.bb @@ -17,7 +17,8 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gnome-help itstool gtk-icon-cache features_check gettext -REQUIRED_DISTRO_FEATURES = "x11 polkit" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "polkit" def gnome_verdir(v): return oe.utils.trim_version(v, 1) diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.2.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.2.bb index db4d89de22..979da792f7 100644 --- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.2.bb +++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.2.bb @@ -14,7 +14,7 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase lib_package gettext features_check gtk-doc gobject-introspection vala -REQUIRED_DISTRO_FEATURES = "x11" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" SRC_URI = "https://download.gnome.org/sources/gtksourceview/4.8/${PNAME}-${PV}.tar.xz" SRC_URI[sha256sum] = "842de7e5cb52000fd810e4be39cd9fe29ffa87477f15da85c18f7b82d45637cc" diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.0.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.0.bb index 93f7f57617..21d351a7b5 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.0.bb +++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.0.bb @@ -14,8 +14,7 @@ SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/$ SRC_URI[archive.sha256sum] = "cbc2f564d2e9f00c760673f42d6803bce3e081ab7ffb4456deffffba9339b4dd" -# depends on gsettings-desktop-schemas->gcr->gtk+3-> x11 -REQUIRED_DISTRO_FEATURES = "x11" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" EXTRA_OEMESON = " \ -Dbluray=false \ diff --git a/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb b/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb index 921c3ee805..bd9180e8a1 100644 --- a/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb +++ b/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb @@ -14,8 +14,7 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase pkgconfig gettext gtk-doc vala gobject-introspection manpages features_check -# gcr -REQUIRED_DISTRO_FEATURES = "x11" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" do_compile:prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gdata/.libs" diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb index 3ee7746c10..2e60264e04 100644 --- a/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb +++ b/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb @@ -2,11 +2,9 @@ SUMMARY = "A library for collecting system monitoring data" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -inherit gnomebase lib_package gtk-doc gobject-introspection gettext upstream-version-is-even +inherit gnomebase lib_package gtk-doc gobject-introspection gettext upstream-version-is-even features_check -# depends on libxau -inherit features_check -REQUIRED_DISTRO_FEATURES = "x11" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" SRC_URI += "file://0001-fix-compile-error-for-cross-compile.patch" diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck3_40.1.bb b/meta-gnome/recipes-gnome/libwnck/libwnck3_40.1.bb index cb4e459b3d..a6c82b2cb7 100644 --- a/meta-gnome/recipes-gnome/libwnck/libwnck3_40.1.bb +++ b/meta-gnome/recipes-gnome/libwnck/libwnck3_40.1.bb @@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" BPN = "libwnck" SECTION = "x11/libs" -DEPENDS = "intltool-native gnome-common-native gtk+3 gdk-pixbuf-native libxres" +DEPENDS = "intltool-native gnome-common-native gtk+3 gdk-pixbuf-native" -PACKAGECONFIG ??= "startup-notification" -PACKAGECONFIG[startup-notification] = "-Dstartup_notification=enabled,-Dstartup_notification=disabled,startup-notification" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG[x11] = "-Dstartup_notification=enabled,-Dstartup_notification=disabled,startup-notification libxres" GNOMEBASEBUILDCLASS = "meson" GTKDOC_MESON_OPTION = "gtk_doc" @@ -22,5 +22,6 @@ def gnome_verdir(v): SRC_URI[archive.sha256sum] = "03134fa114ef3fbe34075aa83678f58aa2debe9fcef4ea23c0779e28601d6611" -# libxres means x11 only -REQUIRED_DISTRO_FEATURES = "x11" +# gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG. +# cairo would at least needed to be built with xlib. +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" diff --git a/meta-gnome/recipes-gnome/tepl/tepl_6.00.0.bb b/meta-gnome/recipes-gnome/tepl/tepl_6.00.0.bb index 61e82e2856..66de215cfa 100644 --- a/meta-gnome/recipes-gnome/tepl/tepl_6.00.0.bb +++ b/meta-gnome/recipes-gnome/tepl/tepl_6.00.0.bb @@ -15,8 +15,7 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gettext features_check -# for gtksourceview4 -REQUIRED_DISTRO_FEATURES += "x11" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" SRC_URI[archive.sha256sum] = "a86397a895dca9c0de7a5ccb063bda8f7ef691cccb950ce2cfdee367903e7a63" diff --git a/meta-gnome/recipes-gnome/zenity/zenity_3.42.1.bb b/meta-gnome/recipes-gnome/zenity/zenity_3.42.1.bb index d48eb826f3..2bcd8cc6ba 100644 --- a/meta-gnome/recipes-gnome/zenity/zenity_3.42.1.bb +++ b/meta-gnome/recipes-gnome/zenity/zenity_3.42.1.bb @@ -12,7 +12,7 @@ DEPENDS = " \ gtk+3 \ " -REQUIRED_DISTRO_FEATURES = "x11" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" SRC_URI[archive.sha256sum] = "a08e0c8e626615ee2c23ff74628eba6f8b486875dd54371ca7e2d7605b72a87c" SRC_URI += "file://0001-Harcode-shebang-to-avoid-pointing-to-build-system-s-.patch" |