[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/files/, app-i18n/fbterm/

[Yixun Lan]

commit:     f732d20204713d7d89c230263d48ec691a34fe51
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 15:13:57 2016 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 15:14:28 2016 +0000
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 00000000..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 00000000..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.old	2016-09-24 00:44:29.981247206 -0400
++++ fbterm-1.7/src/lib/vterm_states.cpp	2016-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 },
+ };