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 25BF7138359 for ; Sun, 1 Nov 2020 06:05:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4EF58E0802; Sun, 1 Nov 2020 06:05:19 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 2D973E0802 for ; Sun, 1 Nov 2020 06:05:19 +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 0AFE33404AD for ; Sun, 1 Nov 2020 06:05:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8338038A for ; Sun, 1 Nov 2020 06:05:14 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1604210279.8afe91df854a6ba393b2dfbaff2e434ada44670f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/seetxt/, x11-misc/seetxt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/seetxt/files/seetxt-0.72-fno-common.patch x11-misc/seetxt/seetxt-0.72-r1.ebuild X-VCS-Directories: x11-misc/seetxt/files/ x11-misc/seetxt/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8afe91df854a6ba393b2dfbaff2e434ada44670f X-VCS-Branch: master Date: Sun, 1 Nov 2020 06:05:14 +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: 21c5cf43-46bb-4531-bb2b-f39a5051fd91 X-Archives-Hash: dbcc2e8b7c0553e1a2dcdb05a901a641 commit: 8afe91df854a6ba393b2dfbaff2e434ada44670f Author: Sam James gentoo org> AuthorDate: Sun Nov 1 05:57:59 2020 +0000 Commit: Sam James gentoo org> CommitDate: Sun Nov 1 05:57:59 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8afe91df x11-misc/seetxt: fix build with gcc 10 Closes: https://bugs.gentoo.org/707402 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> x11-misc/seetxt/files/seetxt-0.72-fno-common.patch | 24 ++++++++++++++++++++++ x11-misc/seetxt/seetxt-0.72-r1.ebuild | 21 +++++++++++-------- 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/x11-misc/seetxt/files/seetxt-0.72-fno-common.patch b/x11-misc/seetxt/files/seetxt-0.72-fno-common.patch new file mode 100644 index 00000000000..f1d69b20d42 --- /dev/null +++ b/x11-misc/seetxt/files/seetxt-0.72-fno-common.patch @@ -0,0 +1,24 @@ +https://sources.debian.org/patches/see/0.72-7/40-fix_ftbfs.patch/ +https://bugs.gentoo.org/707402 +--- a/src/main.h ++++ b/src/main.h +@@ -92,7 +92,8 @@ typedef struct { + struct matchspec { + int bgn; + int end; +-} rgxp; ++}; ++extern struct matchspec rgxp; + + /* see.c */ + void addtohistory (char *line); +--- a/src/util.c ++++ b/src/util.c +@@ -11,6 +11,7 @@ Public License along with this program. + #include "main.h" + + char *EXDline, Me[64]; ++struct matchspec rgxp; + + int buflen (char *buffer) { + int blen = strlen(buffer), NofL=0, i; diff --git a/x11-misc/seetxt/seetxt-0.72-r1.ebuild b/x11-misc/seetxt/seetxt-0.72-r1.ebuild index a61c7e23447..db739453023 100644 --- a/x11-misc/seetxt/seetxt-0.72-r1.ebuild +++ b/x11-misc/seetxt/seetxt-0.72-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit autotools eutils +inherit autotools DESCRIPTION="Clever, lightweight GUI text file and manual page viewer for X windows" HOMEPAGE="https://code.google.com/p/seetxt/ http://seetxt.sourceforge.net/" @@ -12,16 +12,19 @@ SRC_URI="https://seetxt.googlecode.com/files/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="" +BDEPEND="virtual/pkgconfig" RDEPEND="x11-libs/gtk+:2" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PV}-0001-fix-linking.patch" + "${FILESDIR}/${PV}-0002-fix-shared-files-install.patch" + "${FILESDIR}/${PN}-0.72-fno-common.patch" +) src_prepare() { - epatch \ - "${FILESDIR}/${PV}-0001-fix-linking.patch" \ - "${FILESDIR}/${PV}-0002-fix-shared-files-install.patch" + default eautoreconf }