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-xfce | |
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-xfce')
7 files changed, 31 insertions, 14 deletions
diff --git a/meta-xfce/classes/thunar-plugin.bbclass b/meta-xfce/classes/thunar-plugin.bbclass index 423f337bef..3719cba219 100644 --- a/meta-xfce/classes/thunar-plugin.bbclass +++ b/meta-xfce/classes/thunar-plugin.bbclass @@ -1,6 +1,8 @@ inherit xfce features_check -REQUIRED_DISTRO_FEATURES = "x11" +# xfce4 depends on libwnck3, 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}" DEPENDS += "thunar" diff --git a/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.1.bb b/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.1.bb index 6ed9cecefb..fb7589637d 100644 --- a/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.1.bb +++ b/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.1.bb @@ -3,8 +3,9 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" inherit thunar-plugin features_check -# x11 is needed for thunar -REQUIRED_DISTRO_FEATURES = "pam x11" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "pam" SRC_URI[md5sum] = "0884855d60cf1031b9013b6f5b125372" SRC_URI[sha256sum] = "dc1d8c7caa727e76d033d4653dc0742613f57a1711d0050900659c90a84452a0" diff --git a/meta-xfce/recipes-xfce/exo/exo_4.16.3.bb b/meta-xfce/recipes-xfce/exo/exo_4.16.3.bb index 2b164442f8..32735bc6ec 100644 --- a/meta-xfce/recipes-xfce/exo/exo_4.16.3.bb +++ b/meta-xfce/recipes-xfce/exo/exo_4.16.3.bb @@ -2,11 +2,13 @@ DESCRIPTION = "Application library for the Xfce desktop environment" SECTION = "x11" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "gtk+3 libxfce4ui virtual/libx11 liburi-perl-native cairo" +DEPENDS = "gtk+3 libxfce4ui liburi-perl-native cairo" inherit xfce perlnative gtk-doc features_check mime-xdg -REQUIRED_DISTRO_FEATURES = "x11" +# xfce4 depends on libwnck3, 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}" # SRC_URI must follow inherited one SRC_URI += " \ diff --git a/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb b/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb index a6c56edf3b..14f0c4a64d 100644 --- a/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb +++ b/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb @@ -6,7 +6,9 @@ DEPENDS = "xfce4-dev-tools-native libxfce4ui intltool-native" inherit xfce gtk-doc gobject-introspection features_check -REQUIRED_DISTRO_FEATURES = "x11" +# xfce4 depends on libwnck3, 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}" SRC_URI += "file://0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch" SRC_URI[sha256sum] = "84914927a2c1fda167f67af26a6640630a744a22940df508aa6c752cdbd3d21d" diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb index e3d2a00eea..bb45ee6f43 100644 --- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb +++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb @@ -2,11 +2,13 @@ SUMMARY = "Xfce4 Widget library and X Window System interaction" SECTION = "x11/libs" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" -DEPENDS = "intltool-native perl-native gtk+3 libice libsm libxfce4util xfce4-dev-tools xfconf virtual/libx11" +DEPENDS = "intltool-native perl-native gtk+3 libxfce4util xfce4-dev-tools xfconf" inherit xfce gtk-doc gobject-introspection features_check -REQUIRED_DISTRO_FEATURES = "x11" +# xfce4 depends on libwnck3. 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}" # TODO: Check if 0001-... can go SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch" @@ -15,9 +17,12 @@ SRC_URI[sha256sum] = "d96946ae5af6bf078dda415419e0021909f763ee0020b42f3e26f603e5 EXTRA_OECONF += "--with-vendor-info=${DISTRO}" EXTRA_OECONF += "--disable-vala" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ +" PACKAGECONFIG[gladeui2] = "--enable-gladeui2,--disable-gladeui2,glade" -PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" +PACKAGECONFIG[x11] = "--enable-startup-notification,--disable-startup-notification,libepoxy libice libsm startup-notification" + PACKAGES += "${PN}-glade" FILES:${PN}-glade = " \ diff --git a/meta-xfce/recipes-xfce/thunar/thunar_4.16.9.bb b/meta-xfce/recipes-xfce/thunar/thunar_4.16.9.bb index 93c41aedfe..d3702c83c3 100644 --- a/meta-xfce/recipes-xfce/thunar/thunar_4.16.9.bb +++ b/meta-xfce/recipes-xfce/thunar/thunar_4.16.9.bb @@ -2,16 +2,19 @@ SUMMARY = "File manager for the Xfce Desktop Environment" SECTION = "x11" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "libxml-parser-perl-native exo gdk-pixbuf libxfce4ui libsm startup-notification libnotify xfce4-panel udev" +DEPENDS = "libxml-parser-perl-native exo gdk-pixbuf libxfce4ui libnotify xfce4-panel udev" inherit xfce gobject-introspection features_check mime-xdg perlnative -REQUIRED_DISTRO_FEATURES = "x11" +# xfce4 depends on libwnck3, 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}" SRC_URI[sha256sum] = "520bf318eef8bc792db38ae4af343b648f87d4b8d66f5b5d6f092e15264ee5af" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre" +PACKAGECONFIG[x11] = ",,libsm startup-notification" FILES:${PN} += " \ ${libdir}/thunarx-3/* \ diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb index b9201bc655..d47f9cefc9 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb +++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb @@ -6,7 +6,9 @@ DEPENDS = "garcon exo gtk+3 cairo virtual/libx11 libxml2 libwnck3 vala-native" inherit xfce gtk-doc gobject-introspection features_check remove-libtool mime-xdg -REQUIRED_DISTRO_FEATURES = "x11" +# xfce4 depends on libwnck3, 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}" SRC_URI[sha256sum] = "5934eaed8a76da52c29b734ccd79600255420333dd6ebd8fd9f066379af1e092" SRC_URI += " \ |