gentoo resync : 07.05.2021

4 files changed, 28 insertions, 1 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 1d7663affcae..9db6f5dadde2 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 5e13dc6ae16b..3d7a89d276d0 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,6 +1,7 @@
 AUX kdiff3-1.8.3-hidpi.patch 5069 BLAKE2B 3b62e3e06a5704e1bf2b49472ffa5b4bdcc985733cf0ea3ca77e62ffd90bb9a9c17a0997a81b91c376bcd9a967ffc3458a26951f4381e8d16d0330fa62bf3ff6 SHA512 207767a8375b3ccffdfb0c222992e2556e8fd1449b2bca8f6ec771d6c83bea296973b0c76085ec4b8333527c7c9f4ddb50f6dbb016206a3bf139232d21784389
+AUX kdiff3-1.9.0-gcc11.patch 559 BLAKE2B 6596e7f41fb5dfaeac08cfe3871f67ade513a0d89ec6801af4b688107e18e6bacb5d94199187f8be9a732e6ecb4f6fe81ff8b4124a205654714da303fe5a1786 SHA512 25e88b616e706d4a6a19849647650bd4763684ca7dc518ace7aa8aebeafb49477182f1b78143ae1554e823f547a4caacb6ba08e8c4f367a7de63b518a3c84309
 DIST kdiff3-1.8.5.tar.xz 1045812 BLAKE2B 347403c12c313cbfe124de3d67cd34387eb1dc2e9cba837a53354cbc6c1aa915d5aed3f67e7f0cc3f7268815c605c30a25bed2a0cad42c223d005aa7553e0415 SHA512 5ae736b290a6a1a34dd3e19028fb43b398ad1341982e7717d3de4326938c2dabc11e7e172e5628d2deeddd942b67d6e3af02d074c9b2a1c902c7e1ea8d7f1af4
 DIST kdiff3-1.9.0.tar.xz 1052284 BLAKE2B 50362fe1949162dafa50ec5261d793bfb7eb836030459f575a114c127a84bcd6876f0292cea0d4173efbb1f4aa933dcfc08bb6b0147eb3db82c90ecf7b1f1f52 SHA512 5bf086816d0ab83cfacf71179996a7b934c799e356007e2f72b62bd69af3eacea748a2bcf48f98f30fade6c6d8cd1fca1d0c37e1ed1bed97150c64800d787df4
 EBUILD kdiff3-1.8.5.ebuild 1060 BLAKE2B 90af39a2d93a2b80970e8375688b367bcfe4f1e7b9f01c8f1dd7fcc2c65f8d45a874d87bf8d5149536c2f59d50b74a123736ee47173b18d8d9e7bd01b86be3bf SHA512 c4e4f500c6016a456e89a3b2656267d56b6839ace4e4804d68af26cce6ca3a01ef88775ed1f23c7805e9fdd70414ef0afe9c7777376ac220122e757181af5c84
-EBUILD kdiff3-1.9.0.ebuild 1063 BLAKE2B 06b51d99b9a028858517f01ca45a1134221dc47d86a08ba1160d2fb7dd45fc124512046dba2203944d090735cbc222ff70565f99e4479b641d3cb577bd37723a SHA512 43db2ebce0e13521f5a54bbeea342addfd025ce37986e6e03f8a816edbe2d69a9c2c04e00af60032ab99ee0589892f8e84bc80378fc8ee2f63ccaba25e7fc3bf
+EBUILD kdiff3-1.9.0.ebuild 1132 BLAKE2B d14d64c53f42ce6d16e5631244e9fa07f82852da3ec96bd4fa2fa840c82eee2d1d303c31b73aa2b4e4fa243508cff2aaa4cb8ce3a80b82c385cf6c82c13f6dca SHA512 43af48f0b83d8d93479908d28a3f2a1e87d0ddd26d9e93e78a2b7edb77891b7f0186276b0862a175182f0453fe013c44b7b259fbb5c3897c7d5c711cde76ef73
 MISC metadata.xml 362 BLAKE2B 45686f239bfb936fe11982d8bd2b51380cdfef94c11e5a6fb224c030154bda8b27190052b1705e010fd22305dd2830b8f8b385b47fc647f7c80b2ec01a1f579a SHA512 1fb8f10c3632c0007e65be57dbeb2492ad0e90a79f0403ce4a350a6ea0e1764dd1ee5038b0381049a6715bab2d7c38fc83c0b8f338ea7958bb34df499f355100
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 000000000000..581b487503ea
--- /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@applied-asynchrony.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 b9bac1df1bdd..adedf33c00cb 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