[cairo-commit] cairo ChangeLog, 1.382, 1.383 cairo.pc.in, 1.19, 1.20 configure.in, 1.83, 1.84

[Owen Taylor]

Committed by: otaylor

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

Modified Files:
	ChangeLog cairo.pc.in configure.in 
Log Message:
2005-02-24  Owen Taylor  <otaylor at redhat.com>

	* src/cairo_win32_surface.c (_cairo_win32_surface_destroy): 
	When we created a DC/bitmap pair, delete the DC before
	the Bitmap so that the Bitmap will be released from the
	DC and can be destroyed. (Reported by Hans Breuer)

	* configure.in cairo.pc.in: Only require fontconfig
	if building FreeType font backend.

	* configure.in: Fix output when reporting Win32 font backend.

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -d -r1.382 -r1.383
--- ChangeLog	24 Feb 2005 16:07:39 -0000	1.382
+++ ChangeLog	24 Feb 2005 16:20:14 -0000	1.383
@@ -1,3 +1,15 @@
+2005-02-24  Owen Taylor  <otaylor at redhat.com>
+
+	* src/cairo_win32_surface.c (_cairo_win32_surface_destroy): 
+	When we created a DC/bitmap pair, delete the DC before
+	the Bitmap so that the Bitmap will be released from the
+	DC and can be destroyed. (Reported by Hans Breuer)
+
+	* configure.in cairo.pc.in: Only require fontconfig
+	if building FreeType font backend.
+
+	* configure.in: Fix output when reporting Win32 font backend.
+
 2005-02-24  Carl Worth  <cworth at cworth.org>
 
 	* TODO: Remove many TODO items that have now been absorbed by the

Index: cairo.pc.in
===================================================================
RCS file: /cvs/cairo/cairo/cairo.pc.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- cairo.pc.in	20 Jan 2005 16:28:54 -0000	1.19
+++ cairo.pc.in	24 Feb 2005 16:20:14 -0000	1.20
@@ -7,6 +7,6 @@
 Description: Multi-platform 2D graphics library
 Version: @VERSION@
 
-Requires: fontconfig libpixman @XRENDER_REQUIRES@ @PNG_REQUIRES@ @GLITZ_REQUIRES@
+Requires: @FREETYPE_REQUIRES@ libpixman @XRENDER_REQUIRES@ @PNG_REQUIRES@ @GLITZ_REQUIRES@
 Libs: @FREETYPE_LIBS@ -L${libdir} -lcairo 
 Cflags: @FREETYPE_CFLAGS@ -I${includedir}/cairo

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- configure.in	22 Feb 2005 18:43:26 -0000	1.83
+++ configure.in	24 Feb 2005 16:20:14 -0000	1.84
@@ -323,9 +323,11 @@
   AC_MSG_RESULT($FREETYPE_VERSION - OK)
 
   FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
-  FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
+  FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`  
+  FREETYPE_REQUIRES=fontconfig
   AC_SUBST(FREETYPE_CFLAGS)
   AC_SUBST(FREETYPE_LIBS)
+  AC_SUBST(FREETYPE_REQUIRES)
 fi
 
 CAIRO_CFLAGS="$CAIRO_CFLAGS $FREETYPE_CFLAGS"
@@ -438,7 +440,7 @@
 echo ""
 echo "and the following font backends:"
 echo "  FreeType: $use_freetype"
-echo "  Win32: false"
+echo "  Win32: $use_win32"
 echo "  ATSUI: $use_atsui"
 echo ""