public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
Date: Sun, 24 Jan 2021 13:02:52 +0000 (UTC)	[thread overview]
Message-ID: <1611493058.beabe660dec13ac95cf9c5d06a43a2a10065836b.asturm@gentoo> (raw)

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 <a.samirh78@gmail.com>
+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	other threads:[~2021-01-24 13:02 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-24 13:02 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-15 13:46 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/ Andreas Sturmlechner
2024-08-10  7:57 Andreas Sturmlechner
2024-07-16 16:32 Andreas Sturmlechner
2024-03-24 21:03 Andreas Sturmlechner
2024-03-19  9:10 Andreas Sturmlechner
2023-06-22 21:16 Andreas Sturmlechner
2023-03-26  9:52 Andreas Sturmlechner
2023-03-23 16:47 Andreas Sturmlechner
2023-03-23  8:11 Andreas Sturmlechner
2023-01-25 10:22 Andreas Sturmlechner
2022-11-27 11:20 Andreas Sturmlechner
2022-08-08 14:40 Andreas Sturmlechner
2022-07-26 12:08 Andreas Sturmlechner
2022-07-19 13:29 Andreas Sturmlechner
2022-06-29 19:53 Andreas Sturmlechner
2021-12-08 15:08 Andreas Sturmlechner
2021-11-18 10:38 Andreas Sturmlechner
2021-08-15 18:57 Andreas Sturmlechner
2021-08-14 17:09 Andreas Sturmlechner
2021-07-16 15:21 Andreas Sturmlechner
2021-07-14 12:41 Andreas Sturmlechner
2021-05-30 15:51 Andreas Sturmlechner
2021-05-15 10:49 Andreas Sturmlechner
2021-04-11 14:23 Andreas Sturmlechner
2021-04-04 13:23 Andreas Sturmlechner
2021-03-25 23:13 Andreas Sturmlechner
2021-02-13 20:49 Andreas Sturmlechner
2021-02-12 21:48 Andreas Sturmlechner
2021-01-11 12:28 Andreas Sturmlechner
2020-12-23 21:32 Andreas Sturmlechner
2020-11-16 23:41 Andreas Sturmlechner
2020-09-29 12:49 Andreas Sturmlechner
2020-05-16 22:38 Andreas Sturmlechner
2019-01-16 12:50 Andreas Sturmlechner
2018-07-21 16:51 Andreas Sturmlechner
2017-12-03 12:34 Andreas Sturmlechner
2017-09-30 20:34 Andreas Sturmlechner
2017-05-17 22:08 Andreas Sturmlechner
2017-02-28 21:02 Johannes Huber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1611493058.beabe660dec13ac95cf9c5d06a43a2a10065836b.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox