Better fix for NetBSD-5.1, from upstream bug report via Rhialto.

3 files changed, 19 insertions, 18 deletions

diff --git a/graphics/librsvg/distinfo b/graphics/librsvg/distinfo
index 2d1eea4712d..d686eb1a592 100644
--- a/graphics/librsvg/distinfo
+++ b/graphics/librsvg/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.21 2012/07/08 21:54:04 wiz Exp $
+$NetBSD: distinfo,v 1.22 2012/07/08 23:03:17 wiz Exp $
 
 SHA1 (librsvg-2.36.1.tar.xz) = 1084015373e90ff8fccbae4b27ee778bbdf14d40
 RMD160 (librsvg-2.36.1.tar.xz) = 373e2f2a72a79097c47ce0e75701e784673c2ee7
 Size (librsvg-2.36.1.tar.xz) = 506184 bytes
 SHA1 (patch-ab) = 44985e1c02f925769f394007f924b8d6ec8151d5
-SHA1 (patch-rsvg-image.h) = a7265377d9173d494ce7610561da8598d6ae63d2
+SHA1 (patch-rsvg-io.c) = 1bcb7164dda065eb2e231818dd9c5df8b98e49a5
diff --git a/graphics/librsvg/patches/patch-rsvg-image.h b/graphics/librsvg/patches/patch-rsvg-image.h
deleted file mode 100644
index deeecff9933..00000000000
--- a/graphics/librsvg/patches/patch-rsvg-image.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-rsvg-image.h,v 1.2 2012/07/08 21:54:04 wiz Exp $
-
-rsvg_get_file_path is an externally visible function.
-Fixes NetBSD-5.1/amd64 build.
-https://bugzilla.gnome.org/show_bug.cgi?id=679603
-
---- rsvg-image.h.orig	2012-02-06 19:44:12.000000000 +0000
-+++ rsvg-image.h
-@@ -51,7 +51,6 @@ struct _RsvgNodeImage {
- G_GNUC_INTERNAL
- void rsvg_preserve_aspect_ratio (unsigned int aspect_ratio, double width,
-                                  double height, double *w, double *h, double *x, double *y);
--G_GNUC_INTERNAL
- gchar *rsvg_get_file_path (const gchar * filename, const gchar * basedir);
- G_GNUC_INTERNAL
- cairo_surface_t *rsvg_cairo_surface_new_from_href (RsvgHandle *handle, const char *href, GError ** error);
diff --git a/graphics/librsvg/patches/patch-rsvg-io.c b/graphics/librsvg/patches/patch-rsvg-io.c
new file mode 100644
index 00000000000..b0cb78ce7a2
--- /dev/null
+++ b/graphics/librsvg/patches/patch-rsvg-io.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-rsvg-io.c,v 1.1 2012/07/08 23:03:17 wiz Exp $
+
+rsvg_get_file_path is an externally visible function.
+Fixes NetBSD-5.1/amd64 build.
+Patch from Matthew Dempsky in
+https://bugzilla.gnome.org/show_bug.cgi?id=677661
+
+--- rsvg-io.c.orig	2012-03-26 12:25:08.000000000 +0000
++++ rsvg-io.c
+@@ -24,6 +24,7 @@
+ 
+ #include "rsvg-io.h"
+ #include "rsvg-private.h"
++#include "rsvg-image.h"
+ 
+ #include <string.h>
+