From 52171a8b1553f9e484c3519a721ecdc8d73a31f4 Mon Sep 17 00:00:00 2001
From: Josh DuBois <duboisj@codeweavers.com>
Date: Fri, 23 Jan 2015 10:32:36 -0600
Subject: [PATCH] buildimage: Allow use of rsvg-convert as alternative to rsvg.

---
 configure        | 2 +-
 configure.ac     | 2 +-
 tools/buildimage | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 4774513865b..7413f28eddf 100755
--- a/configure
+++ b/configure
@@ -5771,7 +5771,7 @@ fi
 done
 test -n "$FONTFORGE" || FONTFORGE="false"
 
-  for ac_prog in rsvg
+  for ac_prog in rsvg-convert rsvg
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
diff --git a/configure.ac b/configure.ac
index b40fde49bb6..95c230b2623 100644
--- a/configure.ac
+++ b/configure.ac
@@ -284,7 +284,7 @@ then
 else
   test "$srcdir" = . || AC_MSG_ERROR([Maintainer mode cannot work out of tree.])
   AC_CHECK_PROGS(FONTFORGE, fontforge, false)
-  AC_CHECK_PROGS(RSVG, rsvg, false)
+  AC_CHECK_PROGS(RSVG, rsvg-convert rsvg, false)
   AC_CHECK_PROGS(CONVERT, convert, false)
   AC_CHECK_PROGS(ICOTOOL, icotool, false)
   test "$FONTFORGE" != "false" || AC_MSG_ERROR([You need fontforge to rebuild fonts in maintainer mode.])
diff --git a/tools/buildimage b/tools/buildimage
index 2216ad82d47..0a7e466870f 100755
--- a/tools/buildimage
+++ b/tools/buildimage
@@ -141,7 +141,12 @@ sub svg_element_start
 }
 
 # Render the SVG image
-shell $rsvg, $svgFileName, $renderedSVGFileName;
+my @rsvgCmd;
+push(@rsvgCmd, $rsvg);
+push(@rsvgCmd, $svgFileName);
+push(@rsvgCmd, "-o") if ($rsvg eq "rsvg-convert");
+push(@rsvgCmd, $renderedSVGFileName);
+shell @rsvgCmd;
 
 # Render the images in the SVG
 my $parser = new XML::Parser(
-- 
2.11.4.GIT