matchbox-wm: fix icon handling on 64-bit hosts

Xlib has a historical quirk where 32-bit values are returned in longs (but
always hidden through a cast).  On 32-bit machines this doesn't matter but on
64-bit this leads to problems.  Bump SRCREV to integrate a fix from upstream.

Also, drop the conditional configure_fix.patch, it was integrated long ago.

[ YOCTO #4917 ]

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
index c6afd96790fdd453f8229edfb057d48c8143dbe4..015fbc08b8a4aac078577681c06d3e5242f70b21 100644 (file)
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
@@ -10,12 +10,11 @@ LIC_FILES_CHKSUM = "file://src/wm.h;endline=21;md5=a7e844465edbcf79c282369f93caa
 SECTION = "x11/wm"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf"
 
-SRCREV = "686178379e5ad00453d9f6f50b53777372a29e68"
+SRCREV = "29544f0e61cc281fc60061443a537271e1081b78"
 PV = "1.2+git${SRCPV}"
 PR = "r0"
 
 SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;protocol=git \
-           file://configure_fix.patch;maxrev=1818 \
            file://kbdconfig"
 
 S = "${WORKDIR}/git"