rpms/librsvg2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 2.55.90

Browse Source
This commit is contained in:
Kalev Lember 2023-03-02 15:54:05 +01:00
parent d9e3ae4bb5
commit 3a2c309854
9 changed files with 165 additions and 476 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -92,3 +92,4 @@ librsvg-2.31.0.tar.bz2
/librsvg-2.54.4.tar.xz
/librsvg-2.54.5.tar.xz
/librsvg-2.55.1.tar.xz
/librsvg-2.55.90.tar.xz

26
0001-Fedora-Drop-dependencies-required-for-benchmarking.patch Normal file
View File

@ -0,0 +1,26 @@
From 54fec1d6f28aac6083643a7c130f9ba59297e9b2 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Tue, 8 Nov 2022 17:02:19 +0100
Subject: [PATCH] Fedora: Drop dependencies required for benchmarking
Drop criterion that is only required for benchmarking, which we don't do
during package builds.
---
Cargo.toml | 1 -
1 file changed, 1 deletion(-)
diff --git a/Cargo.toml b/Cargo.toml
index ed4bf8de..1f18ab3e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -90,7 +90,6 @@ assert_cmd = "2.0.2"
cairo-rs = { version = "0.16", features = ["png"] }
cast = "0.3.0"
chrono = "0.4.0"
-criterion = "0.3"
glib = "0.16"
libc = "0.2"
lopdf = "0.29.0"
--
2.39.2

54
0001-Update-the-nalgebra-crate.patch
View File

