diff options
Diffstat (limited to 'meta/recipes-gnome/gtk+')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+.inc | 2 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3.inc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc index 73d624c3d8..dd1fa1b3f8 100644 --- a/meta/recipes-gnome/gtk+/gtk+.inc +++ b/meta/recipes-gnome/gtk+/gtk+.inc | |||
@@ -14,7 +14,7 @@ X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender | |||
14 | DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \ | 14 | DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \ |
15 | cairo gdk-pixbuf" | 15 | cairo gdk-pixbuf" |
16 | 16 | ||
17 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 17 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" |
18 | 18 | ||
19 | PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}" | 19 | PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}" |
20 | 20 | ||
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index e769ca58bc..9e96275554 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc | |||
@@ -33,8 +33,8 @@ EXTRA_OECONF += " \ | |||
33 | --disable-introspection \ | 33 | --disable-introspection \ |
34 | " | 34 | " |
35 | 35 | ||
36 | PACKAGECONFIG ??= "${@base_contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ | 36 | PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ |
37 | ${@base_contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}" | 37 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}" |
38 | 38 | ||
39 | PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes" | 39 | PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes" |
40 | PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland libxkbcommon" | 40 | PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland libxkbcommon" |