diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/cairo/Makefile | 6 | ||||
| -rw-r--r-- | graphics/cairo/distinfo | 9 | ||||
| -rw-r--r-- | graphics/cairo/patches/patch-src_cairo-xlib-surface-shm.c | 44 |
3 files changed, 7 insertions, 52 deletions
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index ee83d163900..0e1fef6727a 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.110 2012/10/08 12:29:08 tron Exp $ +# $NetBSD: Makefile,v 1.111 2012/10/08 21:54:05 wiz Exp $ -DISTNAME= cairo-1.12.4 -PKGREVISION= 1 +DISTNAME= cairo-1.12.2 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ EXTRACT_SUFX= .tar.xz diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo index 6da17055d36..f11851f89de 100644 --- a/graphics/cairo/distinfo +++ b/graphics/cairo/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.63 2012/10/08 12:29:08 tron Exp $ +$NetBSD: distinfo,v 1.64 2012/10/08 21:54:05 wiz Exp $ -SHA1 (cairo-1.12.4.tar.xz) = f4158981ed01e73c94fb8072074b17feee61a68b -RMD160 (cairo-1.12.4.tar.xz) = 0e2ab9442f47228b7df2354caf157f2a4eeafb31 -Size (cairo-1.12.4.tar.xz) = 42099760 bytes +SHA1 (cairo-1.12.2.tar.xz) = bc2ee50690575f16dab33af42a2e6cdc6451e3f9 +RMD160 (cairo-1.12.2.tar.xz) = 0174a5110f5f4c9ff15da984e0602dfd04643a63 +Size (cairo-1.12.2.tar.xz) = 42051584 bytes SHA1 (patch-aa) = 474f44c1c8d4017137fe59b160afca8f16ad7287 SHA1 (patch-ab) = 62ff361d52742bba0f49c6a32149269b958fa24a SHA1 (patch-ac) = 151c682245004902cf42ba141e3743592691dfb9 SHA1 (patch-ad) = a1068a37113b162ccfe14d7f1bd0baa9df7e5530 -SHA1 (patch-src_cairo-xlib-surface-shm.c) = bf7a24143f1788c21f8362a4a703ef4b5239eb65 diff --git a/graphics/cairo/patches/patch-src_cairo-xlib-surface-shm.c b/graphics/cairo/patches/patch-src_cairo-xlib-surface-shm.c deleted file mode 100644 index c05a9f86829..00000000000 --- a/graphics/cairo/patches/patch-src_cairo-xlib-surface-shm.c +++ /dev/null @@ -1,44 +0,0 @@ -$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); - |