[poppler] poppler: ChangeLog, 1.342, 1.343 configure.ac, 1.50, 1.51 poppler-glib.pc.in, 1.5, 1.6

[Kristian Høgsberg]

Update of /cvs/poppler/poppler
In directory kemper:/tmp/cvs-serv7212

Modified Files:
	ChangeLog configure.ac poppler-glib.pc.in 
Log Message:
2006-04-11  Kristian Høgsberg  <krh at redhat.com>

	* configure.ac:
	* poppler-glib.pc.in:
	* glib/Makefile.am:
	* glib/poppler-page.cc:
	* glib/poppler-page.h:
	* glib/poppler.h:
	* poppler/CairoOutputDev.cc:
	* poppler/CairoOutputDev.h:
	* glib/poppler-features.h.in:
	Make the CairoOutputDev render to a cairo_t instead of a
	cairo_surface_t and expose that functionality in the glib wrapper
	(poppler_page_render).

	* test/Makefile.am:
	* test/gtk-cairo-test.cc:
	Update gtk-cairo-test to use this new interface and add a spin
	button for changing page (#5951).

	* utils/Makefile.am (EXTRA_DIST): Fix warning where this was
	assigned twice.
	


Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -d -r1.342 -r1.343
--- ChangeLog	10 Apr 2006 18:12:44 -0000	1.342
+++ ChangeLog	12 Apr 2006 02:07:07 -0000	1.343
@@ -1,3 +1,26 @@
+2006-04-11  Kristian Høgsberg  <krh at redhat.com>
+
+	* configure.ac:
+	* poppler-glib.pc.in:
+	* glib/Makefile.am:
+	* glib/poppler-page.cc:
+	* glib/poppler-page.h:
+	* glib/poppler.h:
+	* poppler/CairoOutputDev.cc:
+	* poppler/CairoOutputDev.h:
+	* glib/poppler-features.h.in:
+	Make the CairoOutputDev render to a cairo_t instead of a
+	cairo_surface_t and expose that functionality in the glib wrapper
+	(poppler_page_render).
+
+	* test/Makefile.am:
+	* test/gtk-cairo-test.cc:
+	Update gtk-cairo-test to use this new interface and add a spin
+	button for changing page (#5951).
+
+	* utils/Makefile.am (EXTRA_DIST): Fix warning where this was
+	assigned twice.
+	
 2006-04-10  Jeff Muizelaar  <jeff at infidigm.net>
 
 	* poppler/CairoOutputDev.cc: take originX and originY into account in

Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- configure.ac	28 Feb 2006 23:24:59 -0000	1.50
+++ configure.ac	12 Apr 2006 02:07:07 -0000	1.51
@@ -182,7 +182,14 @@
 AH_TEMPLATE([HAVE_CAIRO], [Use cairo for rendering.])
 if test x$enable_cairo_output = xyes; then
   AC_DEFINE(HAVE_CAIRO)
+  CAIRO_FEATURE="#define POPPLER_HAS_CAIRO 1"
+  CAIRO_REQ="cairo"
+else
+  CAIRO_FEATURE="#undef POPPLER_HAS_CAIRO"
+  CAIRO_REQ=""
 fi
+AC_SUBST(CAIRO_FEATURE)
+AC_SUBST(CAIRO_REQ)
 
 AC_ARG_ENABLE(poppler-glib,
               AC_HELP_STRING([--disable-poppler-glib],
@@ -306,6 +313,7 @@
 poppler/Makefile
 utils/Makefile
 glib/Makefile
+glib/poppler-features.h
 glib/reference/Makefile
 test/Makefile
 qt/Makefile

Index: poppler-glib.pc.in
===================================================================
RCS file: /cvs/poppler/poppler/poppler-glib.pc.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- poppler-glib.pc.in	2 Jun 2005 18:49:55 -0000	1.5
+++ poppler-glib.pc.in	12 Apr 2006 02:07:07 -0000	1.6
@@ -6,7 +6,7 @@
 Name: poppler-glib
 Description: GLib wrapper for poppler
 Version: @VERSION@
-Requires: poppler = @VERSION@ gobject-2.0 gdk-pixbuf-2.0
+Requires: poppler = @VERSION@ gobject-2.0 gdk-pixbuf-2.0 @CAIRO_REQ@
 
 Libs: -L${libdir} -lpoppler-glib
 Cflags: -I${includedir}/poppler/glib