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-24 23:00:02 +0000
commit6a19a39e8415072389aa4f91317bb329b8a25d7e (patch)
tree4ed5afd67bf356dbda3d94c35bb926dde77e5d79
parent29d228704acc92e5d20e5ee14399a0e07f2101f5 (diff)
downloadopenembedded-core-contrib-6a19a39e8415072389aa4f91317bb329b8a25d7e.tar.gz
openembedded-core-contrib-6a19a39e8415072389aa4f91317bb329b8a25d7e.tar.bz2
openembedded-core-contrib-6a19a39e8415072389aa4f91317bb329b8a25d7e.zip
gtk+3: turn explicit disabling of colord to PACKAGECONFIG
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 += " \
--disable-glibtest \
--disable-xinerama \
--enable-modules \
- --disable-colord \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "", "--disable-gtk-doc", d)} \
"
@@ -55,6 +54,7 @@ PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,,libgl"
PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/egl virtual/libgles2 wayland-native"
PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups"
PACKAGECONFIG[cloudprint] = "--enable-cloudprint,--disable-cloudprint,rest json-glib"
+PACKAGECONFIG[colord] = "--enable-colord,--disable-colord,colord"
prepare_gtk_scripts() {
mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0