From 175682f0df219e54b8f728e6327d81969ba8c436 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 16 Jan 2023 21:20:02 -0800 Subject: python3-matplotlib: Fix build with c++17 Signed-off-by: Khem Raj --- ...domNumberGenerator-class-included-random-.patch | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-matplotlib/0001-removed-RandomNumberGenerator-class-included-random-.patch (limited to 'meta-python/recipes-devtools/python/python3-matplotlib/0001-removed-RandomNumberGenerator-class-included-random-.patch') diff --git a/meta-python/recipes-devtools/python/python3-matplotlib/0001-removed-RandomNumberGenerator-class-included-random-.patch b/meta-python/recipes-devtools/python/python3-matplotlib/0001-removed-RandomNumberGenerator-class-included-random-.patch new file mode 100644 index 0000000000..1f9b8cdeaf --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-matplotlib/0001-removed-RandomNumberGenerator-class-included-random-.patch @@ -0,0 +1,59 @@ +From 3eb9987b02cc10b93e09219ddc86aa6be5f10177 Mon Sep 17 00:00:00 2001 +From: tybeller +Date: Fri, 30 Sep 2022 16:13:41 -0400 +Subject: [PATCH] removed RandomNumberGenerator class, included , + replaced random_shuffle with shuffle and used mersenne twister engine to + generate uniform random bit generator for the shuffle. + +Upstream-Status: Backport [https://github.com/matplotlib/matplotlib/commit/601d92a8850] +Signed-off-by: Khem Raj +--- + src/tri/_tri.cpp | 20 ++++---------------- + 1 file changed, 4 insertions(+), 16 deletions(-) + +diff --git a/src/tri/_tri.cpp b/src/tri/_tri.cpp +index b7a87783de..6e639eea44 100644 +--- a/src/tri/_tri.cpp ++++ b/src/tri/_tri.cpp +@@ -12,6 +12,7 @@ + + #include + #include ++#include + + + TriEdge::TriEdge() +@@ -1465,8 +1466,8 @@ TrapezoidMapTriFinder::initialize() + _tree->assert_valid(false); + + // Randomly shuffle all edges other than first 2. +- RandomNumberGenerator rng(1234); +- std::random_shuffle(_edges.begin()+2, _edges.end(), rng); ++ std::mt19937 rng(1234); ++ std::shuffle(_edges.begin()+2, _edges.end(), rng); + + // Add edges, one at a time, to tree. + size_t nedges = _edges.size(); +@@ -2055,17 +2056,4 @@ TrapezoidMapTriFinder::Trapezoid::set_upper_right(Trapezoid* upper_right_) + upper_right = upper_right_; + if (upper_right != 0) + upper_right->upper_left = this; +-} +- +- +- +-RandomNumberGenerator::RandomNumberGenerator(unsigned long seed) +- : _m(21870), _a(1291), _c(4621), _seed(seed % _m) +-{} +- +-unsigned long +-RandomNumberGenerator::operator()(unsigned long max_value) +-{ +- _seed = (_seed*_a + _c) % _m; +- return (_seed*max_value) / _m; +-} ++} +\ No newline at end of file +-- +2.39.0 + -- cgit v1.2.3-54-g00ecf