summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2015-11-06 15:36:21 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-25 08:01:55 +0000
commit59498a8b4fa69a359e72225d14c554aae133571a (patch)
treecbbeef6e1d4f526ebeb3d0941006c890eaa6a02f
parent136c62b5dcb7d01278b18217d136d55d4ecee040 (diff)
downloadopenembedded-core-contrib-59498a8b4fa69a359e72225d14c554aae133571a.tar.gz
openembedded-core-contrib-59498a8b4fa69a359e72225d14c554aae133571a.tar.bz2
openembedded-core-contrib-59498a8b4fa69a359e72225d14c554aae133571a.zip
gtk+3: Upgrade 3.16.6 -> 3.18.2
* Package new development tool gtk-builder-tool. * Disable colord support (for explicitness, no functional change) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3.inc5
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3_3.18.2.bb (renamed from meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb)4
2 files changed, 6 insertions, 3 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 += " \
--enable-modules \
--disable-cups \
--disable-introspection \
+ --disable-colord \
"
PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \
@@ -79,7 +80,9 @@ FILES_${PN}-dev += " \
${libdir}/gtk-3.0/${LIBV}/engines/*.la \
${libdir}/gtk-3.0/modules/*.la \
${bindir}/gtk-builder-convert \
- ${bindir}/gtk-encode-symbolic-svg"
+ ${bindir}/gtk-encode-symbolic-svg \
+ ${bindir}/gtk-builder-tool \
+ "
FILES_${PN}-dbg += " \
${libdir}/gtk-3.0/${LIBV}/loaders/.debug \
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb b/meta/recipes-gnome/gtk+/gtk+3_3.18.2.bb
index 381e60750b..46f0cf9b0f 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.18.2.bb
@@ -8,8 +8,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar
file://Do-not-try-to-initialize-GL-without-libGL.patch \
"
-SRC_URI[md5sum] = "fc59e5c8b5a4585b60623dd708df400b"
-SRC_URI[sha256sum] = "4d12726d0856a968b41802ae5c5971d7e9bac532717e309d3f81b9989da5ffbe"
+SRC_URI[md5sum] = "230fd78e42419d35ff790784b457e5f2"
+SRC_URI[sha256sum] = "5dbec561c4a00070073bf9cf4cfdd61fab4a14c8ff5b15d700bd378f8185e152"
S = "${WORKDIR}/gtk+-${PV}"