[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1434/8267] libmatchbox: Upgrade 1.11 -> 1.12

[Emmanuele Bassi <ebassi src gnome org>]

commit 49d3d7da29a201b393196663d44f265f5a64ed8d
Author: Jussi Kukkonen <jussi kukkonen intel com>
Date:   Fri Jul 15 15:20:04 2016 +0300

    libmatchbox: Upgrade 1.11 -> 1.12
    
    libmatchbox now has a in-tree xsettings-client.
    
    * Use git SRC_URI like the other matchbox components.
    * Remove upstreamed patch.
    * Update license info (xsettings code is MIT).
    * Stop depending on libxsettings-client
    
    (From OE-Core rev: f28b0359c9e993233d5985e27152dc5cb4fbfd13)
    
    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>

 .../libmatchbox/libmatchbox/libpng.patch           |   69 --------------------
 .../{libmatchbox_1.11.bb => libmatchbox_1.12.bb}   |   16 ++--
 2 files changed, 8 insertions(+), 77 deletions(-)
---
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb 
b/meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb
similarity index 57%
rename from meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
rename to meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb
index f2eb675..ce45e48 100644
--- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
+++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb
@@ -3,26 +3,26 @@ SECTION = "x11/libs"
 HOMEPAGE = "http://matchbox-project.org/";
 BUGTRACKER = "http://bugzilla.yoctoproject.com/";
 
-LICENSE = "LGPLv2+"
+LICENSE = "LGPLv2+ & MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
+                    file://COPYING.MIT;md5=f45ed9332b4f50a35adf2065adde4ca7 \
                     file://libmb/mbexp.c;endline=20;md5=28c0aef3b23e308464f5dae6a11b0d2f \
-                    file://libmb/mbdotdesktop.c;endline=21;md5=5a287156b3207e851c1d68d09c439b51"
+                    file://libmb/xsettings-client.c;endline=20;md5=4b106a387602db8d91a50d5cdfd65031"
 
 DEPENDS = "virtual/libx11 libxext"
 
-SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.bz2 \
-           file://libpng.patch"
+#SRCREV for 1.12
+SRCREV = "e846ee434f8e23d9db38af13c523f791495e0e87"
+SRC_URI = "git://git.yoctoproject.org/${BPN}"
 
-SRC_URI[md5sum] = "fc6cc807f55a3e7c752d8013176875d7"
-SRC_URI[sha256sum] = "254cab52e304a3512c8df4be59d690cf3921bbb68a28ede7fe26b93534217b53"
+S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig distro_features_check
 # depends on virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
-PACKAGECONFIG ??= "jpeg png xft xsettings"
+PACKAGECONFIG ??= "jpeg png xft"
 PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg"
 PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango"
 PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng"
 PACKAGECONFIG[xft] = "--enable-xft,--disable-xft,libxft"
-PACKAGECONFIG[xsettings] = "--enable-xsettings,--disable-xsettings,libxsettings-client"