This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libosmium.
commit 3214d2b1733b14ff0bc3991f4ba2e0cd14ef8fed Author: Bas Couwenberg <[email protected]> Date: Sat Aug 26 08:57:31 2017 +0200 Drop patches, included upstream. --- debian/changelog | 1 + .../0001-Fix-broken-test-on-32-bit-platforms.patch | 31 -------------- ...ber-of-threads-allowed-for-the-Pool-to-32.patch | 30 ------------- ...to-compare-floating-point-values-in-tests.patch | 49 ---------------------- debian/patches/series | 3 -- 5 files changed, 1 insertion(+), 113 deletions(-) diff --git a/debian/changelog b/debian/changelog index b1878a2..0049385 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libosmium (2.13.1-1) UNRELEASED; urgency=medium * New upstream release. + * Drop patches, included upstream. -- Bas Couwenberg <[email protected]> Sat, 26 Aug 2017 08:55:49 +0200 diff --git a/debian/patches/0001-Fix-broken-test-on-32-bit-platforms.patch b/debian/patches/0001-Fix-broken-test-on-32-bit-platforms.patch deleted file mode 100644 index db0812b..0000000 --- a/debian/patches/0001-Fix-broken-test-on-32-bit-platforms.patch +++ /dev/null @@ -1,31 +0,0 @@ -Description: Fix broken test on 32 bit platforms. -Author: Jochen Topf <[email protected]> -Origin: https://github.com/osmcode/libosmium/commit/07cf3c70eb4ad8255cc9f44e4f0368a3ab95240a -Bug: https://github.com/osmcode/libosmium/issues/222 -Bug-Debian: https://bugs.debian.org/872292 - ---- a/test/t/memory/test_item.cpp -+++ b/test/t/memory/test_item.cpp -@@ -14,12 +14,16 @@ TEST_CASE("padded length") { - REQUIRE(osmium::memory::padded_length(2147483648) == 2147483648); - REQUIRE(osmium::memory::padded_length(2147483650) == 2147483656); - -- REQUIRE(osmium::memory::padded_length(4294967295) == 4294967296); -- REQUIRE(osmium::memory::padded_length(4294967296) == 4294967296); -- REQUIRE(osmium::memory::padded_length(4294967297) == 4294967304); -+ // The following checks only make sense on a 64 bit system (with -+ // sizeof(size_t) == 8), because the numbers are too large for 32 bit. -+ // The casts to size_t do nothing on a 64 bit system, on a 32 bit system -+ // they bring the numbers into the right range and everything still works. -+ REQUIRE(osmium::memory::padded_length(static_cast<std::size_t>(4294967295)) == static_cast<std::size_t>(4294967296)); -+ REQUIRE(osmium::memory::padded_length(static_cast<std::size_t>(4294967296)) == static_cast<std::size_t>(4294967296)); -+ REQUIRE(osmium::memory::padded_length(static_cast<std::size_t>(4294967297)) == static_cast<std::size_t>(4294967304)); - -- REQUIRE(osmium::memory::padded_length(7999999999) == 8000000000); -- REQUIRE(osmium::memory::padded_length(8000000000) == 8000000000); -- REQUIRE(osmium::memory::padded_length(8000000001) == 8000000008); -+ REQUIRE(osmium::memory::padded_length(static_cast<std::size_t>(7999999999)) == static_cast<std::size_t>(8000000000)); -+ REQUIRE(osmium::memory::padded_length(static_cast<std::size_t>(8000000000)) == static_cast<std::size_t>(8000000000)); -+ REQUIRE(osmium::memory::padded_length(static_cast<std::size_t>(8000000001)) == static_cast<std::size_t>(8000000008)); - } - diff --git a/debian/patches/Reduce-the-max-number-of-threads-allowed-for-the-Pool-to-32.patch b/debian/patches/Reduce-the-max-number-of-threads-allowed-for-the-Pool-to-32.patch deleted file mode 100644 index f5a527d..0000000 --- a/debian/patches/Reduce-the-max-number-of-threads-allowed-for-the-Pool-to-32.patch +++ /dev/null @@ -1,30 +0,0 @@ -Description: Reduce the max number of threads allowed for the Pool to 32. - This should still be plenty and might help with test failures on - mips architectures. -Author: Jochen Topf <[email protected]> -Origin: https://github.com/osmcode/libosmium/commit/aa5bb5b0b272cdaa5bb2db7b79a5b69116951999 - ---- a/include/osmium/thread/pool.hpp -+++ b/include/osmium/thread/pool.hpp -@@ -56,7 +56,7 @@ namespace osmium { - - // Maximum number of allowed pool threads (just to keep the user - // from setting something silly). -- constexpr const int max_pool_threads = 256; -+ constexpr const int max_pool_threads = 32; - - inline int get_pool_size(int num_threads, int user_setting, unsigned hardware_concurrency) { - if (num_threads == 0) { ---- a/test/t/thread/test_pool.cpp -+++ b/test/t/thread/test_pool.cpp -@@ -43,8 +43,8 @@ TEST_CASE("number of threads in pool") { - REQUIRE(osmium::thread::detail::get_pool_size( 0, 8, 16) == 8); - - // outliers -- REQUIRE(osmium::thread::detail::get_pool_size(-100, 0, 16) == 1); -- REQUIRE(osmium::thread::detail::get_pool_size(1000, 0, 16) == 256); -+ REQUIRE(osmium::thread::detail::get_pool_size(-100, 0, 16) == 1); -+ REQUIRE(osmium::thread::detail::get_pool_size(1000, 0, 16) == 32); - - } - diff --git a/debian/patches/Use-Approx-to-compare-floating-point-values-in-tests.patch b/debian/patches/Use-Approx-to-compare-floating-point-values-in-tests.patch deleted file mode 100644 index c980ef9..0000000 --- a/debian/patches/Use-Approx-to-compare-floating-point-values-in-tests.patch +++ /dev/null @@ -1,49 +0,0 @@ -Description: Use Approx() to compare floating point values in tests. -Author: Jochen Topf <[email protected]> -Origin: https://github.com/osmcode/libosmium/commit/2bb33036204da860b1acd52951c91b708ebfce1c - ---- a/test/t/osm/test_location.cpp -+++ b/test/t/osm/test_location.cpp -@@ -25,32 +25,32 @@ TEST_CASE("Location instantiation with d - REQUIRE_FALSE(loc1.is_undefined()); - REQUIRE(12000000 == loc1.x()); - REQUIRE(45000000 == loc1.y()); -- REQUIRE(1.2 == loc1.lon()); -- REQUIRE(4.5 == loc1.lat()); -+ REQUIRE(1.2 == Approx(loc1.lon())); -+ REQUIRE(4.5 == Approx(loc1.lat())); - - const osmium::Location loc2{loc1}; -- REQUIRE(4.5 == loc2.lat()); -+ REQUIRE(4.5 == Approx(loc2.lat())); - - const osmium::Location loc3 = loc1; -- REQUIRE(4.5 == loc3.lat()); -+ REQUIRE(4.5 == Approx(loc3.lat())); - } - - TEST_CASE("Location instantiation with double parameters constructor with universal initializer") { - const osmium::Location loc{2.2, 3.3}; -- REQUIRE(2.2 == loc.lon()); -- REQUIRE(3.3 == loc.lat()); -+ REQUIRE(2.2 == Approx(loc.lon())); -+ REQUIRE(3.3 == Approx(loc.lat())); - } - - TEST_CASE("Location instantiation with double parameters constructor with initializer list") { - const osmium::Location loc({4.4, 5.5}); -- REQUIRE(4.4 == loc.lon()); -- REQUIRE(5.5 == loc.lat()); -+ REQUIRE(4.4 == Approx(loc.lon())); -+ REQUIRE(5.5 == Approx(loc.lat())); - } - - TEST_CASE("Location instantiation with double parameters operator equal") { - const osmium::Location loc = {5.5, 6.6}; -- REQUIRE(5.5 == loc.lon()); -- REQUIRE(6.6 == loc.lat()); -+ REQUIRE(5.5 == Approx(loc.lon())); -+ REQUIRE(6.6 == Approx(loc.lat())); - } - - TEST_CASE("Location equality") { diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index d19e3b1..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -0001-Fix-broken-test-on-32-bit-platforms.patch -Reduce-the-max-number-of-threads-allowed-for-the-Pool-to-32.patch -Use-Approx-to-compare-floating-point-values-in-tests.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libosmium.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
