michael@0: diff -r 059e9961a122 gfx/cairo/cairo/src/cairo-xlib-display.c michael@0: --- a/gfx/cairo/cairo/src/cairo-xlib-display.c Thu Feb 25 03:59:05 2010 -0800 michael@0: +++ b/gfx/cairo/cairo/src/cairo-xlib-display.c Fri Feb 26 16:15:29 2010 +0100 michael@0: @@ -259,7 +259,14 @@ michael@0: * add our hook. For now, that means Render, so we call into its michael@0: * QueryVersion function to ensure it gets initialized. michael@0: */ michael@0: - XRenderQueryVersion (dpy, &render_major, &render_minor); michael@0: + Status s = XRenderQueryVersion (dpy, &render_major, &render_minor); michael@0: + if (s == 0) { michael@0: + /* XRenderQueryVersion failed, possibly because the server michael@0: + * doesn't have the RENDER extension. Don't leave the version michael@0: + * numbers uninitialised. See #548793. michael@0: + */ michael@0: + render_major = render_minor = 0; michael@0: + } michael@0: michael@0: codes = XAddExtension (dpy); michael@0: if (unlikely (codes == NULL)) {