From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2CA1B13835A for ; Sun, 24 Jan 2021 13:02:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5DC09E09F1; Sun, 24 Jan 2021 13:02:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 25E8EE09F8 for ; Sun, 24 Jan 2021 13:02:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1B7343411B3 for ; Sun, 24 Jan 2021 13:02:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C89B4AC for ; Sun, 24 Jan 2021 13:02:52 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1611493058.beabe660dec13ac95cf9c5d06a43a2a10065836b.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/kio/files/kio-5.77.0-gcc11.patch kde-frameworks/kio/kio-5.77.0-r1.ebuild kde-frameworks/kio/kio-5.78.0.ebuild X-VCS-Directories: kde-frameworks/kio/files/ kde-frameworks/kio/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: beabe660dec13ac95cf9c5d06a43a2a10065836b X-VCS-Branch: master Date: Sun, 24 Jan 2021 13:02:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: af9d8bba-a269-4e32-a717-9b55b6fa0026 X-Archives-Hash: 37a0c490d658cc63bbbdb6ff6d956262 commit: beabe660dec13ac95cf9c5d06a43a2a10065836b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 24 09:23:19 2021 +0000 Commit: Andreas Sturmlechner gentoo 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 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 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 +Date: Sun, 24 Jan 2021 11:10:27 +0200 +Subject: [PATCH] Fix build with gcc11 + +Apparently now we need to #include . + +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 + #include + ++#include ++ + 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=(