diff -Nru librsvg-2.44.10/debian/changelog librsvg-2.44.10/debian/changelog --- librsvg-2.44.10/debian/changelog 2019-04-25 19:55:18.000000000 +0000 +++ librsvg-2.44.10/debian/changelog 2019-05-04 11:10:13.000000000 +0000 @@ -1,3 +1,12 @@ +librsvg (2.44.10-2.1+rpi1) buster-staging; urgency=medium + + [changes brought forward from 2.44.10-2+rpi1 by Peter Michael Green at Tue, 16 Apr 2019 11:14:58 +0000] + * Side-port patch to workaround logarithm calculation issue in typenum + build from raspbian cargo package. + * Disable testsuite. + + -- Raspbian forward porter Sat, 04 May 2019 11:10:13 +0000 + librsvg (2.44.10-2.1) unstable; urgency=high * Non-maintainer upload. diff -Nru librsvg-2.44.10/debian/patches/logarithm-workaround.patch librsvg-2.44.10/debian/patches/logarithm-workaround.patch --- librsvg-2.44.10/debian/patches/logarithm-workaround.patch 1970-01-01 00:00:00.000000000 +0000 +++ librsvg-2.44.10/debian/patches/logarithm-workaround.patch 2019-05-04 11:10:13.000000000 +0000 @@ -0,0 +1,39 @@ +Description: Add workaround for apparently miscalculated logarithms. + This patch was side-ported from the raspbian cargo package. +Author: Peter Michael Green + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: https://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: 2019-03-02 + +Index: librsvg-2.44.10/vendor/typenum/build/main.rs +=================================================================== +--- librsvg-2.44.10.orig/vendor/typenum/build/main.rs ++++ librsvg-2.44.10/vendor/typenum/build/main.rs +@@ -77,8 +77,8 @@ pub fn no_std() {} + fn main() { + let highest: u64 = 1024; + +- 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 first2: u32 = 11;//(highest as f64).log(2.0).round() as u32 + 1; ++ let first10: u32 = 4;//(highest as f64).log(10.0) as u32 + 1; + let uints = (0..(highest + 1)) + .chain((first2..64).map(|i| 2u64.pow(i))) + .chain((first10..20).map(|i| 10u64.pow(i))); +Index: librsvg-2.44.10/vendor/typenum/.cargo-checksum.json +=================================================================== +--- librsvg-2.44.10.orig/vendor/typenum/.cargo-checksum.json ++++ librsvg-2.44.10/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":"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"} ++{"files":{".travis.yml":"8cb8369c4baa618c5add98700b8b0509f5a63f15c1dc9474d4bc967d80439a4a","CHANGELOG.md":"caf37574d41c38570e892c4fed38cbc2fd22794ec512949c1f0faad1d866fced","Cargo.toml":"58822547c70a09449e6a069e6c197423a9e471d993ebf4ea20101e042781edf7","LICENSE":"a825bd853ab71619a4923d7b4311221427848070ff44d990da39b0b274c1683f","README.md":"7a19a1fb2f219fbc270535e0fee2caa96968b976cd74d33d12e2f2ef436d0895","build/main.rs":"bbcc38e7b944b4d53637403a59d6cde0ad0584b26b84fc21bd2d483a0ece43dd","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"} diff -Nru librsvg-2.44.10/debian/patches/series librsvg-2.44.10/debian/patches/series --- librsvg-2.44.10/debian/patches/series 2019-04-25 19:54:21.000000000 +0000 +++ librsvg-2.44.10/debian/patches/series 2019-05-04 11:10:13.000000000 +0000 @@ -2,3 +2,4 @@ typenum-i386-ftbfs.patch i386-rounding-errors.patch keep-positive-radii.patch +logarithm-workaround.patch diff -Nru librsvg-2.44.10/debian/rules librsvg-2.44.10/debian/rules --- librsvg-2.44.10/debian/rules 2019-04-25 19:45:00.000000000 +0000 +++ librsvg-2.44.10/debian/rules 2019-05-04 11:10:13.000000000 +0000 @@ -58,7 +58,7 @@ endif override_dh_auto_test-arch: -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) +ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS))) dh_auto_test find debian -name '*.log' \ -not -name config.log \ @@ -67,4 +67,4 @@ endif override_dh_auto_test-indep: - @: + #@: