[tools] buildimage: Allow use of rsvg-convert as alternative to rsvg. (resend)
Josh DuBois
duboisj at codeweavers.com
Fri Jan 23 11:13:46 CST 2015
librsvg no longer appears to include the 'rsvg' utility: 'rsvg-convert'
is the new equivalent.
(re-sent with a patch attached)
-------------- next part --------------
From 70998e72973c7b182c4dacf8f86719265979cffb Mon Sep 17 00:00:00 2001
From: Josh DuBois <duboisj at codeweavers.com>
Date: Fri, 23 Jan 2015 10:32:36 -0600
Subject: 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 b6660bd..879f7ef 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 rsvg-convert
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 b40fde4..57adcc3 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 rsvg-convert, 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 2216ad8..0a7e466 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(
--
1.8.5.2 (Apple Git-48)
More information about the wine-patches
mailing list