Merge branch 'prepare-2.58.92' into 'main'

Prepare 2.58.92

See merge request GNOME/librsvg!991

Author: Marge Bot

.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

Cargo.lock

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "2.58.91"
+version = "2.58.92"
 authors = ["Federico Mena Quintero <federico@gnome.org>", "Many others"]
 description = """
 A library to render SVG images to Cairo surfaces. GNOME uses this to

Cargo.toml

@@ -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 <use> 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
 ===============
 

NEWS

@@ -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<crate_version>` below.
+- ☐ Compute crate version number and write it to ``rsvg/Cargo.toml``, see :ref:`crate version<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.

devel-docs/releasing.rst

@@ -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"

doc/librsvg.toml

@@ -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',

meson.build

@@ -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

rsvg/Cargo.toml

@@ -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
 //! ```

rsvg/src/lib.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