Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Hi, Maybe you'll see this anyway since the upload closes an RC bug? librsvg 2.44.10-2 (just uploaded, not accepted yet) is am upload only to fix a build failure on (at least) i386, AKA #926840. Please could you unblock it? unblock librsvg/2.44.10-2 -- Iain Lane [ i...@orangesquash.org.uk ] Debian Developer [ la...@debian.org ] Ubuntu Developer [ la...@ubuntu.com ]
diff -Nru librsvg-2.44.10/debian/changelog librsvg-2.44.10/debian/changelog --- librsvg-2.44.10/debian/changelog 2018-12-11 21:02:52.000000000 +0000 +++ librsvg-2.44.10/debian/changelog 2019-04-11 09:29:30.000000000 +0100 @@ -1,3 +1,13 @@ +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.til...@canonical.com> Thu, 11 Apr 2019 09:29:30 +0100 + librsvg (2.44.10-1) unstable; urgency=medium * New upstream release diff -Nru librsvg-2.44.10/debian/patches/i386-rounding-errors.patch librsvg-2.44.10/debian/patches/i386-rounding-errors.patch --- librsvg-2.44.10/debian/patches/i386-rounding-errors.patch 1970-01-01 01:00:00.000000000 +0100 +++ librsvg-2.44.10/debian/patches/i386-rounding-errors.patch 2019-04-11 09:29:30.000000000 +0100 @@ -0,0 +1,17 @@ +Description: fix a rounding error on i386 that would result in a unit test failure +Author: Olivier Tilloy <olivier.til...@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; + } diff -Nru librsvg-2.44.10/debian/patches/series librsvg-2.44.10/debian/patches/series --- librsvg-2.44.10/debian/patches/series 2018-12-11 21:02:52.000000000 +0000 +++ librsvg-2.44.10/debian/patches/series 2019-04-11 09:29:30.000000000 +0100 @@ -1 +1,3 @@ 10_rsvg-gz.patch +typenum-i386-ftbfs.patch +i386-rounding-errors.patch diff -Nru librsvg-2.44.10/debian/patches/typenum-i386-ftbfs.patch librsvg-2.44.10/debian/patches/typenum-i386-ftbfs.patch --- librsvg-2.44.10/debian/patches/typenum-i386-ftbfs.patch 1970-01-01 01:00:00.000000000 +0100 +++ librsvg-2.44.10/debian/patches/typenum-i386-ftbfs.patch 2019-04-11 09:29:30.000000000 +0100 @@ -0,0 +1,22 @@ +Descriptpion: round result of (highest as f64).log(2.0) +Author: Michael Hudson-Doyle <michael.hud...@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"}
