[cairo-commit] cairo ChangeLog,1.126,1.127 cairo.pc.in,1.8,1.9 configure.in,1.36,1.37

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo
In directory pdx:/tmp/cvs-serv7700

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

        * src/cairoint.h (slim_hidden_proto1): Directly fold in slim stuff
        rather than depending on it from an external package.

        * src/cairo_ps_surface.c (_cairo_ps_surface_copy_page):
        * src/cairo_image_surface.c: Switch from libic to libpixman.

        * src/cairo.h: Include pixman.h not ic.h.
        (__external_linkage): Directly fold in slim stuff rather than
        depending on it from an external package.

        * configure.in (PKG_CHECK_MODULES):
        * cairo.pc.in (Requires): Look for libpixman instead of libic and
        slim.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** ChangeLog	11 Dec 2003 19:12:59 -0000	1.126
--- ChangeLog	11 Dec 2003 20:43:58 -0000	1.127
***************
*** 1,2 ****
--- 1,18 ----
+ 2003-12-11  Carl Worth  <cworth at isi.edu>
+ 
+ 	* src/cairoint.h (slim_hidden_proto1): Directly fold in slim stuff
+ 	rather than depending on it from an external package.
+ 
+ 	* src/cairo_ps_surface.c (_cairo_ps_surface_copy_page): 
+ 	* src/cairo_image_surface.c: Switch from libic to libpixman.
+ 
+ 	* src/cairo.h: Include pixman.h not ic.h.
+ 	(__external_linkage): Directly fold in slim stuff rather than
+ 	depending on it from an external package.
+ 
+ 	* configure.in (PKG_CHECK_MODULES): 
+ 	* cairo.pc.in (Requires): Look for libpixman instead of libic and
+ 	slim.
+ 
  2003-12-11  Andrew Chant <andrew.chant at utoronto.ca>
  

Index: cairo.pc.in
===================================================================
RCS file: /cvs/cairo/cairo/cairo.pc.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** cairo.pc.in	11 Dec 2003 17:35:07 -0000	1.8
--- cairo.pc.in	11 Dec 2003 20:43:58 -0000	1.9
***************
*** 8,12 ****
  Version: @VERSION@
  
! Requires: fontconfig libic slim @XRENDER_REQUIRES@
  Libs: -L${libdir} -lcairo -lm -lz @FREETYPE_LIBS@
  Cflags: -I${includedir} @FREETYPE_CFLAGS@
--- 8,12 ----
  Version: @VERSION@
  
! Requires: fontconfig libpixman @XRENDER_REQUIRES@
  Libs: -L${libdir} -lcairo -lm -lz @FREETYPE_LIBS@
  Cflags: -I${includedir} @FREETYPE_CFLAGS@

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** configure.in	11 Dec 2003 17:35:07 -0000	1.36
--- configure.in	11 Dec 2003 20:43:58 -0000	1.37
***************
*** 57,61 ****
  
  PKG_CHECK_MODULES(FONTCONFIG, fontconfig)
! PKG_CHECK_MODULES(CAIRO, slim >= 0.2.0 libic >= 0.1.3)
  
  # Test for freetype2 separate from pkg-config since at least up to
--- 57,61 ----
  
  PKG_CHECK_MODULES(FONTCONFIG, fontconfig)
! PKG_CHECK_MODULES(CAIRO, libpixman >= 0.1.0)
  
  # Test for freetype2 separate from pkg-config since at least up to