diff options
Diffstat (limited to 'graphics/cairo/patches/patch-src_cairo-xlib-surface-shm.c')
| -rw-r--r-- | graphics/cairo/patches/patch-src_cairo-xlib-surface-shm.c | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/graphics/cairo/patches/patch-src_cairo-xlib-surface-shm.c b/graphics/cairo/patches/patch-src_cairo-xlib-surface-shm.c new file mode 100644 index 00000000000..c05a9f86829 --- /dev/null +++ b/graphics/cairo/patches/patch-src_cairo-xlib-surface-shm.c @@ -0,0 +1,44 @@ +$NetBSD: patch-src_cairo-xlib-surface-shm.c,v 1.1 2012/10/08 12:29:08 tron Exp $ + +Prevent application crashes under old version of X.org e.g. under +Mac OS X Lion. Patch taken from here: + +http://cgit.freedesktop.org/cairo/commit/?id=b1532f465e05d566f6d160c5ca916a5a12614067 + +--- src/cairo-xlib-surface-shm.c.orig 2012-10-05 14:06:00.000000000 +0100 ++++ src/cairo-xlib-surface-shm.c 2012-10-08 13:10:35.000000000 +0100 +@@ -1121,6 +1121,24 @@ + return shm->idle > 0; + } + ++#define XORG_VERSION_ENCODE(major,minor,patch,snap) \ ++ (((major) * 10000000) + ((minor) * 100000) + ((patch) * 1000) + snap) ++ ++static cairo_bool_t ++xorg_has_buggy_send_event(Display *dpy) ++{ ++ /* Avoid incurring the wrath fixed by: ++ * ++ * commit 2d2dce558d24eeea0eb011ec9ebaa6c5c2273c39 ++ * Author: Sam Spilsbury <sam.spilsbury@canonical.com> ++ * Date: Wed Sep 14 09:58:34 2011 +0800 ++ * ++ * Remove the SendEvent bit (0x80) before doing range checks on event type. ++ */ ++ return (strstr (ServerVendor (dpy), "X.Org") != NULL && ++ VendorRelease (dpy) < XORG_VERSION_ENCODE(1,11,0,1)); ++} ++ + void + _cairo_xlib_display_init_shm (cairo_xlib_display_t *display) + { +@@ -1153,6 +1171,9 @@ + DefaultVisual (display->display, scr), + CWOverrideRedirect, &attr); + ++ if (xorg_has_buggy_send_event(display->display)) ++ has_pixmap = 0; ++ + shm->has_pixmaps = has_pixmap ? MIN_PIXMAP_SIZE : 0; + cairo_list_init (&shm->pool); + |