diff options
| author | wiz <wiz@pkgsrc.org> | 2012-10-26 21:49:23 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2012-10-26 21:49:23 +0000 |
| commit | 51cc8c34829f59ffe16ff247d007bdfa04641aed (patch) | |
| tree | edfde1151bb5f67ff5889da1c57917ef472fa2a4 /graphics | |
| parent | 8c30ea300baae888f95664107125054c2caff2ca (diff) | |
| download | pkgsrc-51cc8c34829f59ffe16ff247d007bdfa04641aed.tar.gz | |
Add another patch from upstream fixing martin's firefox problem,
tested by martin. Bump PKGREVISION.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/cairo/Makefile | 3 | ||||
| -rw-r--r-- | graphics/cairo/distinfo | 3 | ||||
| -rw-r--r-- | graphics/cairo/patches/patch-src_cairo-xlib-surface-shm.c | 17 |
3 files changed, 21 insertions, 2 deletions
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index 905a7433d68..b430cebd7b2 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.116 2012/10/23 10:11:52 wiz Exp $ +# $NetBSD: Makefile,v 1.117 2012/10/26 21:49:23 wiz Exp $ DISTNAME= cairo-1.12.6 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ EXTRACT_SUFX= .tar.xz diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo index 7dc15b8ae71..b771e17e759 100644 --- a/graphics/cairo/distinfo +++ b/graphics/cairo/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.66 2012/10/22 14:53:58 wiz Exp $ +$NetBSD: distinfo,v 1.67 2012/10/26 21:49:23 wiz Exp $ SHA1 (cairo-1.12.6.tar.xz) = a383c6cb4495e18848ea43e1031c294aa9417a43 RMD160 (cairo-1.12.6.tar.xz) = 78d3cc6200bd3f5a288843a6b360f44d7756fa2e @@ -7,3 +7,4 @@ SHA1 (patch-aa) = 474f44c1c8d4017137fe59b160afca8f16ad7287 SHA1 (patch-ab) = 62ff361d52742bba0f49c6a32149269b958fa24a SHA1 (patch-ac) = 151c682245004902cf42ba141e3743592691dfb9 SHA1 (patch-ad) = a1068a37113b162ccfe14d7f1bd0baa9df7e5530 +SHA1 (patch-src_cairo-xlib-surface-shm.c) = 76ae8b94319e7ca7c0bf7f14e53512684f386778 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..d60d25dfb50 --- /dev/null +++ b/graphics/cairo/patches/patch-src_cairo-xlib-surface-shm.c @@ -0,0 +1,17 @@ +$NetBSD: patch-src_cairo-xlib-surface-shm.c,v 1.5 2012/10/26 21:49:23 wiz Exp $ + +Recognize Xorg servers as well as X.org servers. From Chris Wilson (upstream); +fixes some more firefox issues. + +--- src/cairo-xlib-surface-shm.c.orig 2012-10-21 08:13:41.000000000 +0000 ++++ src/cairo-xlib-surface-shm.c +@@ -1141,7 +1141,8 @@ xorg_has_buggy_send_shm_completion_event + * + * Remove the SendEvent bit (0x80) before doing range checks on event type. + */ +- return (strstr (ServerVendor (dpy), "X.Org") != NULL && ++ return ((strstr (ServerVendor (dpy), "X.Org") != NULL || ++ strstr (ServerVendor (dpy), "Xorg") != NULL ) && + VendorRelease (dpy) < XORG_VERSION_ENCODE(1,11,0,1)); + } + |