Re: pkg/47113: firefox broken

[Martin Husemann <martin%duskware.de@localhost>]

The following reply was made to PR pkg/47113; it has been noted by GNATS.

From: Martin Husemann <martin%duskware.de@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/47113: firefox broken
Date: Thu, 25 Oct 2012 21:46:33 +0200

 --lEGEL1/lMxI0MVQ2
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 On Thu, Oct 25, 2012 at 07:45:03PM +0000, David Holland wrote:
 >  Does the patch in PR 47124 fix it?
 
 Haven't tried that, but this one does
 
 Martin
 
 --lEGEL1/lMxI0MVQ2
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename=patch
 
 --- src/cairo-xlib-surface-shm.c.orig  2012-10-21 10:13:41.000000000 +0200
 +++ src/cairo-xlib-surface-shm.c       2012-10-25 21:11:57.000000000 +0200
 @@ -1021,6 +1021,7 @@ _cairo_xlib_shm_surface_mark_active (cai
      cairo_xlib_display_t *display = (cairo_xlib_display_t *) _shm->device;
      XShmCompletionEvent ev;
  
 +    bzero(&ev, sizeof(ev));
      ev.type = display->shm->event;
      ev.drawable = display->shm->window;
      ev.major_code = display->shm->opcode;
 @@ -1141,7 +1142,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));
  }
  
 
 --lEGEL1/lMxI0MVQ2--