commit: 8da276544f3a2ba236fae9275236674c04e1faad Author: Christopher Head <chead <AT> chead <DOT> ca> AuthorDate: Tue Nov 8 04:21:05 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Nov 8 04:38:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8da27654
app-editors/bvi: fix strict Clang compilation There is an `ANSI` macro which, if defined, includes proper prototypes. A few of them don’t match the function definitions, so patch them. Signed-off-by: Christopher Head <chead <AT> chead.ca> Closes: https://github.com/gentoo/gentoo/pull/28179 Signed-off-by: Sam James <sam <AT> gentoo.org> app-editors/bvi/bvi-1.4.1-r1.ebuild | 22 +++++++++++++++ app-editors/bvi/files/bvi-1.4.1-prototypes.patch | 34 ++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/app-editors/bvi/bvi-1.4.1-r1.ebuild b/app-editors/bvi/bvi-1.4.1-r1.ebuild new file mode 100644 index 000000000000..4b500d68d576 --- /dev/null +++ b/app-editors/bvi/bvi-1.4.1-r1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Display-oriented editor for binary files, based on the vi texteditor" +HOMEPAGE="http://bvi.sourceforge.net/"; +SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="" +KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" + +DEPEND="sys-libs/ncurses:0=" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-prototypes.patch" ) + +src_configure() { + econf CFLAGS=-DANSI +} diff --git a/app-editors/bvi/files/bvi-1.4.1-prototypes.patch b/app-editors/bvi/files/bvi-1.4.1-prototypes.patch new file mode 100644 index 000000000000..ab4010303011 --- /dev/null +++ b/app-editors/bvi/files/bvi-1.4.1-prototypes.patch @@ -0,0 +1,34 @@ +https://sourceforge.net/p/bvi/bugs/14/ + +diff --git a/bmore.h b/bmore.h +index bb5174514a66..0c4811f743b2 100644 +--- a/bmore.h ++++ b/bmore.h +@@ -135,12 +135,12 @@ extern int no_tty, no_intty; + #ifdef ANSI + void initterm(void), set_tty(void), reset_tty(void); + void cleartoeol(void), clearscreen(void), highlight(void); +- void normal(void), bmbeep(void), home(void), sig(void); ++ void normal(void), bmbeep(void), home(void), sig(int); + void doshell(char *), emsg(char *); + void do_next(int); + void bmsearch(int); + void pushback(int, char *); +- int open_file(void); ++ int open_file(char *); + int printout(int), rdline(int, char *); + int nextchar(void), vgetc(void); + int sbracket(int, char *, int); +diff --git a/bvi.h b/bvi.h +index 0881ce79d6fd..90f68c9eeb92 100644 +--- a/bvi.h ++++ b/bvi.h +@@ -215,7 +215,7 @@ extern off_t block_begin, block_end, block_size; + void docmdline(char *), do_over(PTR, off_t, PTR), do_put(PTR, off_t, PTR); + void jmpproc(int), printline(PTR, int); + int addfile(char *); +- int bregexec(PTR, char *); ++ PTR bregexec(PTR, char *); + int chk_comm(int); + int doecmd(char *, int); + int do_append(off_t, char *), do_logic(int, char *);
