From c70e17dea89ffbe04e8ea898be490b64c8c0e8e5 Mon Sep 17 00:00:00 2001
From: Akinori Hattori <hattya@gentoo.org>
Date: Sat, 5 Aug 2017 22:08:25 +0900
Subject: app-i18n/fbterm: update patch

Package-Manager: Portage-2.3.6, Repoman-2.3.1
---
 app-i18n/fbterm/fbterm-1.7-r2.ebuild        |  4 +-
 app-i18n/fbterm/files/fbterm-1.7-gcc6.patch | 68 ---------------------------
 app-i18n/fbterm/files/fbterm-gcc6.patch     | 72 +++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 70 deletions(-)
 delete mode 100644 app-i18n/fbterm/files/fbterm-1.7-gcc6.patch
 create mode 100644 app-i18n/fbterm/files/fbterm-gcc6.patch

(limited to 'app-i18n/fbterm')

diff --git a/app-i18n/fbterm/fbterm-1.7-r2.ebuild b/app-i18n/fbterm/fbterm-1.7-r2.ebuild
index a7b4e419e54b..5685cd6a76e3 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-1.7-gcc6.patch
deleted file mode 100644
index 26d39f0c5bc1..000000000000
--- a/app-i18n/fbterm/files/fbterm-1.7-gcc6.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- 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 },
- };
diff --git a/app-i18n/fbterm/files/fbterm-gcc6.patch b/app-i18n/fbterm/files/fbterm-gcc6.patch
new file mode 100644
index 000000000000..aa19fac96723
--- /dev/null
+++ b/app-i18n/fbterm/files/fbterm-gcc6.patch
@@ -0,0 +1,72 @@
+https://bugs.gentoo.org/show_bug.cgi?id=594308
+
+Author: Peter Levine <plevine457@gmail.com>
+
+--- a/src/lib/vterm_states.cpp
++++ b/src/lib/vterm_states.cpp
+@@ -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 },
+ };
-- 
cgit v1.2.3-65-gdbad