@ -1,54 +0,0 @@
From b0c51b70ba88778bceaef6a09645d50b7c47ad4b Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 9 Sep 2022 11:53:06 +0200
Subject: [PATCH 1/3] Update the nalgebra crate
---
Cargo.lock | 8 ++++----
Cargo.toml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 05992853..11a89191 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1047,9 +1047,9 @@ dependencies = [
[[package]]
name = "nalgebra"
-version = "0.29.0"
+version = "0.30.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d506eb7e08d6329505faa8a3a00a5dcc6de9f76e0c77e4b75763ae3c770831ff"
+checksum = "4fb2d0de08694bed883320212c18ee3008576bfe8c306f4c3c4a58b4876998be"
dependencies = [
"approx",
"matrixmultiply",
@@ -1898,9 +1898,9 @@ checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
[[package]]
name = "simba"
-version = "0.6.0"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0b7840f121a46d63066ee7a99fc81dcabbc6105e437cae43528cea199b5a05f"
+checksum = "c48e45e5961033db030b56ad67aef22e9c908c493a6e8348c0a0f6b93433cd77"
dependencies = [
"approx",
"num-complex",
diff --git a/Cargo.toml b/Cargo.toml
index 98ff1c20..4b7e4214 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -64,7 +64,7 @@ language-tags = "0.3.1"
libc = "0.2"
locale_config = "*" # recommended explicitly by locale_config's README.md
markup5ever = "0.10"
-nalgebra = "0.29.0"
+nalgebra = "0.30.1"
num-traits = "0.2"
once_cell = "1.2.0"
pango = { version = "0.15", features = ["v1_46"] }
--
2.37.3

192
0002-Fedora-Drop-dependencies-required-for-benchmarking.patch
View File

@ -1,28 +1,93 @@
From 80334a27054aa3e5d813646b5068258208cca834 Mon Sep 17 00:00:00 2001
From c7a97807bb3bd96f452dde103163f171be36864a Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Tue, 8 Nov 2022 17:02:19 +0100
Subject: [PATCH 2/3] Fedora: Drop dependencies required for benchmarking
Subject: [PATCH] Fedora: Drop dependencies required for benchmarking
Drop criterion that is only required for benchmarking, which we don't do
during package builds.
---
Cargo.lock | 159 -----------------------------------------------------
Cargo.lock | 198 +----------------------------------------------------
Cargo.toml | 1 -
2 files changed, 160 deletions(-)
2 files changed, 3 insertions(+), 196 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 11a89191..300c8758 100644
index dbd032fe..3d2ca998 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -123,7 +123,6 @@ dependencies = [
"lazy_static",
"memchr",
"regex-automata",
@@ -47,7 +47,7 @@ version = "2.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba45b8163c49ab5f972e59a8a5a03b6d2972619d486e19ec9fe744f7c2753d3c"
dependencies = [
- "bstr 1.0.1",
+ "bstr",
"doc-comment",
"predicates",
"predicates-core",
@@ -55,17 +55,6 @@ dependencies = [
"wait-timeout",
]
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
[[package]]
name = "autocfg"
version = "1.1.0"
@@ -105,18 +94,6 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-[[package]]
-name = "bstr"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
-dependencies = [
- "lazy_static",
- "memchr",
- "regex-automata",
- "serde",
-]
-
[[package]]
name = "bstr"
version = "1.0.1"
@@ -214,17 +191,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "clap"
-version = "2.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
-dependencies = [
- "bitflags",
- "textwrap",
- "unicode-width",
-]
-
[[package]]
name = "clap"
version = "4.0.27"
@@ -246,7 +212,7 @@ version = "4.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7b3c9eae0de7bf8e3f904a5e40612b21fb2e2e566456d177809a48b892d24da"
dependencies = [
- "clap 4.0.27",
+ "clap",
]
[[package]]
@@ -252,42 +251,6 @@ dependencies = [
@@ -314,42 +280,6 @@ dependencies = [
"cfg-if",
]
@ -34,7 +99,7 @@ index 11a89191..300c8758 100644
-dependencies = [
- "atty",
- "cast",
- "clap",
- "clap 2.34.0",
- "criterion-plot",
- "csv",
- "itertools",
@ -65,8 +130,8 @@ index 11a89191..300c8758 100644
[[package]]
name = "crossbeam-channel"
version = "0.5.6"
@@ -360,28 +323,6 @@ dependencies = [
"syn 1.0.99",
@@ -420,28 +350,6 @@ dependencies = [
"syn 1.0.103",
]
-[[package]]
@ -75,7 +140,7 @@ index 11a89191..300c8758 100644
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
-dependencies = [
- "bstr",
- "bstr 0.2.17",
- "csv-core",
- "itoa 0.4.8",
- "ryu",
@ -92,9 +157,9 @@ index 11a89191..300c8758 100644
-]
-
[[package]]
name = "data-url"
version = "0.1.1"
@@ -761,12 +702,6 @@ dependencies = [
name = "cxx"
version = "1.0.82"
@@ -911,12 +819,6 @@ dependencies = [
"system-deps",
]
@ -107,17 +172,20 @@ index 11a89191..300c8758 100644
[[package]]
name = "heck"
version = "0.4.0"
@@ -875,7 +810,6 @@ dependencies = [
@@ -1074,9 +976,8 @@ dependencies = [
"cairo-rs",
"cast",
"chrono",
"clap",
- "clap 4.0.27",
+ "clap",
"clap_complete",
- "criterion",
"cssparser",
"data-url",
"encoding",
@@ -1174,12 +1108,6 @@ version = "1.14.0"
@@ -1383,12 +1284,6 @@ version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0"
checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
-[[package]]
-name = "oorandom"
@ -126,17 +194,17 @@ index 11a89191..300c8758 100644
-checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
-
[[package]]
name = "pango"
version = "0.15.10"
@@ -1358,34 +1286,6 @@ version = "0.3.25"
name = "os_str_bytes"
version = "6.4.1"
@@ -1574,34 +1469,6 @@ version = "0.3.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
-[[package]]
-name = "plotters"
-version = "0.3.3"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "716b4eeb6c4a1d3ecc956f75b43ec2e8e8ba80026413e70a3f41fd3313d3492b"
-checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97"
-dependencies = [
- "num-traits",
- "plotters-backend",
@ -162,8 +230,8 @@ index 11a89191..300c8758 100644
-
[[package]]
name = "png"
version = "0.17.6"
@@ -1776,15 +1676,6 @@ dependencies = [
version = "0.17.7"
@@ -2005,15 +1872,6 @@ dependencies = [
"bytemuck",
]
@ -179,7 +247,7 @@ index 11a89191..300c8758 100644
[[package]]
name = "scopeguard"
version = "1.1.0"
@@ -1839,16 +1730,6 @@ dependencies = [
@@ -2074,16 +1932,6 @@ dependencies = [
"serde_derive",
]
@ -195,9 +263,25 @@ index 11a89191..300c8758 100644
-
[[package]]
name = "serde_derive"
version = "1.0.144"
@@ -2182,16 +2063,6 @@ dependencies = [
"syn 1.0.99",
version = "1.0.147"
@@ -2348,15 +2196,6 @@ dependencies = [
"syn 0.15.44",
]
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
[[package]]
name = "thiserror"
version = "1.0.37"
@@ -2426,16 +2265,6 @@ dependencies = [
"syn 1.0.103",
]
-[[package]]
@ -213,7 +297,7 @@ index 11a89191..300c8758 100644
[[package]]
name = "tinyvec"
version = "1.6.0"
@@ -2300,17 +2171,6 @@ dependencies = [
@@ -2537,17 +2366,6 @@ dependencies = [
"libc",
]
@ -231,51 +315,35 @@ index 11a89191..300c8758 100644
[[package]]
name = "wasi"
version = "0.9.0+wasi-snapshot-preview1"
@@ -2383,16 +2243,6 @@ version = "0.2.82"
@@ -2620,16 +2438,6 @@ version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"
checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
-[[package]]
-name = "web-sys"
-version = "0.3.59"
-version = "0.3.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1"
-checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
[[package]]
name = "wide"
version = "0.7.4"
@@ -2419,15 +2269,6 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
name = "weezl"
version = "0.1.7"
diff --git a/Cargo.toml b/Cargo.toml
index 4b7e4214..77a412c0 100644
index ed4bf8de..1f18ab3e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -85,7 +85,6 @@ assert_cmd = "2.0.2"
cairo-rs = { version = "0.15", features = ["png"] }
@@ -90,7 +90,6 @@ assert_cmd = "2.0.2"
cairo-rs = { version = "0.16", features = ["png"] }
cast = "0.3.0"
chrono = "0.4.0"
-criterion = "0.3"
glib = "0.15"
glib = "0.16"
libc = "0.2"
lopdf = "0.26.0"
lopdf = "0.29.0"
--
2.37.3
2.38.1

76
0003-Update-the-lopdf-crate.patch
View File

@ -1,76 +0,0 @@
From 056e7554857b248dda01afbbb8cb062ffe6f6d9e Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Tue, 8 Nov 2022 17:25:01 +0100
Subject: [PATCH 3/3] Update the lopdf crate
---
Cargo.lock | 19 ++++++++++---------
Cargo.toml | 2 +-
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 300c8758..3da93d02 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -889,28 +889,23 @@ dependencies = [
[[package]]
name = "lopdf"
-version = "0.26.0"
+version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b49a0272112719d0037ab63d4bb67f73ba659e1e90bc38f235f163a457ac16f3"
+checksum = "8146695b97752d9c66da0092c6364f8f3ca683f5ea34341db21e5550c3b8c4f4"
dependencies = [
"chrono",
"dtoa",
"encoding",
"flate2",
"itoa 0.4.8",
+ "lazy_static",
"linked-hash-map",
"log",
- "lzw",
"pom",
"time 0.2.27",
+ "weezl",
]
-[[package]]
-name = "lzw"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084"
-
[[package]]
name = "mac"
version = "0.1.1"
@@ -2243,6 +2238,12 @@ version = "0.2.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"
+[[package]]
+name = "weezl"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
+
[[package]]
name = "wide"
version = "0.7.4"
diff --git a/Cargo.toml b/Cargo.toml
index 77a412c0..d62250df 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -87,7 +87,7 @@ cast = "0.3.0"
chrono = "0.4.0"
glib = "0.15"
libc = "0.2"
-lopdf = "0.26.0"
+lopdf = "0.27.0"
matches = "0.1"
pango = "0.15"
pangocairo = "0.15"
--
2.37.3

134
0004-Update-the-yeslogic-fontconfig-sys-crate-to-4.0.1.patch
View File

@ -1,134 +0,0 @@
From d5cc561ffaf9eeef0d5fa2851c28d744e98c13c0 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Thu, 24 Nov 2022 14:35:26 +0100
Subject: [PATCH 4/5] Update the yeslogic-fontconfig-sys crate to 4.0.1
... and adapt tests/src/utils.rs for changed fontconfig_sys import
paths.
Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/773>
---
Cargo.lock | 25 +++++++++++++++++++++++--
Cargo.toml | 2 +-
tests/src/utils.rs | 13 +++++++------
3 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 3da93d02..83b3d405 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -357,6 +357,15 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
+[[package]]
+name = "dlib"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794"
+dependencies = [
+ "libloading",
+]
+
[[package]]
name = "doc-comment"
version = "0.3.3"
@@ -799,6 +808,16 @@ version = "0.2.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
+[[package]]
+name = "libloading"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+dependencies = [
+ "cfg-if",
+ "winapi",
+]
+
[[package]]
name = "librsvg"
version = "2.55.1"
@@ -2333,10 +2352,12 @@ dependencies = [
[[package]]
name = "yeslogic-fontconfig-sys"
-version = "2.11.2"
+version = "4.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38e47154248a2dba5ca6965e26b1a59146210736ea9b862362b6d72682e57f8d"
+checksum = "ec657fd32bbcbeaef5c7bc8e10b3db95b143fab8db0a50079773dbf936fd4f73"
dependencies = [
"const-cstr",
+ "dlib",
+ "once_cell",
"pkg-config",
]
diff --git a/Cargo.toml b/Cargo.toml
index d62250df..ae48bbfa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -98,7 +98,7 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
tempfile = "3"
test-generator = "0.3"
-yeslogic-fontconfig-sys = "2.11.1"
+yeslogic-fontconfig-sys = "4.0.1"
[build-dependencies]
regex = "1.3.9"
diff --git a/tests/src/utils.rs b/tests/src/utils.rs
index fb4ad2de..e70eb04f 100644
--- a/tests/src/utils.rs
+++ b/tests/src/utils.rs
@@ -49,7 +49,6 @@ pub fn render_document<F: FnOnce(&cairo::Context)>(
#[cfg(system_deps_have_pangoft2)]
mod pango_ft2 {
use super::*;
- use fontconfig_sys::fontconfig;
use glib::prelude::*;
use pangocairo::FontMap;
@@ -59,7 +58,7 @@ mod pango_ft2 {
// This is not bound in gtk-rs, and PangoFcFontMap is not even exposed, so we'll bind it by hand.
fn pango_fc_font_map_set_config(
font_map: *mut libc::c_void,
- config: *mut fontconfig::FcConfig,
+ config: *mut fontconfig_sys::FcConfig,
);
}
@@ -73,15 +72,17 @@ mod pango_ft2 {
"tests/resources/Roboto-BoldItalic.ttf",
];
- let config = fontconfig::FcConfigCreate();
- if fontconfig::FcConfigSetCurrent(config) == 0 {
+ let config = fontconfig_sys::FcConfigCreate();
+ if fontconfig_sys::FcConfigSetCurrent(config) == 0 {
panic!("Could not set a fontconfig configuration");
}
for path in &font_paths {
let path_cstring = CString::new(*path).unwrap();
- if fontconfig::FcConfigAppFontAddFile(config, path_cstring.as_ptr() as *const _) == 0 {
+ if fontconfig_sys::FcConfigAppFontAddFile(config, path_cstring.as_ptr() as *const _)
+ == 0
+ {
panic!("Could not load font file {} for tests; aborting", path,);
}
}
@@ -90,7 +91,7 @@ mod pango_ft2 {
let raw_font_map: *mut pango::ffi::PangoFontMap = font_map.to_glib_none().0;
pango_fc_font_map_set_config(raw_font_map as *mut _, config);
- fontconfig::FcConfigDestroy(config);
+ fontconfig_sys::FcConfigDestroy(config);
FontMap::set_default(Some(font_map.downcast::<pangocairo::FontMap>().unwrap()));
}
--
2.38.1

141
0005-Update-the-lopdf-crate-to-0.29.0.patch
View File

@ -1,141 +0,0 @@
From 3805ec26ffb2d8362bc762d4421115064cba7a39 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Thu, 24 Nov 2022 14:37:39 +0100
Subject: [PATCH 5/5] Update the lopdf crate to 0.29.0
... and adapt tests/src/predicates/pdf.rs for lopdf API change from f64
floats to f32.
Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/774>
---
Cargo.lock | 8 +++-----
Cargo.toml | 2 +-
tests/src/predicates/pdf.rs | 32 ++++++++++++++++----------------
3 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 83b3d405..1da0ddc5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -908,16 +908,14 @@ dependencies = [
[[package]]
name = "lopdf"
-version = "0.27.0"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8146695b97752d9c66da0092c6364f8f3ca683f5ea34341db21e5550c3b8c4f4"
+checksum = "de0f69c40d6dbc68ebac4bf5aec3d9978e094e22e29fcabd045acd9cec74a9dc"
dependencies = [
"chrono",
- "dtoa",
"encoding",
"flate2",
- "itoa 0.4.8",
- "lazy_static",
+ "itoa 1.0.4",
"linked-hash-map",
"log",
"pom",
diff --git a/Cargo.toml b/Cargo.toml
index ae48bbfa..514b1c69 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -87,7 +87,7 @@ cast = "0.3.0"
chrono = "0.4.0"
glib = "0.15"
libc = "0.2"
-lopdf = "0.27.0"
+lopdf = "0.29.0"
matches = "0.1"
pango = "0.15"
pangocairo = "0.15"
diff --git a/tests/src/predicates/pdf.rs b/tests/src/predicates/pdf.rs
index 62a3da4b..f7872d71 100644
--- a/tests/src/predicates/pdf.rs
+++ b/tests/src/predicates/pdf.rs
@@ -21,8 +21,8 @@ impl PdfPredicate {
pub fn with_page_size(
self: Self,
idx: usize,
- width_in_points: f64,
- height_in_points: f64,
+ width_in_points: f32,
+ height_in_points: f32,
) -> DetailPredicate<Self> {
DetailPredicate::<Self> {
p: self,
@@ -101,13 +101,13 @@ enum Detail {
/// Note that `w` and `h` given in `UserUnit`, which is by default 1.0 = 1/72 inch.
#[derive(Debug)]
struct Dimensions {
- w: f64,
- h: f64,
- unit: f64, // UserUnit, in points (1/72 of an inch)
+ w: f32,
+ h: f32,
+ unit: f32, // UserUnit, in points (1/72 of an inch)
}
impl Dimensions {
- pub fn from_media_box(obj: &lopdf::Object, unit: Option<f64>) -> lopdf::Result<Dimensions> {
+ pub fn from_media_box(obj: &lopdf::Object, unit: Option<f32>) -> lopdf::Result<Dimensions> {
let a = obj.as_array()?;
Ok(Dimensions {
w: a[2].as_float()?,
@@ -116,11 +116,11 @@ impl Dimensions {
})
}
- pub fn width_in_pt(self: &Self) -> f64 {
+ pub fn width_in_pt(self: &Self) -> f32 {
self.w * self.unit
}
- pub fn height_in_pt(self: &Self) -> f64 {
+ pub fn height_in_pt(self: &Self) -> f32 {
self.h * self.unit
}
}
@@ -134,15 +134,15 @@ impl fmt::Display for Dimensions {
impl cmp::PartialEq for Dimensions {
fn eq(&self, other: &Self) -> bool {
approx_eq!(
- f64,
+ f32,
self.width_in_pt(),
other.width_in_pt(),
- epsilon = 0.000_001
+ epsilon = 0.0001
) && approx_eq!(
- f64,
+ f32,
self.height_in_pt(),
other.height_in_pt(),
- epsilon = 0.000_001
+ epsilon = 0.0001
)
}
}
@@ -212,14 +212,14 @@ impl DetailPredicate<PdfPredicate> {
// Extensions to lopdf::Object; can be removed after lopdf 0.26
trait ObjExt {
/// Get the object value as a float.
- /// Unlike as_f64() this will also cast an Integer to a Real.
- fn as_float(&self) -> lopdf::Result<f64>;
+ /// Unlike as_f32() this will also cast an Integer to a Real.
+ fn as_float(&self) -> lopdf::Result<f32>;
}
impl ObjExt for lopdf::Object {
- fn as_float(&self) -> lopdf::Result<f64> {
+ fn as_float(&self) -> lopdf::Result<f32> {
match *self {
- lopdf::Object::Integer(ref value) => Ok(*value as f64),
+ lopdf::Object::Integer(ref value) => Ok(*value as f32),
lopdf::Object::Real(ref value) => Ok(*value),
_ => Err(lopdf::Error::Type),
}
--
2.38.1

15
librsvg2.spec
View File

@ -14,20 +14,16 @@
Name: librsvg2
Summary: An SVG library based on cairo
Version: 2.55.1
Release: 5%{?dist}
Version: 2.55.90
Release: 1%{?dist}
License: LGPLv2+
URL: https://wiki.gnome.org/Projects/LibRsvg
Source0: https://download.gnome.org/sources/librsvg/2.54/librsvg-%{version}.tar.xz
Source0: https://download.gnome.org/sources/librsvg/2.55/librsvg-%{version}.tar.xz
%if ! 0%{?bundled_rust_deps}
# Patches to build with Fedora-packaged rust crates
Patch: 0001-Update-the-nalgebra-crate.patch
Patch: 0002-Fedora-Drop-dependencies-required-for-benchmarking.patch
Patch: 0003-Update-the-lopdf-crate.patch
Patch: 0004-Update-the-yeslogic-fontconfig-sys-crate-to-4.0.1.patch
Patch: 0005-Update-the-lopdf-crate-to-0.29.0.patch
Patch: 0001-Fedora-Drop-dependencies-required-for-benchmarking.patch
%endif
BuildRequires: chrpath
@ -141,6 +137,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COMPILING.md
%{_mandir}/man1/rsvg-convert.1*
%changelog
* Thu Mar 02 2023 Kalev Lember <klember@redhat.com> - 2.55.90-1
- Update to 2.55.90
* Sun Feb 05 2023 Fabio Valentini <decathorpe@gmail.com> - 2.55.1-5
- Rebuild for fixed frame pointer compiler flags in Rust RPM macros.

2
sources
View File

@ -1 +1 @@
SHA512 (librsvg-2.55.1.tar.xz) = ea6ddcb1bdb88dd49215d848304543c244843ff2f5bd02c55678d838c997a02ee5592a18cc341dea542243b723839919bd4934d1137a7211dd4b5dc7177e988e
SHA512 (librsvg-2.55.90.tar.xz) = 514607e2cf963ed95637469a2b44f8c93eaaca56e65a3747219c1a5a22441caca4f708a3bce172c5ab111fdfe39f1de5800fd31dfb1fce29857fbd9e96025036