Work around Debian #771047: use a non-blank SVG for the regression test

Inkscape loses the bounding box of a SVG with no content when it
converts it to EPS, and ImageMagick does not have a special case for
converting SVG to PNG with Inkscape in one step (which Inkscape can do);
it prefers to convert SVG to EPS with Inkscape, then EPS to whatever.

diff --git a/debian/changelog b/debian/changelog
index ba22c917d69c036f1b62f546dd35b590ec3bf728..9cec632606359a435c7445c677e1d7cc31473bdd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ ikiwiki (3.20141016.1) UNRELEASED; urgency=medium
   * blogspam: use the 2.0 JSON API (the 1.0 XML-RPC API has been EOL'd).
     Closes: #774441
 
   * blogspam: use the 2.0 JSON API (the 1.0 XML-RPC API has been EOL'd).
     Closes: #774441
 

+  [ Simon McVittie ]
+  * Work around imagemagick Debian bug #771047 by using a non-blank SVG
+    for the regression test, to avoid FTBFS in current unstable
+

  -- Joey Hess <joeyh@debian.org>  Mon, 20 Oct 2014 12:04:49 -0400
 
 ikiwiki (3.20141016) unstable; urgency=medium
  -- Joey Hess <joeyh@debian.org>  Mon, 20 Oct 2014 12:04:49 -0400
 
 ikiwiki (3.20141016) unstable; urgency=medium

diff --git a/t/img.t b/t/img.t
index 8c10d9b74155dfa13b66efbecc7b9bfef2af6c4c..2ea3abb24c353ffb16752988c2ace6064b839539 100755 (executable)
--- a/t/img.t
+++ b/t/img.t
@@ -26,7 +26,8 @@ ok(! system("rm -rf t/tmp; mkdir -p t/tmp/in"));
 ok(! system("cp t/img/redsquare.png t/tmp/in/redsquare.png"));
 
 if ($SVGS_WORK) {
 ok(! system("cp t/img/redsquare.png t/tmp/in/redsquare.png"));
 
 if ($SVGS_WORK) {

-       writefile("emptysquare.svg", "t/tmp/in", '<svg width="30" height="30"/>');
+       writefile("emptysquare.svg", "t/tmp/in",
+               '<svg width="30" height="30"><rect x="0" y="0" width="30" height="30" fill="blue"/></svg>');

 }
 
 # using different image sizes for different pages, so the pagenumber selection can be tested easily
 }
 
 # using different image sizes for different pages, so the pagenumber selection can be tested easily