[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/

[Andreas Sturmlechner]

commit:     3812549fcaa4f4e19d67b8286c9d07320c422297
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May  4 21:41:32 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May  4 22:56:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3812549f

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 <AT> 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 <AT> 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(+)

diff --git a/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch b/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch
new file mode 100644
index 00000000000..581b487503e
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch
@@ -0,0 +1,24 @@
+From 0476b1daa73159aec411c7f10da6f313294f0e38 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@××××××××××××××××××.com>
+Date: Tue, 4 May 2021 19:21:46 +0200
+Subject: [PATCH] Explicitly include <limits> for compatibility with gcc-11
+
+---
+ src/TypeUtils.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/TypeUtils.h b/src/TypeUtils.h
+index c072681..f0ab9c2 100644
+--- a/src/TypeUtils.h
++++ b/src/TypeUtils.h
+@@ -9,6 +9,7 @@
+ 
+ #include <stdlib.h>
+ #include <type_traits>
++#include <limits>
+ 
+ #include <QtGlobal>
+ 
+-- 
+GitLab
+

diff --git a/kde-misc/kdiff3/kdiff3-1.9.0.ebuild b/kde-misc/kdiff3/kdiff3-1.9.0.ebuild
index b9bac1df1bd..adedf33c00c 100644
--- a/kde-misc/kdiff3/kdiff3-1.9.0.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.9.0.ebuild
@@ -39,3 +39,5 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/diffutils
 "
+
+PATCHES=( "${FILESDIR}/${P}-gcc11.patch" ) # bug 788058, git master