[cairo] cairo 1.12.4 and 1.12.6 fail to build on OSX 10.6.8

[Chris Wilson]

On Sat, 27 Oct 2012 13:38:50 +0200, Sebastian Haas <sehaas at gmail.com> wrote:
> Hi,
> I tried to update cairo on my OSX 10.6.8 system via homebrew but it's
> failing.
> cairo-xlib-surface-shm.c uses SHMNAME which seams to be defined in
> X11/extensions/shm.h and is imported via X11/extensions/shmproto.h
> Both files don't exist on my machine, but SHMNAME is defined in
> X11/extensions/shmstr.h
> 
> Changing the import from shmproto.h to shmstr.h worked for me, but I
> could not try on newer OSX versions.
> I filed an issue/fix for homebrew here [1] and the maintainer suggested
> to inform you.
> The output of make can be found here [2].

Thank you for your report. I've included the necessary checks in
configure to detect which version of the headers to use:

commit f18199fcfb3b052c198041fc05156ae3d9e6aee7
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Oct 28 10:04:12 2012 +0000

    xlib/shm: Check for XShm headers
    
    Not all version of libXext ship the same set of headers, so play safe
    and check during configure that we have the headers we depend upon in
    the code.
    
    Reported-by: Sebastian Haas <sehaas at gmail.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

commit 0e2458697848cf8c89c9d57fa9b64f0ea7bd0877
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Oct 28 10:08:39 2012 +0000

    xlib/shm: Use shmstr.h instead of shmproto.h if available
    
    Before it was known as shmproto.h, the wire protocol definition was to
    be found in shmstr.h, so if we don't have the current version of libXext
    try to use the older includes.
    
    Reported-by: Sebastian Haas <sehaas at gmail.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre