[cairo-commit] cairo ChangeLog, 1.312, 1.313 cairo.pc.in, 1.18, 1.19 configure.in, 1.71, 1.72

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo
In directory gabe:/tmp/cvs-serv17422

Modified Files:
	ChangeLog cairo.pc.in configure.in 
Log Message:

        * src/cairoint.h: Track various renamings.

        * src/cairo_xlib_surface.c:
        * src/cairo_ps_surface.c:
        * src/cairo_png_surface.c:
        * src/cairo_pdf_surface.c:
        * src/cairo_glitz_surface.c:
        * src/cairo_ft_font.c: Insert new includes for backend-specific
        header files.

        * src/cairo_gdip_surface.cpp:
        * src/cairo_gdip_font.cpp: Remove redundant include of
        cairo-features.h.

        * src/cairo.h (CAIRO_H): Rename header-exclusion macro from
        _CAIRO_H_ to CAIRO_H.
        Remove platform-specific grubbing for cairo-features.h and
        pixman.h in odd places.

        Remove all backend-specific prototypes, (as they are now in their
        own header files).

        Remove deprecated

        * src/cairo.c (cairo_sane_state): Remove printf.

        * src/cairo-features.h.in: Convert to utf-8. Use the proper name
        for multiple-header exclusion (CAIRO_FEATURES_H). Track rename of
        FREETYPE_FONT_FEATURE to FT_FONT_FEATURE.

        * src/Makefile.am (cairoinclude_HEADERS): Split cairo.h up into
        cairo.h, cairo-ft.h, cairo-glitz.h, cairo-pdf.h, cairo-png.h,
        cairo-ps.h, cairo-xcb.h, cairo-xlib.h.
        Update for rename of cairo_wideint.h to cairo-wideint.h.

        * configure.in: Rename CAIRO_HAS_FREETYPE_FONT to
        CAIRO_HAS_FT_FONT, (to match cairo_ft_font functions and
        cairo-ft.h).

        * cairo.pc.in (Cflags): Update for public header files now in
        /cairo.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -d -r1.312 -r1.313
--- ChangeLog	19 Jan 2005 20:12:42 -0000	1.312
+++ ChangeLog	20 Jan 2005 16:28:54 -0000	1.313
@@ -1,3 +1,47 @@
+2005-01-20  Carl Worth  <cworth at cworth.org>
+
+	* src/cairoint.h: Track various renamings.
+
+	* src/cairo_xlib_surface.c: 
+	* src/cairo_ps_surface.c: 
+	* src/cairo_png_surface.c: 
+	* src/cairo_pdf_surface.c: 
+	* src/cairo_glitz_surface.c: 
+	* src/cairo_ft_font.c: Insert new includes for backend-specific
+	header files.
+
+	* src/cairo_gdip_surface.cpp: 
+	* src/cairo_gdip_font.cpp: Remove redundant include of
+	cairo-features.h.
+
+	* src/cairo.h (CAIRO_H): Rename header-exclusion macro from
+	_CAIRO_H_ to CAIRO_H.
+	Remove platform-specific grubbing for cairo-features.h and
+	pixman.h in odd places.
+
+	Remove all backend-specific prototypes, (as they are now in their
+	own header files).
+
+	Remove deprecated
+
+	* src/cairo.c (cairo_sane_state): Remove printf.
+
+	* src/cairo-features.h.in: Convert to utf-8. Use the proper name
+	for multiple-header exclusion (CAIRO_FEATURES_H). Track rename of
+	FREETYPE_FONT_FEATURE to FT_FONT_FEATURE.
+
+	* src/Makefile.am (cairoinclude_HEADERS): Split cairo.h up into
+	cairo.h, cairo-ft.h, cairo-glitz.h, cairo-pdf.h, cairo-png.h,
+	cairo-ps.h, cairo-xcb.h, cairo-xlib.h.
+	Update for rename of cairo_wideint.h to cairo-wideint.h.
+
+	* configure.in: Rename CAIRO_HAS_FREETYPE_FONT to
+	CAIRO_HAS_FT_FONT, (to match cairo_ft_font functions and
+	cairo-ft.h).
+
+	* cairo.pc.in (Cflags): Update for public header files now in
+	${includedir}/cairo.
+
 2005-01-19  Carl Worth  <cworth at cworth.org>
 
 	* src/cairo_matrix.c (cairo_matrix_get_affine): 
@@ -80,7 +124,6 @@
 	* src/cairo_gstate.c: (_cairo_gstate_glyph_extents):
 	Was using the wrong extents variable.
 
->>>>>>> 1.305
 2005-01-13  David Reveman  <c99drn at cs.umu.se>
 
 	* src/cairo_xcb_surface.c: Replace struct cairo_surface_backend with

Index: cairo.pc.in
===================================================================
RCS file: /cvs/cairo/cairo/cairo.pc.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- cairo.pc.in	12 Jan 2005 22:40:14 -0000	1.18
+++ cairo.pc.in	20 Jan 2005 16:28:54 -0000	1.19
@@ -9,5 +9,4 @@
 
 Requires: fontconfig libpixman @XRENDER_REQUIRES@ @PNG_REQUIRES@ @GLITZ_REQUIRES@
 Libs: @FREETYPE_LIBS@ -L${libdir} -lcairo 
-Cflags: @FREETYPE_CFLAGS@ -I${includedir}
-
+Cflags: @FREETYPE_CFLAGS@ -I${includedir}/cairo

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- configure.in	17 Jan 2005 17:40:00 -0000	1.71
+++ configure.in	20 Jan 2005 16:28:54 -0000	1.72
@@ -273,13 +273,13 @@
 CAIRO_LIBS="$CAIRO_LIBS $FREETYPE_LIBS"
 
 if test "x$use_freetype" != "xyes"; then
-  FREETYPE_FONT_FEATURE=CAIRO_HAS_NO_FREETYPE_FONT
-  AM_CONDITIONAL(CAIRO_HAS_FREETYPE_FONT, false)  
+  FT_FONT_FEATURE=CAIRO_HAS_NO_FT_FONT
+  AM_CONDITIONAL(CAIRO_HAS_FT_FONT, false)  
 else
-  FREETYPE_FONT_FEATURE=CAIRO_HAS_FREETYPE_FONT
-  AM_CONDITIONAL(CAIRO_HAS_FREETYPE_FONT, true)
+  FT_FONT_FEATURE=CAIRO_HAS_FT_FONT
+  AM_CONDITIONAL(CAIRO_HAS_FT_FONT, true)
 fi
-AC_SUBST(FREETYPE_FONT_FEATURE)
+AC_SUBST(FT_FONT_FEATURE)
 
 dnl ===========================================================================