commit:     beabe660dec13ac95cf9c5d06a43a2a10065836b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 09:23:19 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 12:57:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beabe660

kde-frameworks/kio: Fix build with GCC-11

Upstream commit 9965ec1b9e6f6db192a2355e4e3eb80bc27fc092

Thanks-to: Geoff Leach <gl <AT> cs.rmit.edu.au>
Closes: https://bugs.gentoo.org/766480
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-frameworks/kio/files/kio-5.77.0-gcc11.patch | 32 +++++++++++++++++++++++++
 kde-frameworks/kio/kio-5.77.0-r1.ebuild         | 11 +++++----
 kde-frameworks/kio/kio-5.78.0.ebuild            |  6 +++--
 3 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/kde-frameworks/kio/files/kio-5.77.0-gcc11.patch 
b/kde-frameworks/kio/files/kio-5.77.0-gcc11.patch
new file mode 100644
index 00000000000..7432364a986
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.77.0-gcc11.patch
@@ -0,0 +1,32 @@
+From 9965ec1b9e6f6db192a2355e4e3eb80bc27fc092 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <[email protected]>
+Date: Sun, 24 Jan 2021 11:10:27 +0200
+Subject: [PATCH] Fix build with gcc11
+
+Apparently now we need to #include <limit>.
+
+Patch by Geoff Leach:
+https://bugs.gentoo.org/766480
+https://invent.kde.org/frameworks/kio/-/issues/3
+
+NO_CHANGELOG
+---
+ src/kntlm/des.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/kntlm/des.cpp b/src/kntlm/des.cpp
+index 18d85bfd..65c86f06 100644
+--- a/src/kntlm/des.cpp
++++ b/src/kntlm/des.cpp
+@@ -29,6 +29,8 @@
+ #include <string.h>
+ #include <qendian.h>
+ 
++#include <limits>
++
+ static void permute_ip(unsigned char *inblock, DES_KEY *key, unsigned char 
*outblock);
+ static void permute_fp(unsigned char *inblock, DES_KEY *key, unsigned char 
*outblock);
+ static void perminit_ip(DES_KEY *key);
+-- 
+GitLab
+

diff --git a/kde-frameworks/kio/kio-5.77.0-r1.ebuild 
b/kde-frameworks/kio/kio-5.77.0-r1.ebuild
index 6b8abe7e5b5..7219074c623 100644
--- a/kde-frameworks/kio/kio-5.77.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.77.0-r1.ebuild
@@ -16,6 +16,9 @@ LICENSE="LGPL-2+"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
+# tests hang
+RESTRICT+=" test"
+
 RDEPEND="
        dev-libs/libxml2
        dev-libs/libxslt
@@ -68,10 +71,10 @@ PDEPEND="
        >=kde-frameworks/kded-${PVCUT}:5
 "
 
-# tests hang
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
+PATCHES=(
+       "${FILESDIR}/${P}-crashfix.patch"
+       "${FILESDIR}/${P}-gcc11.patch" # bug 766480
+)
 
 src_configure() {
        local mycmakeargs=(

diff --git a/kde-frameworks/kio/kio-5.78.0.ebuild 
b/kde-frameworks/kio/kio-5.78.0.ebuild
index 04866eaeffa..4b22f628f1f 100644
--- a/kde-frameworks/kio/kio-5.78.0.ebuild
+++ b/kde-frameworks/kio/kio-5.78.0.ebuild
@@ -16,6 +16,9 @@ LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
+# tests hang
+RESTRICT+=" test"
+
 RDEPEND="
        dev-libs/libxml2
        dev-libs/libxslt
@@ -68,8 +71,7 @@ PDEPEND="
        >=kde-frameworks/kded-${PVCUT}:5
 "
 
-# tests hang
-RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${PN}-5.77.0-gcc11.patch" ) # bug 766480
 
 src_configure() {
        local mycmakeargs=(

Reply via email to