@@ -10,28 +10,21 @@ DEPENDS = " \
gsettings-desktop-schemas \
evolution-data-server \
libsoup \
- libdazzle \
libadwaita \
libgweather4 \
geoclue \
- geocode-glib \
"
GTKIC_VERSION = '4'
inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-version-is-even mime-xdg
-REQUIRED_DISTRO_FEATURES = "x11 opengl"
+REQUIRED_DISTRO_FEATURES = "opengl"
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
SRC_URI[archive.sha256sum] = "e69a5a66be820105a4d823d4dba9b4e6ef9f6e7523978aaf33361ebbb993e604"
-do_install:prepend() {
- sed -i -e 's|${S}/src|${TARGET_DBGSRC_DIR}/src|g' ${B}/src/gcal-enum-types.h
- sed -i -e 's|${S}/src|${TARGET_DBGSRC_DIR}/src|g' ${B}/src/gcal-enum-types.c
-}
-
FILES:${PN} += " \
${datadir}/gnome-shell \
${datadir}/metainfo \
${datadir}/dbus-1 \
"
-
Remove obsolete libdazzle and geocode-glib dependencies, these have been removed upstream. Change the DISTRO_FEATURES check so that opengl is required and any of the GTK3DISTROFEATURES (x11 wayland) are present, as GTK 4 needs opengl and supports either x11 or wayland. Drop the sed on the generated enums, the generated files have relative paths in now. Signed-off-by: Ross Burton <ross.burton@arm.com> --- .../gnome-calendar/gnome-calendar_48.0.bb | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)