summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2020-03-24 13:56:53 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-25 10:02:49 +0000
commit397a419e490c229f4dcb446ae9c81180aed1d0d4 (patch)
tree9bca38d3574638337e4a09fa6baeed3a313770bf
parent8c68050321cfc38b3de9c218c30e397dffafd005 (diff)
downloadpoky-397a419e490c229f4dcb446ae9c81180aed1d0d4.tar.gz
gtk+3: turn explicit disabling of colord to PACKAGECONFIG
(From OE-Core rev: 6a19a39e8415072389aa4f91317bb329b8a25d7e) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
index 12fa83550a..5d1f59ea1a 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -37,7 +37,6 @@ EXTRA_OECONF += " \
37 --disable-glibtest \ 37 --disable-glibtest \
38 --disable-xinerama \ 38 --disable-xinerama \
39 --enable-modules \ 39 --enable-modules \
40 --disable-colord \
41 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "", "--disable-gtk-doc", d)} \ 40 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "", "--disable-gtk-doc", d)} \
42 " 41 "
43 42
@@ -55,6 +54,7 @@ PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,,libgl"
55PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/egl virtual/libgles2 wayland-native" 54PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/egl virtual/libgles2 wayland-native"
56PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" 55PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups"
57PACKAGECONFIG[cloudprint] = "--enable-cloudprint,--disable-cloudprint,rest json-glib" 56PACKAGECONFIG[cloudprint] = "--enable-cloudprint,--disable-cloudprint,rest json-glib"
57PACKAGECONFIG[colord] = "--enable-colord,--disable-colord,colord"
58 58
59prepare_gtk_scripts() { 59prepare_gtk_scripts() {
60 mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0 60 mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0