Thu Jul 23 17:43:41 2015 UTC ()

Apply patch (requested by mrg in ticket #885):
Bring in the upstream fix (1e362fac92c6688fb42b195ccad16d7a337a34c1)
that was attempted locally in revision 1.2: Ensure we allocate at least
XkbNumRequiredTypes in map.


(snj)

diff -r1.2 -r1.2.2.1 xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c

--- xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c 2014/07/13 16:37:45	1.2

+++ xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c 2015/07/23 17:43:41	1.2.2.1

@@ -302,7 +302,7 @@
             }
         }
     }
-    if ((!map) || (!map->types) || !(map->num_types < XkbNumRequiredTypes)) {
+    if ((!map) || (!map->types) || (map->num_types < XkbNumRequiredTypes)) {
         tmp = XkbNumRequiredTypes + 1;
         if (XkbAllocClientMap(xkb, XkbKeyTypesMask, tmp) != Success)
             return NULL;