summaryrefslogtreecommitdiff
path: root/gfx/cairo/xlib-initialize-members.patch
diff options
context:
space:
mode:
Diffstat (limited to 'gfx/cairo/xlib-initialize-members.patch')
-rw-r--r--gfx/cairo/xlib-initialize-members.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/gfx/cairo/xlib-initialize-members.patch b/gfx/cairo/xlib-initialize-members.patch
new file mode 100644
index 0000000000..0066ceb348
--- /dev/null
+++ b/gfx/cairo/xlib-initialize-members.patch
@@ -0,0 +1,19 @@
+diff -r 059e9961a122 gfx/cairo/cairo/src/cairo-xlib-display.c
+--- a/gfx/cairo/cairo/src/cairo-xlib-display.c Thu Feb 25 03:59:05 2010 -0800
++++ b/gfx/cairo/cairo/src/cairo-xlib-display.c Fri Feb 26 16:15:29 2010 +0100
+@@ -259,7 +259,14 @@
+ * add our hook. For now, that means Render, so we call into its
+ * QueryVersion function to ensure it gets initialized.
+ */
+- XRenderQueryVersion (dpy, &render_major, &render_minor);
++ Status s = XRenderQueryVersion (dpy, &render_major, &render_minor);
++ if (s == 0) {
++ /* XRenderQueryVersion failed, possibly because the server
++ * doesn't have the RENDER extension. Don't leave the version
++ * numbers uninitialised. See #548793.
++ */
++ render_major = render_minor = 0;
++ }
+
+ codes = XAddExtension (dpy);
+ if (unlikely (codes == NULL)) {