[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/files/, app-i18n/fbterm/
commit: ff4292a66a916974fdec86ba74f2358d3b92ec41
Author: Akinori Hattori gentoo org>
AuthorDate: Wed Oct 6 14:47:19 2021 +
Commit: Akinori Hattori gentoo org>
CommitDate: Wed Oct 6 14:47:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff4292a6
app-i18n/fbterm: fix build with >=sys-devel/autoconf-2.68
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori gentoo.org>
app-i18n/fbterm/fbterm-1.7_p20190503.ebuild | 10 ++
app-i18n/fbterm/files/fbterm-autoconf-2.68.patch | 24
2 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
index c6271dc437c..408aa38f9e1 100644
--- a/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -16,13 +16,15 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="gpm video_cards_vesa"
-BDEPEND="virtual/pkgconfig"
-DEPEND="media-libs/fontconfig
+RDEPEND="media-libs/fontconfig
media-libs/freetype:2
>=sys-libs/ncurses-6.1
gpm? ( sys-libs/gpm )
video_cards_vesa? ( dev-libs/libx86 )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-autoconf-2.68.patch )
FILECAPS=(
cap_sys_tty_config+ep usr/bin/${PN}
diff --git a/app-i18n/fbterm/files/fbterm-autoconf-2.68.patch
b/app-i18n/fbterm/files/fbterm-autoconf-2.68.patch
new file mode 100644
index 000..826f3cd3c6b
--- /dev/null
+++ b/app-i18n/fbterm/files/fbterm-autoconf-2.68.patch
@@ -0,0 +1,24 @@
+--- a/configure.ac
b/configure.ac
+@@ -85,16 +85,16 @@
+
+ if test x"$EPOLL" = xauto -a x"$cross_compiling" = xno; then
+ AC_RUN_IFELSE(
+-AC_LANG_PROGRAM([[#include ]],
+- [[if (epoll_create(10) >= 0) return 0; return 1;]]),
++[AC_LANG_PROGRAM([[#include ]],
++ [[if (epoll_create(10) >= 0) return 0; return 1;]])],
+ [EPOLL=yes]
+ )
+ fi
+
+ if test x"$SIGNALFD" = xauto -a x"$cross_compiling" = xno; then
+ AC_RUN_IFELSE(
+-AC_LANG_PROGRAM([[#include ]],
+- [[sigset_t mask; if (signalfd(-1, &mask, 0) >= 0) return 0; return
1;]]),
++[AC_LANG_PROGRAM([[#include ]],
++ [[sigset_t mask; if (signalfd(-1, &mask, 0) >= 0) return 0; return
1;]])],
+ [SIGNALFD=yes]
+ )
+ fi
+install-data-local:
[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/files/, app-i18n/fbterm/
commit: 7e17670a886d15ab6a0ba40c906cbbe0dce5d066
Author: Alexey Sokolov google com>
AuthorDate: Sun Apr 1 10:54:14 2018 +
Commit: Akinori Hattori gentoo org>
CommitDate: Mon May 7 12:51:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e17670a
app-i18n/fbterm: fix file collision with sys-libs/ncurses-6.1
Bug: https://bugs.gentoo.org/648472
Closes: https://github.com/gentoo/gentoo/pull/7764
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../fbterm/{fbterm-1.7-r3.ebuild => fbterm-1.7-r4.ebuild} | 8 +---
.../fbterm/{fbterm-1.7-r3.ebuild => fbterm-1.7-r5.ebuild} | 14 +++---
app-i18n/fbterm/files/fbterm-noterminfo.patch | 15 +++
3 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/app-i18n/fbterm/fbterm-1.7-r3.ebuild
b/app-i18n/fbterm/fbterm-1.7-r4.ebuild
similarity index 88%
copy from app-i18n/fbterm/fbterm-1.7-r3.ebuild
copy to app-i18n/fbterm/fbterm-1.7-r4.ebuild
index 2138ece5ef1..8b906331dde 100644
--- a/app-i18n/fbterm/fbterm-1.7-r3.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -14,11 +14,13 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="gpm video_cards_vesa"
-RDEPEND="media-libs/fontconfig
+COMMON_DEPEND="media-libs/fontconfig
media-libs/freetype:2
gpm? ( sys-libs/gpm )
video_cards_vesa? ( dev-libs/libx86 )"
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+ !>=sys-libs/ncurses-6.1"
+DEPEND="${COMMON_DEPEND}
sys-libs/ncurses
virtual/pkgconfig"
diff --git a/app-i18n/fbterm/fbterm-1.7-r3.ebuild
b/app-i18n/fbterm/fbterm-1.7-r5.ebuild
similarity index 80%
rename from app-i18n/fbterm/fbterm-1.7-r3.ebuild
rename to app-i18n/fbterm/fbterm-1.7-r5.ebuild
index 2138ece5ef1..a4b174a1f85 100644
--- a/app-i18n/fbterm/fbterm-1.7-r3.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -17,20 +17,21 @@ IUSE="gpm video_cards_vesa"
RDEPEND="media-libs/fontconfig
media-libs/freetype:2
gpm? ( sys-libs/gpm )
- video_cards_vesa? ( dev-libs/libx86 )"
+ video_cards_vesa? ( dev-libs/libx86 )
+ >=sys-libs/ncurses-6.1"
DEPEND="${RDEPEND}
- sys-libs/ncurses
virtual/pkgconfig"
-PATCHES=( "${FILESDIR}"/${PN}-gcc6.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-gcc6.patch
+ "${FILESDIR}"/${PN}-noterminfo.patch
+)
FILECAPS=(
cap_sys_tty_config+ep usr/bin/${PN}
)
src_prepare() {
- sed -i "s|tic|tic -o '\$(DESTDIR)\$(datadir)/terminfo'|"
terminfo/Makefile.am
-
default
eautoreconf
}
@@ -42,7 +43,6 @@ src_configure() {
}
src_install() {
- dodir /usr/share/terminfo
default
use filecaps || fperms u+s /usr/bin/${PN}
diff --git a/app-i18n/fbterm/files/fbterm-noterminfo.patch
b/app-i18n/fbterm/files/fbterm-noterminfo.patch
new file mode 100644
index 000..76cf9fc7792
--- /dev/null
+++ b/app-i18n/fbterm/files/fbterm-noterminfo.patch
@@ -0,0 +1,15 @@
+commit 77c90022233634a3c891dc778585c526d9d846a1
+Author: Alexey Sokolov
+Date: Sun Apr 1 11:33:20 2018 +0100
+
+Don't install terminfo: ncurses-6.1 supports fbterm itself
+
+https://bugs.gentoo.org/648472
+
+diff --git a/Makefile.am b/Makefile.am
+index 10814b6..8adcd57 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -1 +1 @@
+-SUBDIRS = src im terminfo doc
++SUBDIRS = src im doc
[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/files/, app-i18n/fbterm/
commit: c70e17dea89ffbe04e8ea898be490b64c8c0e8e5
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Aug 5 13:08:25 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Aug 5 13:08:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c70e17de
app-i18n/fbterm: update patch
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/fbterm/fbterm-1.7-r2.ebuild | 4 ++--
.../fbterm/files/{fbterm-1.7-gcc6.patch => fbterm-gcc6.patch} | 8 ++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/app-i18n/fbterm/fbterm-1.7-r2.ebuild
b/app-i18n/fbterm/fbterm-1.7-r2.ebuild
index a7b4e419e54..5685cd6a76e 100644
--- a/app-i18n/fbterm/fbterm-1.7-r2.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -27,7 +27,7 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
DOCS=( AUTHORS NEWS README )
PATCHES=(
- "${FILESDIR}"/${P}-gcc6.patch
+ "${FILESDIR}"/${PN}-gcc6.patch
)
src_configure() {
diff --git a/app-i18n/fbterm/files/fbterm-1.7-gcc6.patch
b/app-i18n/fbterm/files/fbterm-gcc6.patch
similarity index 90%
rename from app-i18n/fbterm/files/fbterm-1.7-gcc6.patch
rename to app-i18n/fbterm/files/fbterm-gcc6.patch
index 26d39f0c5bc..aa19fac9672 100644
--- a/app-i18n/fbterm/files/fbterm-1.7-gcc6.patch
+++ b/app-i18n/fbterm/files/fbterm-gcc6.patch
@@ -1,5 +1,9 @@
fbterm-1.7/src/lib/vterm_states.cpp.old2016-09-24 00:44:29.981247206
-0400
-+++ fbterm-1.7/src/lib/vterm_states.cpp2016-09-24 00:48:40.463777924
-0400
+https://bugs.gentoo.org/show_bug.cgi?id=594308
+
+Author: Peter Levine
+
+--- a/src/lib/vterm_states.cpp
b/src/lib/vterm_states.cpp
@@ -39,14 +39,14 @@
{ 0x1B, 0, ESesc },
{ 0x7F, 0, ESkeep },
[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/files/, app-i18n/fbterm/
commit: f732d20204713d7d89c230263d48ec691a34fe51
Author: Yixun Lan gentoo org>
AuthorDate: Mon Sep 26 15:13:57 2016 +
Commit: Yixun Lan gentoo org>
CommitDate: Mon Sep 26 15:14:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f732d202
app-i18n/fbterm: fix gcc6 build err
thanks Peter Levine for providing patches
Gentoo-Bug: 594308
Package-Manager: portage-2.3.1
app-i18n/fbterm/fbterm-1.7-r2.ebuild| 61 ++
app-i18n/fbterm/files/fbterm-1.7-gcc6.patch | 68 +
2 files changed, 129 insertions(+)
diff --git a/app-i18n/fbterm/fbterm-1.7-r2.ebuild
b/app-i18n/fbterm/fbterm-1.7-r2.ebuild
new file mode 100644
index ..15f6b83
--- /dev/null
+++ b/app-i18n/fbterm/fbterm-1.7-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit autotools-utils
+
+DESCRIPTION="Fast terminal emulator for the Linux framebuffer"
+HOMEPAGE="https://fbterm.googlecode.com/";
+SRC_URI="https://fbterm.googlecode.com/files/${P}.0.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="caps gpm video_cards_vesa"
+
+RDEPEND="caps? ( sys-libs/libcap )
+ gpm? ( sys-libs/gpm )
+ video_cards_vesa? ( dev-libs/libx86 )
+ media-libs/fontconfig
+ media-libs/freetype:2"
+DEPEND="${RDEPEND}
+ sys-libs/ncurses
+ virtual/pkgconfig"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+DOCS=( AUTHORS NEWS README )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc6.patch
+)
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable gpm)
+ $(use_enable video_cards_vesa vesa)
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+ $(type -P tic) -o "${ED}/usr/share/terminfo/" \
+ "${S}"/terminfo/fbterm || die "Failed to generate terminfo
database"
+ if use caps; then
+ setcap "cap_sys_tty_config+ep" "${ED}"/usr/bin/fbterm
+ else
+ fperms u+s /usr/bin/fbterm
+ fi
+}
+
+pkg_postinst() {
+ einfo
+ einfo " ${PN} won't work with vga16fb. You have to use other native"
+ einfo " framebuffer drivers or vesa driver."
+ einfo " See ${EPREFIX}/usr/share/doc/${P}/README for details."
+ einfo " To use ${PN}, ensure you are in video group."
+ einfo " To input CJK merge app-i18n/fbterm-ucimf"
+ einfo
+}
diff --git a/app-i18n/fbterm/files/fbterm-1.7-gcc6.patch
b/app-i18n/fbterm/files/fbterm-1.7-gcc6.patch
new file mode 100644
index ..26d39f0
--- /dev/null
+++ b/app-i18n/fbterm/files/fbterm-1.7-gcc6.patch
@@ -0,0 +1,68 @@
+--- fbterm-1.7/src/lib/vterm_states.cpp.old2016-09-24 00:44:29.981247206
-0400
fbterm-1.7/src/lib/vterm_states.cpp2016-09-24 00:48:40.463777924
-0400
+@@ -39,14 +39,14 @@
+ { 0x1B, 0, ESesc },
+ { 0x7F, 0, ESkeep },
+ { 0x9B, 0, ESsquare },
+- { -1}
++ { (u16) -1}
+ };
+
+ const VTerm::Sequence VTerm::escape_sequences[] = {
+ { 0, 0, ESnormal },
+
+ // ESnormal
+- { -1 },
++ { (u16) -1 },
+
+ // ESesc
+ { '[', &VTerm::clear_param, ESsquare },
+@@ -65,7 +65,7 @@
+ { '8', &VTerm::restore_cursor, ESnormal },
+ { '>', &VTerm::keypad_numeric, ESnormal },
+ { '=', &VTerm::keypad_application, ESnormal },
+- { -1 },
++ { (u16) -1 },
+
+ // ESsquare
+ { '[', 0, ESfunckey },
+@@ -104,7 +104,7 @@
+ { '`', &VTerm::cursor_position_col, ESnormal },
+ { ']', &VTerm::linux_specific, ESnormal },
+ { '}', &VTerm::fbterm_specific, ESnormal },
+- { -1 },
++ { (u16) -1 },
+
+ // ESnonstd
+ { '0' | ADDSAME(9), &VTerm::set_palette,ESkeep },
+@@ -112,25 +112,25 @@
+ { 'a' | ADDSAME(5), &VTerm::set_palette,ESkeep },
+ { 'P', &VTerm::begin_set_palette, ESkeep },
+ { 'R', &VTerm::reset_palette, ESnormal },
+- { -1 },
++ { (u16) -1 },
+
+ // ESpercent
+ { '@', &VTerm::clear_utf8, ESnormal },
+ { 'G', &VTerm::set_utf8,ESnormal },
+ { '8', &VTerm::set_utf8,ESnormal },
+- { -1 },
++ { (u16) -1 },
+
+ // EScharset
+ { '0', &VTerm::set_charset, ESnormal },
+ { 'B', &VTerm::set_charset, ESnormal },
+ { 'U', &VTerm::set_charset, ESnormal },
+ { 'K', &VTerm::set_charset, ESnormal },
+- { -1 },
++ { (u16) -1 },
+
+ // EShash
+ { '8', &VTerm::screen_align,ESnormal },
+- { -1 },
++ { (u16) -1 },
+
+ // ESfunckey
+- { -1 },
++ { (u16) -1 },
+ };
