Skip to content
Snippets Groups Projects
Commit 27f95590 authored by Apertis CI's avatar Apertis CI
Browse files

Merge updates from debian/buster

parents c92fa11b 622582de
No related branches found
No related tags found
1 merge request!1Proposed updates/debian/buster/c92fa11b
Pipeline #175398 failed
Pipeline: librsvg

#175401

    librsvg (2.44.10-2.1) unstable; urgency=high
    * Non-maintainer upload.
    * debian/patches/keep-positive-radii.patch: backport an upstream fix for
    an assertion error where radii should always be positive
    (Closes: #927886)
    -- Boyuan Yang <byang@debian.org> Thu, 25 Apr 2019 15:55:18 -0400
    librsvg (2.44.10-2) unstable; urgency=medium
    * debian/patches/typenum-i386-ftbfs.patch: backport an upstream fix for a
    build failure in the vendored typenum crate on i386 (LP: #1823426)
    (Closes: #926840)
    * debian/patches/i386-rounding-errors.patch: fix a rounding error on i386
    that would result in a unit test failure
    -- Olivier Tilloy <olivier.tilloy@canonical.com> Thu, 11 Apr 2019 09:29:30 +0100
    librsvg (2.44.10-1) unstable; urgency=medium
    * New upstream release
    ......
    Description: fix a rounding error on i386 that would result in a unit test failure
    Author: Olivier Tilloy <olivier.tilloy@canonical.com>
    Origin: https://gitlab.gnome.org/GNOME/librsvg/commit/aaef7bb37c9f0cceffc3bdf2138ec80242349653
    --- a/rsvg_internals/src/marker.rs
    +++ b/rsvg_internals/src/marker.rs
    @@ -589,7 +589,9 @@ fn find_outgoing_directionality_forwards
    // Normalizes an angle to [0.0, 2*PI)
    fn normalize_angle(mut angle: f64) -> f64 {
    - if angle < 0.0 {
    + if angle.abs() < std::f64::EPSILON {
    + angle = angle.abs();
    + } else if angle < 0.0 {
    while angle < 0.0 {
    angle += PI * 2.0;
    }
    From: Federico Mena Quintero <federico@gnome.org>
    Date: Sat, 29 Dec 2018 12:32:08 -0600
    Subject: Morphology needs positive radii even after the transformation
    This is the same pattern as in gaussian_blur.rs; the paffine
    transformation can leave us with negative radii, so take their
    absolute value after the transformation.
    This fixes assertion error (crashing) when nagative r takes place.
    Forwarded: https://gitlab.gnome.org/GNOME/librsvg/issues/395
    Applied-Upstream: https://gitlab.gnome.org/GNOME/librsvg/commit/4ef7f198fceb8fb4a544f4768174af5b11fc9bcc
    Bug-Debian: https://bugs.debian.org/927886
    Signed-off-by: Boyuan Yang <byang@debian.org>
    ---
    rsvg_internals/src/filters/morphology.rs | 4 ++++
    1 file changed, 4 insertions(+)
    diff --git a/rsvg_internals/src/filters/morphology.rs b/rsvg_internals/src/filters/morphology.rs
    index 60fbcef..7de1a0d 100644
    --- a/rsvg_internals/src/filters/morphology.rs
    +++ b/rsvg_internals/src/filters/morphology.rs
    @@ -95,6 +95,10 @@ impl Filter for Morphology {
    let (rx, ry) = self.radius.get();
    let (rx, ry) = ctx.paffine().transform_distance(rx, ry);
    + // The radii can become negative here due to the transform.
    + let rx = rx.abs();
    + let ry = ry.abs();
    +
    let operator = self.operator.get();
    let mut output_surface = ImageSurface::create(
    10_rsvg-gz.patch
    typenum-i386-ftbfs.patch
    i386-rounding-errors.patch
    keep-positive-radii.patch
    Descriptpion: round result of (highest as f64).log(2.0)
    Author: Michael Hudson-Doyle <michael.hudson@canonical.com>
    Origin: https://github.com/paholg/typenum/commit/14a3322d1081fd63d5eb44bf8ab8f90676208228
    Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/librsvg/+bug/1823426
    --- a/vendor/typenum/build/main.rs
    +++ b/vendor/typenum/build/main.rs
    @@ -77,7 +77,7 @@ pub fn no_std() {}
    fn main() {
    let highest: u64 = 1024;
    - let first2: u32 = (highest as f64).log(2.0) as u32 + 1;
    + let first2: u32 = (highest as f64).log(2.0).round() as u32 + 1;
    let first10: u32 = (highest as f64).log(10.0) as u32 + 1;
    let uints = (0..(highest + 1))
    .chain((first2..64).map(|i| 2u64.pow(i)))
    --- a/vendor/typenum/.cargo-checksum.json
    +++ b/vendor/typenum/.cargo-checksum.json
    @@ -1 +1 @@
    -{"files":{".travis.yml":"8cb8369c4baa618c5add98700b8b0509f5a63f15c1dc9474d4bc967d80439a4a","CHANGELOG.md":"caf37574d41c38570e892c4fed38cbc2fd22794ec512949c1f0faad1d866fced","Cargo.toml":"58822547c70a09449e6a069e6c197423a9e471d993ebf4ea20101e042781edf7","LICENSE":"a825bd853ab71619a4923d7b4311221427848070ff44d990da39b0b274c1683f","README.md":"7a19a1fb2f219fbc270535e0fee2caa96968b976cd74d33d12e2f2ef436d0895","build/main.rs":"44d33ee79a76a90a769096547ba4c7a5d3822afffeed025dfbcc5bb755227d52","build/op.rs":"a393b6818384a50688db8cb923891f86ccce39a9dccbf7c684efb9bef83b4acf","build/tests.rs":"a04fd3185ea8b19c36cb939178e5fedf16b4b36c2df0a2e79593339d998bd1ce","src/array.rs":"7243dbe44f3818c852c67bd0c3af14d57473fb9c3efda2c0d98251b3fe8b4d57","src/bit.rs":"023f9f6768331ac17de72b6248c6a9d6a7b856842f56067c9c1e04b729ed9e04","src/int.rs":"de4c49717a7a40572e579fad2380f29698c5571844ff1462e368531072dba55e","src/lib.rs":"2a58ff8553851eb6b9d7fa70315d688431dd0573f8491e53cfe799a092347b96","src/marker_traits.rs":"abf73f3930b5129d01aaa64c51275c4ca4ce0ef8961f7a9e744ee731d6308200","src/operator_aliases.rs":"43eb6a29dc0387ec329df5d9af0b4479a1301b3a9b2304c3b7b7d8c03e01ff5d","src/private.rs":"48c572aa27bd444062eadb4bd3f5ca38c1e6efb66bc074f38555499b33f0dcaf","src/type_operators.rs":"df9ef3ae2a69d56258db41f8166342a65f6e4085581709140719d1b7e3916bb9","src/uint.rs":"df4fdad3110a7e08fdc21e49f7e82fd525d6a78fcf904a766729aa47c0200727","tests/test.rs":"1e559fadf0af1a38d7049caef26e3a162c58ea5e024aa637299376d776986549"},"package":"612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"}
    \ No newline at end of file
    +{"files":{".travis.yml":"8cb8369c4baa618c5add98700b8b0509f5a63f15c1dc9474d4bc967d80439a4a","CHANGELOG.md":"caf37574d41c38570e892c4fed38cbc2fd22794ec512949c1f0faad1d866fced","Cargo.toml":"58822547c70a09449e6a069e6c197423a9e471d993ebf4ea20101e042781edf7","LICENSE":"a825bd853ab71619a4923d7b4311221427848070ff44d990da39b0b274c1683f","README.md":"7a19a1fb2f219fbc270535e0fee2caa96968b976cd74d33d12e2f2ef436d0895","build/main.rs":"38a90c85068bb6bba1d21e9d5976e693b9b868ed0c16b26986332d2ca1c01047","build/op.rs":"a393b6818384a50688db8cb923891f86ccce39a9dccbf7c684efb9bef83b4acf","build/tests.rs":"a04fd3185ea8b19c36cb939178e5fedf16b4b36c2df0a2e79593339d998bd1ce","src/array.rs":"7243dbe44f3818c852c67bd0c3af14d57473fb9c3efda2c0d98251b3fe8b4d57","src/bit.rs":"023f9f6768331ac17de72b6248c6a9d6a7b856842f56067c9c1e04b729ed9e04","src/int.rs":"de4c49717a7a40572e579fad2380f29698c5571844ff1462e368531072dba55e","src/lib.rs":"2a58ff8553851eb6b9d7fa70315d688431dd0573f8491e53cfe799a092347b96","src/marker_traits.rs":"abf73f3930b5129d01aaa64c51275c4ca4ce0ef8961f7a9e744ee731d6308200","src/operator_aliases.rs":"43eb6a29dc0387ec329df5d9af0b4479a1301b3a9b2304c3b7b7d8c03e01ff5d","src/private.rs":"48c572aa27bd444062eadb4bd3f5ca38c1e6efb66bc074f38555499b33f0dcaf","src/type_operators.rs":"df9ef3ae2a69d56258db41f8166342a65f6e4085581709140719d1b7e3916bb9","src/uint.rs":"df4fdad3110a7e08fdc21e49f7e82fd525d6a78fcf904a766729aa47c0200727","tests/test.rs":"1e559fadf0af1a38d7049caef26e3a162c58ea5e024aa637299376d776986549"},"package":"612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"}
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment