diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-11-06 15:36:21 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-25 08:08:13 +0000 |
commit | 060b482409ee59592bfce0c6990120e1ca299bac (patch) | |
tree | 611a071b18cb4bac5f7d95fa22b0a1abeeb1501f /meta/recipes-gnome/gtk+/gtk+3.inc | |
parent | 4f3d2b3afd5233931e9c52895841263cacfc388a (diff) | |
download | poky-060b482409ee59592bfce0c6990120e1ca299bac.tar.gz |
gtk+3: Upgrade 3.16.6 -> 3.18.2
* Package new development tool gtk-builder-tool.
* Disable colord support (for explicitness, no functional change)
(From OE-Core rev: 59498a8b4fa69a359e72225d14c554aae133571a)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+3.inc')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index e0c4ccb11b..cb091f4cc3 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc | |||
@@ -29,6 +29,7 @@ EXTRA_OECONF += " \ | |||
29 | --enable-modules \ | 29 | --enable-modules \ |
30 | --disable-cups \ | 30 | --disable-cups \ |
31 | --disable-introspection \ | 31 | --disable-introspection \ |
32 | --disable-colord \ | ||
32 | " | 33 | " |
33 | 34 | ||
34 | PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ | 35 | PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ |
@@ -79,7 +80,9 @@ FILES_${PN}-dev += " \ | |||
79 | ${libdir}/gtk-3.0/${LIBV}/engines/*.la \ | 80 | ${libdir}/gtk-3.0/${LIBV}/engines/*.la \ |
80 | ${libdir}/gtk-3.0/modules/*.la \ | 81 | ${libdir}/gtk-3.0/modules/*.la \ |
81 | ${bindir}/gtk-builder-convert \ | 82 | ${bindir}/gtk-builder-convert \ |
82 | ${bindir}/gtk-encode-symbolic-svg" | 83 | ${bindir}/gtk-encode-symbolic-svg \ |
84 | ${bindir}/gtk-builder-tool \ | ||
85 | " | ||
83 | 86 | ||
84 | FILES_${PN}-dbg += " \ | 87 | FILES_${PN}-dbg += " \ |
85 | ${libdir}/gtk-3.0/${LIBV}/loaders/.debug \ | 88 | ${libdir}/gtk-3.0/${LIBV}/loaders/.debug \ |