[Libreoffice] [RFC] cairo-less build, misc build patches

[Riccardo Magliocchetti]

Hello,

i'm poking again with X11 / cairo / whatever less build and i've found 
that cairo is required even if cairo canvas is disabled. I can expect it 
will break the case without cairo cainvas but with librsvg, should i 
prevent the case?

With this patch the build is failing with missing X11 headers and then 
with this that looks like a missing -Ifreetype2/ somewhere:

In file included from /home/rm/src/libo/vcl/inc/generic/glyphcache.hxx:64:0,
                  from 
/home/rm/src/libo/vcl/generic/print/genpspgraphics.cxx:42:
/usr/include/ft2build.h:56:38: fatal error: freetype/config/ftheader.h: 
No such file or directory

Any hint?

Also while analyzing some build failures :) it looks to me that 
tools/inc/tools/prex.h should close the extern C block. Patch attached.

Finally vcl/unx/generic/printer/cupsmgr.cxx probably want also to be 
enclosed in HAVE_CUPS_H. Patch attached too.

Please note that I'm diffing against an old master because of 
anongit.fd.o problems.

Statement about license of my contributions here [1]

Please review :)

[1] 
http://lists.freedesktop.org/archives/libreoffice/2012-February/025156.html

-- 
Riccardo Magliocchetti
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dont-poke-with-cairo-without-canvas.diff
Type: text/x-diff
Size: 632 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20120202/9c327d9d/attachment-0003.diff>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: close-extern-c.diff
Type: text/x-diff
Size: 330 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20120202/9c327d9d/attachment-0004.diff>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dont-try-to-build-cupsmgr-if-nocups_h.diff
Type: text/x-diff
Size: 544 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20120202/9c327d9d/attachment-0005.diff>