Update to 2.16.0:

2006-08-31  Dom Lachowicz <cinamod@hotmail.com>

	* configure.in: 2.16.0

2006-08-23  Dom Lachowicz <cinamod@hotmail.com>

	* rsvg-text.c: Bug 344116. The 5 crashes I mentioned before aren't
	reproducible. I'm enabling this code, and watching out for regressions.

2006-08-23  Dom Lachowicz <cinamod@hotmail.com>

	* configure.in: Hopefully fix --disable-gtk-doc (341421)
	* doc/Makefile.am: Ditto

2006-08-23  Dom Lachowicz <cinamod@hotmail.com>

	* librsvg.def: Make export symbols work on OSX (bug 352512)
	* rsvg-private.h: Some preparation work for color normalization

2006-08-22  Dom Lachowicz <cinamod@hotmail.com>

	* Bug 344116: Committed patch from Kouhei Sutou <kou@cozmixng.org>
	that makes librsvg use Pango-Cairo instead of PangoFT2+rendering
	text as a path. This patch is disabled for now, as it crashes on
	at least 5 known SVGs (see bug 344116)

2006-08-22  Dom Lachowicz <cinamod@hotmail.com>

	* rsvg-base.c (rsvg_handle_write_impl): Have libxml2 replace entities
	for us. This fixes a bug where style definitions don't get properly
	expanded, but causes a (2.15.x-only feature) regression when importing
	external ENTITIES.

2006-07-27  Dom Lachowicz <cinamod@hotmail.com>

	* configure.in: 2.15.90

2006-07-22  Dom Lachowicz <cinamod@hotmail.com>

	* configure.in: Bug 348329 make gnome-print dependency optional
	* rsvg-text.c: Don't leak PangoFt2 fonts (bug 344235). This is a
	work-around for Pango bug 143542.
	* rsvg.c: Document _render_sub better (bug 346964)
	* rsvg-cairo-render.c: Ditto

2006-07-22  Dom Lachowicz <cinamod@hotmail.com>

	* configure.in: Require cairo-png

