Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/fe/, app-editors/fe/files/
Date: Sat, 16 Oct 2021 19:40:00
Message-Id: 1634413190.ce7bd659f16863e234001244e3904c145644e49f.ulm@gentoo
1 commit: ce7bd659f16863e234001244e3904c145644e49f
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 16 19:39:10 2021 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 16 19:39:50 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce7bd659
7
8 app-editors/fe: Fix segmentation fault in ncurses lib
9
10 Bug: https://bugs.gentoo.org/818415
11 Package-Manager: Portage-3.0.28, Repoman-3.0.3
12 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
13
14 app-editors/fe/fe-2.0-r1.ebuild | 55 +++++++++++++++++++++++++++++++
15 app-editors/fe/files/fe-2.0-ncurses.patch | 32 ++++++++++++++++++
16 2 files changed, 87 insertions(+)
17
18 diff --git a/app-editors/fe/fe-2.0-r1.ebuild b/app-editors/fe/fe-2.0-r1.ebuild
19 new file mode 100644
20 index 00000000000..45263fd5ce8
21 --- /dev/null
22 +++ b/app-editors/fe/fe-2.0-r1.ebuild
23 @@ -0,0 +1,55 @@
24 +# Copyright 1999-2021 Gentoo Authors
25 +# Distributed under the terms of the GNU General Public License v2
26 +
27 +EAPI=8
28 +
29 +inherit autotools toolchain-funcs
30 +
31 +DESCRIPTION="A small and easy to use folding editor"
32 +HOMEPAGE="http://www.moria.de/~michael/fe/"
33 +SRC_URI="http://www.moria.de/~michael/fe/${P}.tar.gz"
34 +
35 +LICENSE="GPL-2+"
36 +SLOT="0"
37 +KEYWORDS="~amd64 ~x86"
38 +IUSE="sendmail"
39 +
40 +RDEPEND="sys-libs/ncurses:0=
41 + sendmail? ( virtual/mta )"
42 +DEPEND="${RDEPEND}"
43 +BDEPEND="virtual/pkgconfig"
44 +
45 +PATCHES=(
46 + "${FILESDIR}"/${PN}-1.8-makefile.patch
47 + "${FILESDIR}"/${P}-ar.patch
48 + "${FILESDIR}"/${P}-ncurses.patch
49 +)
50 +
51 +src_prepare() {
52 + mv configure.{in,ac} || die
53 + default
54 + AT_NOEAUTOHEADER=yes eautoreconf
55 +}
56 +
57 +src_configure() {
58 + econf \
59 + $(use_enable sendmail) \
60 + LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
61 +}
62 +
63 +src_compile() {
64 + emake AR="$(tc-getAR)"
65 +}
66 +
67 +src_install() {
68 + emake \
69 + prefix="${D}"/usr \
70 + datadir="${D}"/usr/share \
71 + datarootdir="${D}"/usr/share \
72 + MANDIR="${D}"/usr/share/man \
73 + install
74 +
75 + dodoc NEWS README
76 + docinto html
77 + dodoc fe.html
78 +}
79
80 diff --git a/app-editors/fe/files/fe-2.0-ncurses.patch b/app-editors/fe/files/fe-2.0-ncurses.patch
81 new file mode 100644
82 index 00000000000..8eef06db645
83 --- /dev/null
84 +++ b/app-editors/fe/files/fe-2.0-ncurses.patch
85 @@ -0,0 +1,32 @@
86 +https://bugs.gentoo.org/818415
87 +
88 +--- fe-2.0/configure.ac
89 ++++ fe-2.0/configure.ac
90 +@@ -55,19 +55,6 @@
91 + AC_CHECK_FUNCS(strdup)
92 + AC_CHECK_FUNCS(strndup)
93 +
94 +-AC_CHECK_LIB(ncursesw, get_wch, [have_utf8_ncurses=yes; LIBS="-lncursesw $LIBS"])
95 +-if test "$have_utf8_ncurses" = yes
96 +-then
97 +- AC_DEFINE(HAVE_UTF8_NCURSES)
98 +- AC_CHECK_HEADERS(ncurses/ncurses.h,have_ncurses_ncurses_h=yes)
99 +- if test "$have_ncurses_ncurses_h" != yes
100 +- then
101 +- AC_CHECK_HEADERS(ncurses.h,have_ncurses_h=yes)
102 +- fi
103 +-fi
104 +-
105 +-if test "$have_utf8_ncurses" != yes
106 +-then
107 + AC_CHECK_LIB(ncurses, get_wch, [have_utf8_ncurses=yes; LIBS="-lncurses $LIBS"])
108 + if test "$have_utf8_ncurses" = yes
109 + then
110 +@@ -78,7 +65,6 @@
111 + AC_CHECK_HEADERS(ncurses.h,have_ncurses_h=yes)
112 + fi
113 + fi
114 +-fi
115 +
116 + if test "$have_utf8_ncurses" != yes
117 + then