From 89c02097a46f3facb35ec3e8ac35a6e66f198fa4 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Wed, 15 May 2024 10:14:21 +0200
Subject: [PATCH] Font provider

---
 Cargo.lock | 10 +++++++---
 Cargo.toml |  7 +++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d808b4f3..29c1a8fa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -561,7 +561,8 @@ dependencies = [
 [[package]]
 name = "fontdb"
 version = "0.16.2"
-source = "git+https://github.com/LaurenzV/fontdb?branch=custom#ad8e8061fc78270cd01f30a47b02982e3407fc54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3"
 dependencies = [
  "fontconfig-parser",
  "log",
@@ -1331,12 +1332,14 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 [[package]]
 name = "resvg"
 version = "0.41.0"
-source = "git+https://github.com/LaurenzV/resvg?branch=new_fontdb#d92ab2067e84427048e35e2ad660e4addb4f69cd"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2327ced609dadeed3e9702fec3e6b2ddd208758a9268d13e06566c6101ba533"
 dependencies = [
  "gif",
  "jpeg-decoder",
  "log",
  "pico-args",
+ "png",
  "rgb",
  "svgtypes",
  "tiny-skia",
@@ -1803,7 +1806,8 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94"
 [[package]]
 name = "usvg"
 version = "0.41.0"
-source = "git+https://github.com/LaurenzV/resvg?branch=new_fontdb#d92ab2067e84427048e35e2ad660e4addb4f69cd"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c704361d822337cfc00387672c7b59eaa72a1f0744f62b2a68aa228a0c6927d"
 dependencies = [
  "base64",
  "data-url",
diff --git a/Cargo.toml b/Cargo.toml
index 21224e2c..0f70bb0e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ svg2pdf = { path = ".", default-features = false, version = "0.9.1" }
 clap = { version = "4.4.2", features = ["derive"] }
 clap_complete = "4.4.3"
 clap_mangen = "0.2.14"
-fontdb = {git = "https://github.com/LaurenzV/fontdb", branch = "custom"}
+fontdb = "0.16"
 image = { version = "0.25.1", default-features = false, features = ["jpeg", "png", "gif"] }
 miniz_oxide = "0.7"
 once_cell = "1.18.0"
@@ -25,10 +25,10 @@ oxipng = { version = "9", default-features = false, features = ["filetime", "par
 pdf-writer = "0.9"
 pdfium-render = "0.8.6"
 termcolor = "1.2"
-usvg = { git = "https://github.com/LaurenzV/resvg", branch = "new_fontdb", default-features = false }
+usvg = { version = "0.41", default-features = false }
 tiny-skia = "0.11.4"
 unicode-properties = "0.1.1"
-resvg = { git = "https://github.com/LaurenzV/resvg", branch = "new_fontdb", default-features = false }
+resvg = { version = "0.41", default-features = false }
 subsetter = "0.1.1"
 ttf-parser = { version = "0.20.0" }
 siphasher = { version = "1.0.1"}
@@ -69,4 +69,3 @@ resvg = {workspace = true, optional = true }
 subsetter = { workspace = true, optional = true }
 ttf-parser = { workspace = true, optional = true }
 siphasher = { workspace = true, optional = true }
-