ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

buildimage: Allow use of rsvg-convert as alternative to rsvg.

This commit is contained in:
Josh DuBois 2015-01-23 10:32:36 -06:00 committed by Alexandre Julliard
parent 1042684ecd
commit 52171a8b15
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -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

2
configure.ac
View File

@ -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.])

7
tools/buildimage
View File

@ -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(