From bcc7591195a7ee48d43fe809eb60533e2674d1da Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Thu, 7 Apr 2005 09:28:42 +0000
Subject: Added two patches needed for gcc-2.95. Approved by wiz.

---
 graphics/librsvg2/distinfo         |  4 +++-
 graphics/librsvg2/patches/patch-ae | 16 ++++++++++++++++
 graphics/librsvg2/patches/patch-af | 16 ++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 graphics/librsvg2/patches/patch-ae
 create mode 100644 graphics/librsvg2/patches/patch-af

(limited to 'graphics')

diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index ed9810437b8..5f2f52abec8 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2005/04/02 13:01:28 jmmv Exp $
+$NetBSD: distinfo,v 1.13 2005/04/07 09:28:42 rillig Exp $
 
 SHA1 (librsvg-2.9.5.tar.bz2) = 502338a1b42ec36fbca895b97a166e398e7e3018
 RMD160 (librsvg-2.9.5.tar.bz2) = 5c7d6ad1a543b4880d7c3bb02da7126ed9f5aa5e
@@ -7,3 +7,5 @@ SHA1 (patch-aa) = b7e6a6989a49125e40c0cdadd0ed032068b0c658
 SHA1 (patch-ab) = 6f6d376192e6cf2f8c223be2270cbb932173449a
 SHA1 (patch-ac) = 11939435e00f04b58412b3d769297caa9ee585b9
 SHA1 (patch-ad) = e72e1e884a366199be9feeacde05815627393f1f
+SHA1 (patch-ae) = ddbe928fe1e12229d3c8d6c4dd7cf64217b7c0ca
+SHA1 (patch-af) = 8f80ea032a3b22a9637b5d92a7b668c1754fea1f
diff --git a/graphics/librsvg2/patches/patch-ae b/graphics/librsvg2/patches/patch-ae
new file mode 100644
index 00000000000..bfdac077ed1
--- /dev/null
+++ b/graphics/librsvg2/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2005/04/07 09:28:42 rillig Exp $
+
+--- rsvg-paint-server.c.orig	Wed Nov 17 06:30:14 2004
++++ rsvg-paint-server.c	Thu Mar 31 23:51:23 2005
+@@ -85,9 +85,10 @@ rsvg_paint_server_solid_render (RsvgPain
+ {
+ 	RsvgPaintServerSolid *z = (RsvgPaintServerSolid *)self;
+ 	guint32 rgb = z->rgb;
++	ArtPixMaxDepth color[3];
++
+ 	if (z->currentcolour)
+ 		rgb = rsvg_state_current(ctx->ctx)->current_color;
+-	ArtPixMaxDepth color[3];
+ 	
+ 	color[0] = ART_PIX_MAX_FROM_8 (rgb >> 16);
+ 	color[1] = ART_PIX_MAX_FROM_8 ((rgb >> 8) & 0xff);
diff --git a/graphics/librsvg2/patches/patch-af b/graphics/librsvg2/patches/patch-af
new file mode 100644
index 00000000000..d4c2b282d68
--- /dev/null
+++ b/graphics/librsvg2/patches/patch-af
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.1 2005/04/07 09:28:42 rillig Exp $
+
+--- rsvg-shapes.c.orig	Sun Nov 28 18:02:12 2004
++++ rsvg-shapes.c	Thu Mar 31 23:52:51 2005
+@@ -2579,10 +2579,10 @@ rsvg_start_sub_svg (RsvgHandle *ctx, Rsv
+ 	const char * id, *value;
+ 	double vbox_x = 0, vbox_y = 0, vbox_w = 0, vbox_h = 0;
+ 	gboolean has_vbox = FALSE, overflow = 0;
+-	id = NULL;
+ 	RsvgDefsDrawableSvg * svg;
+ 	RsvgDefsDrawableGroup * group;
+ 	RsvgState state;
++	id = NULL;
+ 	rsvg_state_init(&state);
+ 
+ 	if (rsvg_property_bag_size (atts))
-- 
cgit v1.2.3