2006-07-20  Dom Lachowicz <cinamod@hotmail.com>

	* rsvg-text.c: Fix build breakage caused by newer freetype versions
	(https://sourceforge.net/project/shownotes.php?release_id=416463&group_id=3157).
	For some reason, they thought that breaking API compatability
	in such a low-level, widely-used library was ok.

2006-06-28  Dom Lachowicz <cinamod@hotmail.com>

	* rsvg-private.h: Use G_GNUC_PRETTY_FUNCTION so as to not depend on
	GCC extensions (3461163)

	* gdk-pixbuf-loader/Makefile.am: Remove trailing slash so that
	install.sh works on Solaris. It seems that it doesn't like test -d dir/

2006-05-14  Dom Lachowicz <cinamod@hotmail.com>

	* configure.in: New better way to invoke gtk-doc (see 341421)
	* Makefile.am: Ditto
	* doc/Makefile.am: Ditto
	* gtk-doc.make: Removed. Auto-generated

2006-05-07  Dom Lachowicz <cinamod@hotmail.com>

	* gdk-pixbuf-loader/io-svg.c: Fix build on GTK+ >= 2.9. (329850)

2006-05-04  Dom Lachowicz <cinamod@hotmail.com>

	* rsvg-base.c: Fix some cast warnings (340666)

2006-05-03  Emmanuel Pacaud

	* rsvg-base.c: Fix rounding error in rsvg_pixbuf_from_file() (340664)

2006-05-03  Dom Lachowicz <cinamod@hotmail.com>

	* configure.in: Require cairo 1.1.2 or better
	* rsvg-convert.c: Remove code made unecessary by cairo 1.1.2

2006-05-03  Paolo Borelli  <pborelli@katamail.com>

	* rsvg-filter.c:
	* rsvg-marker.c:
	* rsvg-mask.c:
	* rsvg-paint-server.c:
	* rsvg-private.h:

	Factor out rsvg_get_url_string. Bug 340505.

2006-05-03  Paolo Borelli  <pborelli@katamail.com>

	* rsvg-text.[ch]: pass the lenght to rsvg_make_valid_utf8.
	* rsvg-base.c: avoid some strdups and avoid a leak in the !utf8
	case of rsvg_characters(). Bug 340471.

2006-05-02 Dom Lachowicz <cinamod@hotmail.com>

	* rsvg.c: Use g_try_malloc0 so that the app doesn't abort() if we
	can't malloc the requested # of pixels. Part of bug 340440.

2006-04-30 Dom Lachowicz <cinamod@hotmail.com>

	* rsvg-base.c: Implement the XInclude spec to some large-ish degree. Currently
	doesn't support the "xpointer" bit.
	* rsvg-gobject.c: Only initialize the SAX handler once (on class init)
	rather than at object-init

2006-04-29 Dom Lachowicz <cinamod@hotmail.com>

	* rsvg-paint-server.c: Fix a "type-punned pointer" issue found by Thomas VS
	* rsvg-base.c: xmlChar vs. char (#340114)

2006-04-27 Dom Lachowicz <cinamod@hotmail.com>

	* rsvg-base.c: Handle system, public, and unparsed entity declarations
	better. Probably not 100% conformant, but probably better than not
	doing it at all.

	* rsvg-styles.c: Add support for the CSS @import directive. Probably isn't 100%
	conformant, but probably better than not doing it at all.

2006-04-27 Dom Lachowicz <cinamod@hotmail.com>

	* rsvg-css.c (rsvg_css_parse_xml_attribute_string): Code borrowed from Expat.
	Takes a XML attribute+value string and turns it into attribute+value pairs.
	* rsvg-base.c (rsvg_processing_instruction): Implement <?xml-stylesheet?>
	as best I know how. (related to #338163)

2006-04-27 Dom Lachowicz <cinamod@hotmail.com>

	* rsvg-base.c (rsvg_processing_instruction): Stub out how to handle
	the <?xml-stylesheet?> processing instruction

2006-04-25 Dom Lachowicz <cinamod@hotmail.com>

	* rsvg-image.c: Initialize node->super, to avoid a crash (#339637)

2006-04-24 Dom Lachowicz <cinamod@hotmail.com>

	* librsvg.def: Export rsvg_error_get_type() (#339641)

2006-04-19 Dom Lachowicz <cinamod@hotmail.com>

	* *.[ch]: Use rsvg_return_if_fail where appropriate, to make life
	easier for language bindings and to report errors more consistently
	(bug #338881)

2006-04-17 Sebastian Rittau <srittau@jroger.in-berlin.de>

	* Update API documentation to match deprecated symbol list

2006-04-01 Dom Lachowicz <cinamod@hotmail.com>

	* rsvg-convert.c: Ditch popt in favor of GOption (#336090)
	* rsvg-convert.c: Ditto
	* test-display.c: Ditto
	* test-performance.c: Ditto
	* configure.in: Ditto, bump version number (2.15.0)

2006-03-22 Dom Lachowicz <cinamod@hotmail.com>

	* rsvg-base-file-util.c: rsvg_handle_set_base_uri() in rsvg_handle_new_from_file()
	  is too late (#335450)

2006-03-19 Dom Lachowicz <cinamod@hotmail.com>

	* rsvg-base.c: Fix a crash exposed by bug 335107
	* rsvg-convert: Prevent warnings/crash after getting a null RsvgHandle back

2006-03-16 Dom Lachowicz <cinamod@hotmail.com>

	* rsvg-convert.c: rsvg-convert 'crashes' because it calls g_error()
	on an error condition, instead of fprintf(stderr, ...) (#334813)

4 files changed, 49 insertions, 21 deletions

diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index c8936b35923..c227a8ad942 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.51 2006/05/13 18:29:05 adam Exp $
+# $NetBSD: Makefile,v 1.52 2006/09/15 15:09:32 jmmv Exp $
 
-DISTNAME=	librsvg-2.14.4
+DISTNAME=	librsvg-2.16.0
 PKGNAME=	${DISTNAME:S/-/2-/}
 CATEGORIES=	graphics gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/librsvg/2.14/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/librsvg/2.16/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -21,7 +21,6 @@ PKGCONFIG_OVERRIDE=	librsvg-2.0.pc.in
 
 CONFIGURE_ARGS+=	--disable-gtk-doc
 CONFIGURE_ARGS+=	--with-gimp=no
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/librsvg2
 CONFIGURE_ARGS+=	--with-tags=
 
 GTK2_LOADERS=		yes
@@ -32,9 +31,21 @@ SUBST_MESSAGE.tabs=	Removing tabs from librsvg.def
 SUBST_FILES.tabs=	librsvg.def
 SUBST_FILTER_CMD.tabs=	${TR} -d '\t'
 
+BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.2.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.11.0
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
+
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libcroco+=	libcroco>=0.6.1
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/libcroco/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/librsvg2/PLIST b/graphics/librsvg2/PLIST
index 493c9f6e304..b437ba96c1a 100644
--- a/graphics/librsvg2/PLIST
+++ b/graphics/librsvg2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2006/03/31 09:08:08 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.15 2006/09/15 15:09:32 jmmv Exp $
 bin/rsvg
 bin/rsvg-convert
 bin/rsvg-view
@@ -6,14 +6,32 @@ include/librsvg-2/librsvg/librsvg-enum-types.h
 include/librsvg-2/librsvg/librsvg-features.h
 include/librsvg-2/librsvg/rsvg-cairo.h
 include/librsvg-2/librsvg/rsvg.h
-lib/gtk-2.0/2.4.0/engines/libsvg.la
-lib/gtk-2.0/2.4.0/loaders/svg_loader.la
+lib/gtk-2.0/2.10.0/engines/libsvg.la
+lib/gtk-2.0/2.10.0/loaders/svg_loader.la
 lib/librsvg-2.la
 lib/pkgconfig/librsvg-2.0.pc
 man/man1/rsvg.1
+share/gtk-doc/html/rsvg/home.png
+share/gtk-doc/html/rsvg/index.html
+share/gtk-doc/html/rsvg/index.sgml
+share/gtk-doc/html/rsvg/ix01.html
+share/gtk-doc/html/rsvg/left.png
+share/gtk-doc/html/rsvg/pt02.html
+share/gtk-doc/html/rsvg/pt03.html
+share/gtk-doc/html/rsvg/pt04.html
+share/gtk-doc/html/rsvg/right.png
+share/gtk-doc/html/rsvg/rsvg-Cairo.html
+share/gtk-doc/html/rsvg/rsvg-Core-API.html
+share/gtk-doc/html/rsvg/rsvg-GdkPixbuf.html
+share/gtk-doc/html/rsvg/rsvg.devhelp
+share/gtk-doc/html/rsvg/rsvg.devhelp2
+share/gtk-doc/html/rsvg/rsvg.html
+share/gtk-doc/html/rsvg/style.css
+share/gtk-doc/html/rsvg/up.png
 share/pixmaps/svg-viewer.svg
 @comment in xdg-dirs: @dirrm share/pixmaps
-@comment in gtk2: @dirrm lib/gtk-2.0/2.4.0/loaders
-@comment in gtk2: @dirrm lib/gtk-2.0/2.4.0/engines
+@dirrm share/gtk-doc/html/rsvg
+@comment in gtk2: @dirrm lib/gtk-2.0/2.10.0/loaders
+@comment in gtk2: @dirrm lib/gtk-2.0/2.10.0/engines
 @dirrm include/librsvg-2/librsvg
 @dirrm include/librsvg-2
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index 4b9f5d3dcb1..0bc79497a28 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.20 2006/05/13 18:29:05 adam Exp $
+$NetBSD: distinfo,v 1.21 2006/09/15 15:09:32 jmmv Exp $
 
-SHA1 (librsvg-2.14.4.tar.bz2) = 9314f0d44dbfe672dc1f1a65b66821593c3bf1ce
-RMD160 (librsvg-2.14.4.tar.bz2) = 9e294f1a2e146bf30e1bde72838b8316506c9da2
-Size (librsvg-2.14.4.tar.bz2) = 415862 bytes
+SHA1 (librsvg-2.16.0.tar.bz2) = 87917ea1300ca592e9901eb99ce070bd565b0807
+RMD160 (librsvg-2.16.0.tar.bz2) = dfadfb3dcae33e4a103eaf9a7ec29362a6148d47
+Size (librsvg-2.16.0.tar.bz2) = 420858 bytes
 SHA1 (patch-aa) = 0a0b96d35f3896b3a4e31e374317de3c22945957
 SHA1 (patch-ab) = f1cbfcccd0a7d17801d2f5b60645c39e885d7c37
-SHA1 (patch-ac) = 4fed56da97fb977d12673db2f5e70ff6e76c44e4
-SHA1 (patch-ad) = 8d488d8207a695b9c36649e4a24d67de13ff59a6
+SHA1 (patch-ac) = 2fe92bde9850e772e3ddc16a94903d15871c1c49
diff --git a/graphics/librsvg2/patches/patch-ac b/graphics/librsvg2/patches/patch-ac
index efcd310a3b2..368d13730ad 100644
--- a/graphics/librsvg2/patches/patch-ac
+++ b/graphics/librsvg2/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.9 2006/04/03 06:35:26 wiz Exp $
+$NetBSD: patch-ac,v 1.10 2006/09/15 15:09:32 jmmv Exp $
 
---- Makefile.in.orig	2006-04-01 16:31:31.000000000 +0000
+--- Makefile.in.orig	2006-08-31 16:56:39.000000000 +0200
 +++ Makefile.in
-@@ -315,7 +315,7 @@ sysconfdir = @sysconfdir@
+@@ -311,7 +311,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @HAVE_GTK_FALSE@target_rsvg_view = 
  @HAVE_GTK_TRUE@target_rsvg_view = rsvg-view
--SUBDIRS = . moz-plugin gdk-pixbuf-loader gtk-engine data \
-+SUBDIRS = . gdk-pixbuf-loader gtk-engine data \
- 	$(am__append_1)
+-SUBDIRS = . moz-plugin gdk-pixbuf-loader gtk-engine data doc
++SUBDIRS = . gdk-pixbuf-loader gtk-engine data doc
  lib_LTLIBRARIES = librsvg-2.la
  man_MANS = rsvg.1
+ @OS_WIN32_FALSE@libm = -lm