[cairo-commit] 2 commits - src/cairo-quartz-font.c util/cairo-missing

[Andrea Canciani]

 src/cairo-quartz-font.c        |    1 -
 util/cairo-missing/Makefile.am |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 74e7f3b441e02cdb003ec235eb6ec4c86e412357
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Sun Sep 18 09:09:50 2011 -0700

    quartz-font: Fix scaled font backend hooks
    
    In af9fbd176b145f042408ef5391eef2a51d7531f8 the show_glyphs hook has
    been removed from cairo_scaled_backend_t, but quartz-font was not
    updated.
    
    Fixes:
    
    cairo-quartz-font.c:798: warning: initialization from incompatible pointer type

diff --git a/src/cairo-quartz-font.c b/src/cairo-quartz-font.c
index 9e2298a..8b34ed8 100644
--- a/src/cairo-quartz-font.c
+++ b/src/cairo-quartz-font.c
@@ -789,7 +789,6 @@ static const cairo_scaled_font_backend_t _cairo_quartz_scaled_font_backend = {
     _cairo_quartz_scaled_glyph_init,
     NULL, /* text_to_glyphs */
     _cairo_quartz_ucs4_to_index,
-    NULL, /* show_glyphs */
     _cairo_quartz_load_truetype_table,
     NULL, /* map_glyphs_to_unicode */
 };
commit f8e4657d8a45cdb35c9ccdcba1d002e8a3aac5bb
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Sun Sep 18 08:54:00 2011 -0700

    Make cairo-missing a static library
    
    It was meant to be static, but my autotools-fu was not good enough.

diff --git a/util/cairo-missing/Makefile.am b/util/cairo-missing/Makefile.am
index c8d6ccd..9078610 100644
--- a/util/cairo-missing/Makefile.am
+++ b/util/cairo-missing/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/util/cairo-missing/Makefile.sources
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src
 
-lib_LTLIBRARIES = libcairo-missing.la
+noinst_LTLIBRARIES = libcairo-missing.la
 
 libcairo_missing_la_SOURCES = \
 	$(libcairo_missing_sources)	\