guile-cairo for cairo 1.2.0

[steve tell]

On Thu, 31 May 2007, Andy Wingo wrote:

> Hey Steve,
>
> Thanks for testing!
>
> On Thu, 2007-05-31 at 02:19 -0400, steve tell wrote:
> > guile-cairo requires cairo >= 1.4.0, but my system (fedora core 6; still
> > rather current) only has cairo 1.2.6.
>
> Send me a patch with #ifdefs around the parts of guile-cairo that don't
> compile for you; the intention is to make guile-cairo compile with all
> cairo >= 1.0, but I only had 1.4 when I made it. I'll then roll a new
> guile-cairo release.

Attached [guile-cairo-1.3.90-cairo1.2.0.patch] is a quick patch that 
should cover cairo releases back through 1.2.0, and of course leaves 
things unchanged for cairo 1.4.0.

This builds a working guile-cairo
(at least as far as the test suite goes :-) on FC6 with cairo-1.2.6.


But I run into lots of trouble when building guile-gnome-platform with 
this.  Compiling  cairo/gnome/gw/guile-gnome-gw-cairo.c fails because this 
file includes guile-cairo.h without first including cairo.h and 
cairo-svg.h

Since I wasn't sure how to add includes to the g-wrap-generated files (and 
was hacking guile-cairo anyway) I tried the other attached patch 
[guile-cairo-1.3.90-include.patch] to have guile-cairo include cairo.h.

But then building of guile-gnome-platform-2.15.92+unofficial (recent bzr)
fails down in pango:
make[4]: Entering directory 
`/usr/src/redhat/BUILD/guile-gnome-platform-2.15.92+unofficial
/pango/gnome/gw'
guile  -c \
          "(debug-set! stack 400000) \
           (use-modules (gnome-0)) \
           (use-modules (g-wrap)) \
           (use-modules (gnome gw pango-spec)) \
           (generate-wrapset 'guile 'gnome-pango 
\"guile-gnome-gw-pango\")"
WARNING: (g-wrap util): imported module (srfi srfi-34) overrides core 
binding `raise'
WARNING: (g-wrap): imported module (srfi srfi-34) overrides core binding 
`raise'
WARNING: (g-wrap rti): imported module (srfi srfi-34) overrides core 
binding `raise'
WARNING: (g-wrap c-types): imported module (srfi srfi-34) overrides core 
binding `raise'
WARNING: (gnome gw support g-wrap): `declarations-cg' imported from both 
(g-wrap c-codegen
) and (g-wrap scm-codegen)
WARNING: (gnome gw support defs): imported module (srfi srfi-34) overrides 
core binding `raise'
WARNING: (gnome gw glib-spec): imported module (srfi srfi-34) overrides 
core binding `raise'
C Enum  |GBookmarkFileError|GBookmarkFileError       |gnome-glib
...
GObject |PangoRenderer     |<pango-renderer>         |gnome-pango
......xxx..x.......................x.xxx........x.......x..............xxx.....xxxxxxxxxxx
xxxxx.x...xx.......................xxx........x...x...x.......x.....xxx.......x.xx.x.x....
......................................xxx.....x.x...............x..................x..xxx.
....x.....
A list of opaque types and bad method names has been written to 
gnome-pango.log.

declarations-cg/gw-rti-wrapset
initializations-cg/rti-wrapset
mv guile-gnome-gw-pango.scm pango.scm
make[4]: *** No rule to make target `guile-gnome-gw-pangocairo.c', needed by 
`all'.  Stop.
make[4]: Leaving directory 
`/usr/src/redhat/BUILD/guile-gnome-platform-2.15.92+unofficial/pango/gnome/gw'
make[3]: *** [all-recursive] Error 1


Somehow, pangocairo-spec.scm had gone missing from pango/gnome/gw ?


I see what happened: I had updated from bzr, configured, and done a "make 
dist" back when I didn't have a working guile-cairo. Now that I have a 
usable guile-cairo, HAVE_CAIRO has a different value.

I'm not sure that you really want "EXTRA_DIST += pangocairo-spec.scm" 
inside the "if HAVE_CAIRO" in the Makefile.am?
Shouldn't it be possible to sync and "make dist" without having all of the 
build prerequesites installed?

Now to figure how to make bzr revert my previous hackery in my 
guile-gnome-platform workspace....

Steve

guile-cairo-1.3.90-cairo1.2.0.patch
Description: patch for cairo >= 1.2.0 support

guile-cairo-1.3.90-include.patch
Description: possible patch for include issue