librsvg: update to 2.40.18.

Version 2.40.18
- bgo#783835 - CVE-2017-11464 - Fix division-by-zero in the Gaussian
  blur code.
- Fix other cases of division-by-zero on fuzzed SVG files.
- Don't crash on invalid transformation matrices.
- Support Visual Studio 2017; generate .pc files for Meson on Windows -
  Chun-wei Fan.

Version 2.40.17
- bgo#778666 - Use our own thumbnailer specification file, so
  gnome-desktop-thumbnailer can generate thumbnails outside of the
  calling process (Jeremy Bicha).
- Removed some redundant code.
- Windows build fixes - Chun-wei Fan.

Version 2.40.16
- Chun-wei Fan added support for building the introspection files under MSVC.
- Fixed bgo#760262 - Make the zooming options in rsvg-convert(1) work again
  for scaling the resulting image.  Fix by Menner <mix@gmx.org>.
- Fixed bgo#764808 - Wikipedia generates equations as SVGs and renders
  them, but uses fill="currentColor".  Since we don't let callers
  specify a starting state for CSS, we need to start with opaque black
  as the default current color.
- Added documentation for how to replace the deprecated
  rsvg_handle_set_size_callback().

5 files changed, 30 insertions, 15 deletions

diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index 07fa02a03e3..ee5ed190163 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.93 2017/02/17 17:03:19 joerg Exp $
+# $NetBSD: Makefile,v 1.94 2017/10/02 15:35:35 wiz Exp $
 
-DISTNAME=	librsvg-2.40.15
-PKGREVISION=	5
+DISTNAME=	librsvg-2.40.18
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/librsvg/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/graphics/librsvg/PLIST b/graphics/librsvg/PLIST
index b7288a07461..33b00b75961 100644
--- a/graphics/librsvg/PLIST
+++ b/graphics/librsvg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2017/02/12 06:52:24 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.17 2017/10/02 15:35:35 wiz Exp $
 bin/rsvg-convert
 include/librsvg-2.0/librsvg/librsvg-enum-types.h
 include/librsvg-2.0/librsvg/librsvg-features.h
@@ -23,7 +23,6 @@ share/gtk-doc/html/rsvg-2.0/api-index-deprecated.html
 share/gtk-doc/html/rsvg-2.0/api-index-full.html
 share/gtk-doc/html/rsvg-2.0/home.png
 share/gtk-doc/html/rsvg-2.0/index.html
-share/gtk-doc/html/rsvg-2.0/index.sgml
 share/gtk-doc/html/rsvg-2.0/left-insensitive.png
 share/gtk-doc/html/rsvg-2.0/left.png
 share/gtk-doc/html/rsvg-2.0/licence.html
@@ -39,3 +38,4 @@ share/gtk-doc/html/rsvg-2.0/rsvg.html
 share/gtk-doc/html/rsvg-2.0/style.css
 share/gtk-doc/html/rsvg-2.0/up-insensitive.png
 share/gtk-doc/html/rsvg-2.0/up.png
+share/thumbnailers/librsvg.thumbnailer
diff --git a/graphics/librsvg/distinfo b/graphics/librsvg/distinfo
index 63596921a9b..ec54db0ec74 100644
--- a/graphics/librsvg/distinfo
+++ b/graphics/librsvg/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.34 2016/05/21 13:43:42 ryoon Exp $
+$NetBSD: distinfo,v 1.35 2017/10/02 15:35:35 wiz Exp $
 
-SHA1 (librsvg-2.40.15.tar.xz) = 20dba5c91ffcd7690057d477f475553321e0ef86
-RMD160 (librsvg-2.40.15.tar.xz) = 2b037dcb326291eee4a5501e091ee2f196cd2376
-SHA512 (librsvg-2.40.15.tar.xz) = 1169c02247dbf3d71d3d4bfb1aa2580a4b1e243e1c2c6d1c86aaa09c54c66857b959df4358a1ca6a34ec5fbb34b9529963b993fc978ec1fe401dbc56ac460101
-Size (librsvg-2.40.15.tar.xz) = 554608 bytes
-SHA1 (patch-ab) = 684e885aec9af2cfeff9e9708e3be9e158bba3f9
+SHA1 (librsvg-2.40.18.tar.xz) = 7b2ef7dd55daae92a0b8fcb0a8b42aeb5246afa9
+RMD160 (librsvg-2.40.18.tar.xz) = 5d8200b411fcbdf8b73b48b0c0e23ce34dff2351
+SHA512 (librsvg-2.40.18.tar.xz) = faf503d0d881801ce129715e7ae979ee1675bd32beac9170b1889c94aac64caf486968bc86f3480463b84e94f28c1d805551ffdcb7068ecadd0688146e0fb182
+Size (librsvg-2.40.18.tar.xz) = 574384 bytes
+SHA1 (patch-ab) = c551fe8af953a5d54964730649a8590b4243f4db
+SHA1 (patch-test-driver) = 802362f69cc54ce59483715f4c943d629a1680a7
diff --git a/graphics/librsvg/patches/patch-ab b/graphics/librsvg/patches/patch-ab
index c16398004e4..dc05a42831b 100644
--- a/graphics/librsvg/patches/patch-ab
+++ b/graphics/librsvg/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.10 2013/12/10 00:25:18 prlw1 Exp $
+$NetBSD: patch-ab,v 1.11 2017/10/02 15:35:35 wiz Exp $
 
 Allow gdk-pixbuf2/loaders.mk to do its thing.
 
---- gdk-pixbuf-loader/Makefile.in.orig	2012-04-16 17:07:37.000000000 +0000
+--- gdk-pixbuf-loader/Makefile.in.orig	2017-07-20 01:15:24.000000000 +0000
 +++ gdk-pixbuf-loader/Makefile.in
-@@ -706,10 +706,6 @@ uninstall-am: uninstall-gdk_pixbuf_modul
- @ENABLE_PIXBUF_LOADER_TRUE@	$(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null
+@@ -854,10 +854,6 @@ uninstall-am: uninstall-gdk_pixbuf_modul
+ @ENABLE_PIXBUF_LOADER_TRUE@	$< > $@
  
  @ENABLE_PIXBUF_LOADER_TRUE@install-data-hook:
 -@ENABLE_PIXBUF_LOADER_TRUE@	if test -z "$(DESTDIR)"; then \
diff --git a/graphics/librsvg/patches/patch-test-driver b/graphics/librsvg/patches/patch-test-driver
new file mode 100644
index 00000000000..544b3cab62c
--- /dev/null
+++ b/graphics/librsvg/patches/patch-test-driver
@@ -0,0 +1,15 @@
+$NetBSD: patch-test-driver,v 1.1 2017/10/02 15:35:35 wiz Exp $
+
+Fix unportable test(1) operator.
+
+--- test-driver.orig	2017-07-20 01:11:47.000000000 +0000
++++ test-driver
+@@ -59,7 +59,7 @@ enable_hard_errors=yes
+ while test $# -gt 1; do
+  arg=${1%=*}
+  val=${1#*=}
+- if [ $arg == $val ]; then
++ if [ $arg = $val ]; then
+    val=$2
+    shift
+  fi