Adapt upstream patches e1934fd9b03cd52c556eb06d94fb5d68b649592e, and 15128192003722a3686c1b6f27132ba064cd1705. Also, the solution to the uint32_t compilation error is suggested by the compiler too. In file included from gui/statistics/Histogram.cpp:23: gui/statistics/Histogram.h:35:27: error: ‘uint32_t’ was not declared in this scope 35 | const std::vector& entries() const { return mBins; } | ^~~~~~~~ gui/statistics/Histogram.h:23:1: note: ‘uint32_t’ is defined in header ‘’; did you forget to ‘#include ’? 22 | #include +++ |+#include diff -Nuar a/retroshare-gui/src/gui/statistics/Histogram.cpp b/retroshare-gui/src/gui/statistics/Histogram.cpp --- a/retroshare-gui/src/gui/statistics/Histogram.cpp 2020-08-13 09:22:05.000000000 +0000 +++ b/retroshare-gui/src/gui/statistics/Histogram.cpp 2024-03-27 12:48:44.923065614 +0000 @@ -39,9 +39,9 @@ void Histogram::insert(double val) { - long int bin = (uint32_t)floor((val - mStart)/(mEnd - mStart) * mBins.size()); + long int bin = (long int)floor((val - mStart)/(mEnd - mStart) * mBins.size()); - if(bin >= 0 && bin < mBins.size()) + if(bin >= 0 && bin < (long int)mBins.size()) ++mBins[bin]; } diff -Nuar a/retroshare-gui/src/gui/statistics/Histogram.h b/retroshare-gui/src/gui/statistics/Histogram.h --- a/retroshare-gui/src/gui/statistics/Histogram.h 2020-08-13 09:22:05.000000000 +0000 +++ b/retroshare-gui/src/gui/statistics/Histogram.h 2024-03-27 12:48:44.923065614 +0000 @@ -20,6 +20,7 @@ #include #include +#include class QPainter;