[pkgsrc/trunk]: pkgsrc/graphics/cairo Add another patch from upstream fixing ...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/df3ec9741499
branches:  trunk
changeset: 610496:df3ec9741499
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Oct 26 21:49:23 2012 +0000

description:
Add another patch from upstream fixing martin's firefox problem,
tested by martin. Bump PKGREVISION.

diffstat:

 graphics/cairo/Makefile                                   |   3 +-
 graphics/cairo/distinfo                                   |   3 +-
 graphics/cairo/patches/patch-src_cairo-xlib-surface-shm.c |  17 +++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diffs (47 lines):

diff -r 31c89bd55f56 -r df3ec9741499 graphics/cairo/Makefile
--- a/graphics/cairo/Makefile   Fri Oct 26 20:41:45 2012 +0000
+++ b/graphics/cairo/Makefile   Fri Oct 26 21:49:23 2012 +0000
@@ -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 -r 31c89bd55f56 -r df3ec9741499 graphics/cairo/distinfo
--- a/graphics/cairo/distinfo   Fri Oct 26 20:41:45 2012 +0000
+++ b/graphics/cairo/distinfo   Fri Oct 26 21:49:23 2012 +0000
@@ -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-ab) = 62ff361d52742bba0f49c6a32149269b958fa24a
 SHA1 (patch-ac) = 151c682245004902cf42ba141e3743592691dfb9
 SHA1 (patch-ad) = a1068a37113b162ccfe14d7f1bd0baa9df7e5530
+SHA1 (patch-src_cairo-xlib-surface-shm.c) = 76ae8b94319e7ca7c0bf7f14e53512684f386778
diff -r 31c89bd55f56 -r df3ec9741499 graphics/cairo/patches/patch-src_cairo-xlib-surface-shm.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/cairo/patches/patch-src_cairo-xlib-surface-shm.c Fri Oct 26 21:49:23 2012 +0000
@@ -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));
+ }
+