From cb1a144cf6906b01e1e345aafdc16da6c0138781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Vasconcellos?= Date: Tue, 17 Sep 2024 03:53:18 -0300 Subject: [PATCH] Bring back custom fork - Bump the minimum pdfium lib api version (updated bundled lib in native-deps) - Custom fork is still required because upstream added a hard limit on chono version 0.4.31, which is incompatible with some of our dependencies which require newer versions --- Cargo.lock | 33 +++------------------------------ crates/images/Cargo.toml | 13 +++++++++---- 2 files changed, 12 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e08740161aad..5118f358b499 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -654,15 +654,12 @@ dependencies = [ "itertools 0.10.5", "lazy_static", "lazycell", - "log", - "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash 1.1.0", "shlex", "syn 2.0.74", - "which", ] [[package]] @@ -3627,7 +3624,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core 0.52.0", + "windows-core 0.51.1", ] [[package]] @@ -6167,11 +6164,9 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pdfium-render" -version = "0.8.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf21aa9bd11aa175e8755e0dbc613affe885e149c4b3ee4ac6d2c183260e727" +version = "0.8.25" +source = "git+https://github.com/HeavenVolkoff/pdfium-render.git?rev=7518e39c1b#7518e39c1b0f5bdede0e6e920f28d20415317352" dependencies = [ - "bindgen", "bitflags 2.6.0", "bytemuck", "bytes", @@ -6608,16 +6603,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" -[[package]] -name = "prettyplease" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" -dependencies = [ - "proc-macro2", - "syn 2.0.74", -] - [[package]] name = "prisma-cli" version = "0.1.0" @@ -11308,18 +11293,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - [[package]] name = "widestring" version = "1.1.0" diff --git a/crates/images/Cargo.toml b/crates/images/Cargo.toml index ed74753a6f43..d6cda860f664 100644 --- a/crates/images/Cargo.toml +++ b/crates/images/Cargo.toml @@ -23,7 +23,12 @@ tracing = { workspace = true } # Specific Images dependencies bincode = { version = "=2.0.0-rc.3", features = ["alloc", "derive"], optional = true } # Disable defaults for libheif* to avoid bindgen and use pre-compiled headers -libheif-rs = { version = "1.0", default-features = false, optional = true } -libheif-sys = { version = "2.1", default-features = false, optional = true } -pdfium-render = { version = "0.8", features = ["image", "sync", "thread_safe"] } -resvg = "0.43.0" +libheif-rs = { version = "1.0", default-features = false, optional = true } +libheif-sys = { version = "2.1", default-features = false, optional = true } +resvg = "0.43.0" + +[dependencies.pdfium-render] +default-features = false +features = ["image", "pdfium_6666", "sync", "thread_safe"] +git = "https://github.com/HeavenVolkoff/pdfium-render.git" +rev = "7518e39c1b"