[cairo] link failure with cairo head

[Bertram Felgenhauer]

Hi,

I get link failures with the latest cairo head, like this:

# (cd test; make test TARGETS=image)
[...]
gcc -I/opt/cairo/include/cairo -I/opt/cairo/include/pixman-1 -I/usr/include/librsvg-2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/opt/cairo/include -o .libs/svg2png svg2png-svg2png.o  -L/opt/cairo/lib ./.libs/libcairotest.a /usr/src/cairo/cairo/src/.libs/libcairo.so -lpthread /usr/lib/librsvg-2.so /usr/lib/libgsf-1.so -lbz2 /usr/lib/libcroco-0.6.so /usr/lib/libxml2.so /usr/lib/libgdk-x11-2.0.so /usr/lib/libgdk_pixbuf-2.0.so /usr/lib/libpangocairo-1.0.so /usr/lib/libcairo.so /usr/lib/libpangoft2-1.0.so /usr/lib/libpango-1.0.so /opt/cairo/lib/libcairo.so /usr/lib/libfontconfig.so /usr/lib/libfreetype.so /usr/lib/libexpat.so /usr/lib/libpng12.so -lz /usr/lib/libXrender.so /usr/lib/libX11.so /usr/lib/libXau.so /usr/lib/libXdmcp.so /opt/cairo/lib/libpixman-1.so /usr/lib/libgobject-2.0.so /usr/lib/libgmodule-2.0.so -ldl /usr/lib/libglib-2.0.so -lm  -Wl,--rpath -Wl,/opt/cairo/lib
/usr/src/cairo/cairo/src/.libs/libcairo.so: undefined reference to `_cairo_truetype_subset_init'
/usr/src/cairo/cairo/src/.libs/libcairo.so: undefined reference to `_cairo_type1_fallback_init_binary'
/usr/src/cairo/cairo/src/.libs/libcairo.so: undefined reference to `_cairo_truetype_create_glyph_to_unicode_map'
[...]
/usr/src/cairo/cairo/src/.libs/libcairo.so: undefined reference to `_cairo_scaled_font_subsets_create_simple'
collect2: ld returned 1 exit status
make[3]: *** [svg2png] Error 1

git-bisect points at b28f4f57f21ac4091c9457873abe1465ec3f7fed --
[src/Makefile.am] Reorganize.

I believe there's a

    cairo_sources += $(font_subset_sources)

missing in src/Makefile.am (patch attached) -- Behdad, is this correct?

Bertram
-------------- next part --------------