diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b53459ab4e8923321aad4983384f9b40da25f815..138a0a36f1310db0ebc3d6bff0aca0411e7b44dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -417,6 +417,7 @@ vs2019-x64: paths: - "${CI_PROJECT_DIR}/msvc-build/meson-logs" - "${CI_PROJECT_DIR}/msvc-build/tests/output" + allow_failure: true distcheck: stage: acceptance test diff --git a/Cargo.lock b/Cargo.lock index a6c044cbfa7cbb7021172d164f8a5503ec9106cc..33894163db17ec6c37caecc0b87d7ce9bd2baf42 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -215,9 +215,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" @@ -1082,7 +1082,7 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "librsvg" -version = "2.59.0-beta.1" +version = "2.59.0-beta.2" dependencies = [ "anyhow", "cairo-rs", @@ -1129,7 +1129,7 @@ dependencies = [ [[package]] name = "librsvg-c" -version = "2.58.91" +version = "2.58.92" dependencies = [ "cairo-rs", "cast", @@ -1901,16 +1901,16 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "1aee83dc281d5a3200d37b299acd13b81066ea126a7f16f0eae70fc9aed241d9" dependencies = [ "bytemuck", ] [[package]] name = "rsvg-bench" -version = "2.58.91" +version = "2.58.92" dependencies = [ "anyhow", "cairo-rs", @@ -1921,7 +1921,7 @@ dependencies = [ [[package]] name = "rsvg_convert" -version = "2.58.91" +version = "2.58.92" dependencies = [ "assert_cmd", "cairo-rs", diff --git a/Cargo.toml b/Cargo.toml index 1a95cc9a79cd1c16c8383312f7c92997e2ab54ab..811b414024c61d81beabdd0ac4041f81cdd49d93 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "2.58.91" +version = "2.58.92" authors = ["Federico Mena Quintero ", "Many others"] description = """ A library to render SVG images to Cairo surfaces. GNOME uses this to diff --git a/NEWS b/NEWS index 15b124592a1c6c3c76963eade7e2a1f3f482d9d4..17af8fc7348b07c9503002f5fbe652d20e120ce2 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,34 @@ +Version 2.58.92 +=============== + +librsvg crate version 2.59.0-beta.2 + +Librsvg is now part of Google's oss-fuzz and is fuzz-tested +automatically - see +https://gnome.pages.gitlab.gnome.org/librsvg/devel-docs/oss_fuzz.html +for details. Many thanks to correctmost for doing this work and for +keeping track of librsvg's entries in oss-fuzz. + +This release has two bug fixes from fuzz testing, and a new API call. + +- #1087 - Don't leak XML entities when the XML document fails to parse. + +- #1092 - Fix stack overflow in reference cycle. + +- #429 - Librsvg now supports cancellable rendering; you can start + rendering an RsvgHandle in one thread, and stop it from another + thread with a GCancellable. In the C API, you can use the + rsvg_handle_set_cancellable_for_rendering() function; in the Rust + API, CairoRenderer now has a with_cancellable() method. + +- Many build fixes for Windows, MacOS, iOS, and cross-compilation + (Amyspark, Guillaume Desmottes). + +- Continued refactoring for a render tree. + +- Many fixes to the documentation. + + Version 2.58.91 =============== diff --git a/devel-docs/releasing.rst b/devel-docs/releasing.rst index 07c0e3a3675403316899d283a4638aba9ed4576a..fc42dc1096bfd5b576a749a856bc399d1cafcb00 100644 --- a/devel-docs/releasing.rst +++ b/devel-docs/releasing.rst @@ -13,7 +13,7 @@ off items while making a release. already be increased but not released; double-check it). - ☐ Copy version number to ``Cargo.toml``. - ☐ Copy version number to ``doc/librsvg.toml``. -- ☐ Compute and write version number to ``rsvg/Cargo.toml``, see :ref:`crate version` below. +- ☐ Compute crate version number and write it to ``rsvg/Cargo.toml``, see :ref:`crate version` below. - ☐ Copy the crate version number to the example in `rsvg/src/lib.rs`. - ☐ ``cargo update`` - needed because you tweaked ``Cargo.toml``, and also to get new dependencies. diff --git a/doc/librsvg.toml b/doc/librsvg.toml index 7900347e35276f62269e706a241977ab35394ce3..2391e79ecdeaaac0dc94af5042d49a217e19adcc 100644 --- a/doc/librsvg.toml +++ b/doc/librsvg.toml @@ -1,5 +1,5 @@ [library] -version = "2.58.91" +version = "2.58.92" description = "Librsvg - load and render SVG documents" authors = "Librsvg developers" license = "LGPL-2.1-or-later" diff --git a/meson.build b/meson.build index 305180b3afdb392101fd0c02239b7fda22520929..3c05fb538c2c89d379667671576e607384fcca77 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('librsvg', 'c', - version: '2.58.91', # Keep this in sync with Cargo.toml, doc/librsvg.toml, rsvg/Cargo.toml + version: '2.58.92', # Keep this in sync with Cargo.toml, doc/librsvg.toml, rsvg/Cargo.toml meson_version: '>= 1.2.0', default_options: [ 'pkgconfig.relocatable=true', diff --git a/rsvg/Cargo.toml b/rsvg/Cargo.toml index 364c02ca3fe0418c8f55656330ccc3467787e872..9df4e1de397205ec378f1e2c043543ec4d5de3dd 100644 --- a/rsvg/Cargo.toml +++ b/rsvg/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "librsvg" documentation = "https://gnome.pages.gitlab.gnome.org/librsvg/doc/rsvg/index.html" -version = "2.59.0-beta.1" +version = "2.59.0-beta.2" authors.workspace = true description.workspace = true license.workspace = true diff --git a/rsvg/src/lib.rs b/rsvg/src/lib.rs index 7a809dcf3c823491a4c4278d9e485478bf18cdd7..233b7d5dbcdd80cc553659b6f49dcb9b373562bc 100644 --- a/rsvg/src/lib.rs +++ b/rsvg/src/lib.rs @@ -20,7 +20,7 @@ //! //! ```toml //! [dependencies] -//! librsvg = "2.59.0-beta.1" +//! librsvg = "2.59.0-beta.2" //! cairo-rs = "0.19" //! gio = "0.19" # only if you need streams //! ``` diff --git a/rsvg/src/test_utils/compare_surfaces.rs b/rsvg/src/test_utils/compare_surfaces.rs index 06100db97cf5753aba345fb296b246ccb49f8514..8d1d8fa36cbb89ce6c87bd940ad958cbaba51af7 100644 --- a/rsvg/src/test_utils/compare_surfaces.rs +++ b/rsvg/src/test_utils/compare_surfaces.rs @@ -72,7 +72,7 @@ pub fn compare_surfaces( let mut num_pixels_changed = 0; let mut max_diff = 0; - let black = Pixel::default().alpha(255); + let black = Pixel::default().with_alpha(255); { let mut diff_data = surf_diff.data().unwrap(); @@ -92,7 +92,7 @@ pub fn compare_surfaces( let a = pixel_diff.a; pixel_diff.map_rgb(|_| a) } else { - pixel_diff.alpha(255) + pixel_diff.with_alpha(255) } } else { black