From 94c47dd8f4072e5c03baeabe317a25cfc1ad50a4 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 9 Jun 2021 18:20:57 +0100
Subject: [PATCH] cargo deps: Update to usvg 0.14 and adjust all command lines

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 Cargo.lock     | 31 +++++++++++--------------------
 Cargo.toml     |  2 +-
 media-scraper  |  2 +-
 src/bundles.rs |  2 +-
 usvg-processor |  2 +-
 5 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index aae8f22b..28c727fd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1125,7 +1125,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e58903f4f8d5b58c7d300908e4ebe5289c1bfdf5587964330f12023b8ff17fd1"
 dependencies = [
  "log 0.4.14",
- "memmap2 0.2.3",
+ "memmap2",
  "ttf-parser 0.12.1",
 ]
 
@@ -1830,9 +1830,9 @@ dependencies = [
 
 [[package]]
 name = "kurbo"
-version = "0.7.1"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16cb54cd28cb3d2e964d9444ca185676a94fd9b7cce5f02b22c717947ed8e9a2"
+checksum = "e30b1df631d23875f230ed3ddd1a88c231f269a04b2044eb6ca87e763b5f4c42"
 dependencies = [
  "arrayvec 0.5.2",
 ]
@@ -1970,15 +1970,6 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
 
-[[package]]
-name = "memmap2"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b70ca2a6103ac8b665dc150b142ef0e4e89df640c9e6cf295d189c3caebe5a"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "memmap2"
 version = "0.2.3"
@@ -2804,9 +2795,9 @@ dependencies = [
 
 [[package]]
 name = "pico-args"
-version = "0.3.4"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b9b4df73455c861d7cbf8be42f01d3b373ed7f02e378d55fa84eafc6f638b1"
+checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468"
 
 [[package]]
 name = "pin-project-lite"
@@ -3447,9 +3438,9 @@ dependencies = [
 
 [[package]]
 name = "roxmltree"
-version = "0.13.1"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf7d7b1ea646d380d0e8153158063a6da7efe30ddbf3184042848e3f8a6f671"
+checksum = "921904a62e410e37e215c40381b7117f830d9d89ba60ab5236170541dd25646b"
 dependencies = [
  "xmlparser",
 ]
@@ -4611,9 +4602,9 @@ checksum = "110352d4e9076c67839003c7788d8604e24dcded13e0b375af3efaa8cf468517"
 
 [[package]]
 name = "usvg"
-version = "0.13.1"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49cf4a80e688e21577387cf750f0d6c18cd0dfc524ba9cf3ef7e01eae5301288"
+checksum = "ef8352f317d8f9a918ba5154797fb2a93e2730244041cf7d5be35148266adfa5"
 dependencies = [
  "base64 0.13.0",
  "data-url",
@@ -4621,7 +4612,7 @@ dependencies = [
  "fontdb",
  "kurbo",
  "log 0.4.14",
- "memmap2 0.1.0",
+ "memmap2",
  "pico-args",
  "rctree",
  "roxmltree",
@@ -4629,7 +4620,7 @@ dependencies = [
  "simplecss",
  "siphasher 0.2.3",
  "svgtypes",
- "ttf-parser 0.9.0",
+ "ttf-parser 0.12.1",
  "unicode-bidi",
  "unicode-script",
  "unicode-vo",
diff --git a/Cargo.toml b/Cargo.toml
index f0252702..ef3f54a0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,7 @@ authors=["Ian Jackson <ijackson@chiark.greenend.org.uk>",
 members=["cli", "wasm", "daemon", "wdriver", "apitest"]
 
 [build-dependencies]
-usvg="0.13"
+usvg="0.14"
 bundle-sources="0.0.1"
 
 
diff --git a/media-scraper b/media-scraper
index 1eecd4a1..5090ff5c 100755
--- a/media-scraper
+++ b/media-scraper
@@ -275,7 +275,7 @@ END
 	    print $makefile <<END or die $!;
 LIBRARY_CLEAN += $ncoloured
 $ncoloured: $lupstream \$(MAKEFILE_DEP) \$(USVG_DEP) $makepath
-	\$(USVG_CMD) -c - <\$< >$cfp
+	\$(USVG_CMD) - -c <\$< >$cfp
 END
 	  }
 	  $ci++;
diff --git a/src/bundles.rs b/src/bundles.rs
index 8490d8cb..62c434e1 100644
--- a/src/bundles.rs
+++ b/src/bundles.rs
@@ -863,7 +863,7 @@ fn make_usvg(instance_name: &str, bundle_name: &str, za: &mut IndexedZip,
       let mut usvg1 = tempfile::tempfile_in(&svg_dir)
         .context("create temporary usvg").map_err(IE::from)?;
 
-      let got = Command::new(&config().usvg_bin).args(&["-c","-"])
+      let got = Command::new(&config().usvg_bin).args(&["-","-c"])
         .stdin(input)
         .stdout(usvg1.try_clone().context("dup usvg1").map_err(IE::from)?)
         .output().context("run usvg").map_err(IE::from)?;
diff --git a/usvg-processor b/usvg-processor
index c043cd2a..07263f98 100755
--- a/usvg-processor
+++ b/usvg-processor
@@ -26,5 +26,5 @@ sub add_lic () {
 add_lic();
 
 flush STDOUT or die $!;
-$!=0; $?=0; system qw(sh -ec), "exec $usvg -c -" and die "exec usvg: $? $!";
+$!=0; $?=0; system qw(sh -ec), "exec $usvg - -c" and die "exec usvg: $? $!";
 rename "$out.tmp", $out or die $!;
-- 
2.30.2