xmalloc.cpp.o.d -o src/CMakeFiles/kdiff3part.dir/gnudiff_xmalloc.cpp.o -c /var/tmp/portage/kde-misc/kdiff3-1.9.0/work/kdiff3-1.9.0/src/gnudiff_xmalloc.cpp In file included from /var/tmp/portage/kde-misc/kdiff3-1.9.0/work/kdiff3-1.9.0/src/LineRef.h:10, from /var/tmp/portage/kde-misc/kdiff3-1.9.0/work/kdiff3-1.9.0/src/gnudiff_diff.h:17, from /var/tmp/portage/kde-misc/kdiff3-1.9.0/work/kdiff3-1.9.0/src/gnudiff_xmalloc.cpp:22: /var/tmp/portage/kde-misc/kdiff3-1.9.0/work/kdiff3-1.9.0/src/LineRef.h: In constructor ‘LineRef::LineRef(qint64)’: /var/tmp/portage/kde-misc/kdiff3-1.9.0/work/kdiff3-1.9.0/src/TypeUtils.h:15:26: error: ‘numeric_limits’ is not a member of ‘std’ 15 | #define TYPE_MAX(x) std::numeric_limits<x>::max() | ^~~~~~~~~~~~~~ /var/tmp/portage/kde-misc/kdiff3-1.9.0/work/kdiff3-1.9.0/src/LineRef.h:28:17: note: in expansion of macro ‘TYPE_MAX’ 28 | if(i <= TYPE_MAX(LineType)) | ^~~~~~~~ /var/tmp/portage/kde-misc/kdiff3-1.9.0/work/kdiff3-1.9.0/src/TypeUtils.h:15:42: error: expected primary-expression before ‘>’ token 15 | #define TYPE_MAX(x) std::numeric_limits<x>::max() | ^ /var/tmp/portage/kde-misc/kdiff3-1.9.0/work/kdiff3-1.9.0/src/LineRef.h:28:17: note: in expansion of macro ‘TYPE_MAX’ 28 | if(i <= TYPE_MAX(LineType)) | ^~~~~~~~ /var/tmp/portage/kde-misc/kdiff3-1.9.0/work/kdiff3-1.9.0/src/TypeUtils.h:15:45: error: ‘::max’ has not been declared; did you mean ‘std::max’? 15 | #define TYPE_MAX(x) std::numeric_limits<x>::max() | ^~~ /var/tmp/portage/kde-misc/kdiff3-1.9.0/work/kdiff3-1.9.0/src/LineRef.h:28:17: note: in expansion of macro ‘TYPE_MAX’ 28 | if(i <= TYPE_MAX(LineType)) Reproducible: Always
Created attachment 705879 [details] Build log xz compressed
(please also include emerge --info when reporting these)
Created attachment 706005 [details, diff] Explicitly include <limits> for gcc-11
(In reply to Holger Hoffstätte from comment #3) > Created attachment 706005 [details, diff] [details, diff] > Explicitly include <limits> for gcc-11 Patch will also be submitted upstream.
(In reply to Holger Hoffstätte from comment #4) > Patch will also be submitted upstream. I was already going to ask ;) Perfect, thanks in advance. -> https://invent.kde.org/sdk/kdiff3
(In reply to Andreas Sturmlechner from comment #5) > (In reply to Holger Hoffstätte from comment #4) > > Patch will also be submitted upstream. > I was already going to ask ;) > > Perfect, thanks in advance. -> https://invent.kde.org/sdk/kdiff3 https://invent.kde.org/sdk/kdiff3/-/merge_requests/28
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3812549fcaa4f4e19d67b8286c9d07320c422297 commit 3812549fcaa4f4e19d67b8286c9d07320c422297 Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2021-05-04 21:41:32 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2021-05-04 22:56:46 +0000 kde-misc/kdiff3: Fix build with GCC-11 See also: https://invent.kde.org/sdk/kdiff3/-/merge_requests/28 Upstream commit 0476b1daa73159aec411c7f10da6f313294f0e38 Thanks-to: Holger Hoffstätte <holger@applied-asynchrony.com> Closes: https://bugs.gentoo.org/788058 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch | 24 ++++++++++++++++++++++++ kde-misc/kdiff3/kdiff3-1.9.0.ebuild | 2 ++ 2 files changed, 26 insertions(+)
