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 430B91382C5 for ; Fri, 1 Jan 2021 10:28:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82FDAE085A; Fri, 1 Jan 2021 10:28:58 +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 6B36BE085A for ; Fri, 1 Jan 2021 10:28:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 491A9340EFB for ; Fri, 1 Jan 2021 10:28:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C4C43487 for ; Fri, 1 Jan 2021 10:28:54 +0000 (UTC) From: "Andreas K. Hüttel" 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 K. Hüttel" Message-ID: <1609496918.e47ebc6c160cad1de9f7484eabb0bd750d00d0e1.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/fdutils/files/, app-misc/fdutils/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild app-misc/fdutils/fdutils-5.5.20060227.ebuild app-misc/fdutils/files/fdutils-5.5.20060227-gcc10.patch X-VCS-Directories: app-misc/fdutils/files/ app-misc/fdutils/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: e47ebc6c160cad1de9f7484eabb0bd750d00d0e1 X-VCS-Branch: master Date: Fri, 1 Jan 2021 10:28:54 +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: 3cf6422b-23cf-4109-b044-ceaabff7c330 X-Archives-Hash: 2160c969b751413da882daeb27db012e commit: e47ebc6c160cad1de9f7484eabb0bd750d00d0e1 Author: Andreas K. Huettel gentoo org> AuthorDate: Fri Jan 1 10:28:10 2021 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Fri Jan 1 10:28:38 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e47ebc6c app-misc/fdutils: Fix build with gcc-10 Closes: https://bugs.gentoo.org/706822 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Andreas K. Huettel gentoo.org> app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild | 4 +++- app-misc/fdutils/fdutils-5.5.20060227.ebuild | 4 +++- .../fdutils/files/fdutils-5.5.20060227-gcc10.patch | 20 ++++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild index d234389a9e1..b0196c0d391 100644 --- a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild +++ b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -26,6 +26,8 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${PN}-5.5-20060227 src_prepare() { + epatch "${FILESDIR}/${P}-gcc10.patch" + local d="${WORKDIR}"/debian/patches EPATCH_SOURCE="${d}" epatch $(<"${d}"/series) sed -i -e 's:{LDFLAFS}:(LDFLAGS):' src/Makefile.in || die #337721 diff --git a/app-misc/fdutils/fdutils-5.5.20060227.ebuild b/app-misc/fdutils/fdutils-5.5.20060227.ebuild index 1116db851a7..632a26a8982 100644 --- a/app-misc/fdutils/fdutils-5.5.20060227.ebuild +++ b/app-misc/fdutils/fdutils-5.5.20060227.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -25,6 +25,8 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${PN}-5.5-20060227 src_prepare() { + epatch "${FILESDIR}/${P}-gcc10.patch" + local d="${WORKDIR}"/debian/patches EPATCH_SOURCE="${d}" epatch $(<"${d}"/series) sed -i -e 's:{LDFLAFS}:(LDFLAGS):' src/Makefile.in || die #337721 diff --git a/app-misc/fdutils/files/fdutils-5.5.20060227-gcc10.patch b/app-misc/fdutils/files/fdutils-5.5.20060227-gcc10.patch new file mode 100644 index 00000000000..2bda41e1125 --- /dev/null +++ b/app-misc/fdutils/files/fdutils-5.5.20060227-gcc10.patch @@ -0,0 +1,20 @@ +Description: Fix ftbfs with GCC-10 + +Author: Sudip Mukherjee +Bug-Debian: https://bugs.debian.org/957200 +Forwarded: no + +--- + +--- fdutils-5.5-20060227.orig/src/superformat.h ++++ fdutils-5.5-20060227/src/superformat.h +@@ -97,7 +97,7 @@ int compute_all_sequences(struct params + void compute_track0_sequence(struct params *fd); + int calc_skews(struct params *fd0, struct params *fd, int n); + extern int verbosity; +-int header_size; +-int index_size; ++extern int header_size; ++extern int index_size; + + #endif