Changes 1.0.3:

* Fix bug where empty gradients cause segfault (Darin)
* Small build fix (Darin)

Changes 1.0.2:
* Fix bug where scaled text would be clipped (Darin)
* Fix bug where empty .svg file cause segfault (Darin)
* Fix bug where some .svg files with certain kinds of degenerate
  gradients would cause segfault (Darin)
* Change install and packaging so that librsvg 1 and librsvg 2
  can be installed on the same system. (Ramiro)
* Fix bug where we would read past the end of a string when the
  string has multibyte sequences in it (Darin)
* Remove vestiges of unused gettext and xml-i18n-tools (Darin)

4 files changed, 40 insertions, 41 deletions

diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index 78817d72039..f5ee55b4362 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -1,21 +1,19 @@
-# $NetBSD: Makefile,v 1.17 2004/11/20 22:10:23 jmmv Exp $
-#
+# $NetBSD: Makefile,v 1.18 2005/01/28 14:58:09 adam Exp $
 
-DISTNAME=		librsvg-1.0.1
-PKGREVISION=		8
-CATEGORIES=		graphics gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/librsvg/1.0/}
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	librsvg-1.0.3
+CATEGORIES=	graphics gnome
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/librsvg/1.0/}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		rh@NetBSD.org
-HOMEPAGE=		http://www.levien.com/svg/
-COMMENT=		Raph's SVG library
+MAINTAINER=	rh@NetBSD.org
+HOMEPAGE=	http://www.levien.com/svg/
+COMMENT=	Raph's SVG library
 
-USE_BUILDLINK3=		YES
-USE_X11BASE=		YES
-GNU_CONFIGURE=		YES
+USE_BUILDLINK3=		yes
+USE_LIBTOOL=		yes
+USE_X11=		yes
+GNU_CONFIGURE=		yes
 
-USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 .include "../../graphics/gdk-pixbuf/buildlink3.mk"
diff --git a/graphics/librsvg/PLIST b/graphics/librsvg/PLIST
index aa010e2b5ae..babf4ef3867 100644
--- a/graphics/librsvg/PLIST
+++ b/graphics/librsvg/PLIST
@@ -1,20 +1,21 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:36 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/01/28 14:58:09 adam Exp $
 bin/librsvg-config
-include/librsvg/art_render.h
-include/librsvg/art_render_gradient.h
-include/librsvg/art_render_mask.h
-include/librsvg/art_render_svp.h
-include/librsvg/art_rgba.h
-include/librsvg/librsvg-features.h
-include/librsvg/rsvg-bpath-util.h
-include/librsvg/rsvg-css.h
-include/librsvg/rsvg-defs.h
-include/librsvg/rsvg-ft.h
-include/librsvg/rsvg-paint-server.h
-include/librsvg/rsvg-path.h
-include/librsvg/rsvg.h
+include/librsvg-1/librsvg/art_render.h
+include/librsvg-1/librsvg/art_render_gradient.h
+include/librsvg-1/librsvg/art_render_mask.h
+include/librsvg-1/librsvg/art_render_svp.h
+include/librsvg-1/librsvg/art_rgba.h
+include/librsvg-1/librsvg/librsvg-features.h
+include/librsvg-1/librsvg/rsvg-bpath-util.h
+include/librsvg-1/librsvg/rsvg-css.h
+include/librsvg-1/librsvg/rsvg-defs.h
+include/librsvg-1/librsvg/rsvg-ft.h
+include/librsvg-1/librsvg/rsvg-paint-server.h
+include/librsvg-1/librsvg/rsvg-path.h
+include/librsvg-1/librsvg/rsvg.h
 lib/librsvg.la
 lib/librsvgConf.sh
 lib/pkgconfig/librsvg-1.0.pc
 share/aclocal/librsvg.m4
-@dirrm include/librsvg
+@dirrm include/librsvg-1/librsvg
+@dirrm include/librsvg-1
diff --git a/graphics/librsvg/distinfo b/graphics/librsvg/distinfo
index 6e8bd7d2c1d..d2ac559a662 100644
--- a/graphics/librsvg/distinfo
+++ b/graphics/librsvg/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2004/05/02 16:53:28 adam Exp $
+$NetBSD: distinfo,v 1.5 2005/01/28 14:58:09 adam Exp $
 
-SHA1 (librsvg-1.0.1.tar.bz2) = 7c650c18ef8f0f942a27e0eacdd17159ee6a2cd3
-Size (librsvg-1.0.1.tar.bz2) = 151745 bytes
-SHA1 (patch-aa) = 4add2b7c599a456c67ca807c294380c79c777d82
+SHA1 (librsvg-1.0.3.tar.bz2) = f30a6859046dd9ff5883e9bbfd19d6ca29de895f
+Size (librsvg-1.0.3.tar.bz2) = 166452 bytes
+SHA1 (patch-aa) = a2f52d0a173de8ef58cfaf8abdbd8498b1d3105b
 SHA1 (patch-ab) = 26bdce724315c7b23a2e5295b3c7884605ed4e3c
 SHA1 (patch-ac) = 2f863139bc55f1fe45cc19556c64395f0474ee48
 SHA1 (patch-ad) = c4b5f9d211d18e1b71451e7ba8e24caca9079027
diff --git a/graphics/librsvg/patches/patch-aa b/graphics/librsvg/patches/patch-aa
index f668b947982..7509cd946ae 100644
--- a/graphics/librsvg/patches/patch-aa
+++ b/graphics/librsvg/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.2 2004/04/27 15:19:53 adam Exp $
+$NetBSD: patch-aa,v 1.3 2005/01/28 14:58:09 adam Exp $
 
---- configure.orig	2001-07-05 22:00:47.000000000 +0000
+--- configure.orig	2002-01-17 18:54:07.000000000 +0000
 +++ configure
-@@ -1744,14 +1744,14 @@ exec 5>>./config.log
+@@ -5412,14 +5412,14 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
  
  
  
 -echo $ac_n "checking for poptParseArgvString in -lpopt""... $ac_c" 1>&6
--echo "configure:1749: checking for poptParseArgvString in -lpopt" >&5
+-echo "configure:5417: checking for poptParseArgvString in -lpopt" >&5
 +echo $ac_n "checking for poptParseArgvString in -lgnomesupport""... $ac_c" 1>&6
-+echo "configure:1749: checking for poptParseArgvString in -lgnomesupport" >&5
++echo "configure:5417: checking for poptParseArgvString in -lgnomesupport" >&5
  ac_lib_var=`echo popt'_'poptParseArgvString | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -18,9 +18,9 @@ $NetBSD: patch-aa,v 1.2 2004/04/27 15:19:53 adam Exp $
 -LIBS="-lpopt  $LIBS"
 +LIBS="-lgnomesupport  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 1757 "configure"
+ #line 5425 "configure"
  #include "confdefs.h"
-@@ -1779,7 +1779,7 @@ LIBS="$ac_save_LIBS"
+@@ -5447,7 +5447,7 @@ LIBS="$ac_save_LIBS"
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.2 2004/04/27 15:19:53 adam Exp $
  else
    echo "$ac_t""no" 1>&6
  fi
-@@ -2352,6 +2352,7 @@ else
+@@ -6020,6 +6020,7 @@ else
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>