Finally get around to updating with GCC6 patch

4 files changed, 117 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 26dcea314926..5575af6ed4ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Jan  9 18:13:36 UTC 2016
+# Thu May 18 01:05:57 UTC 2017
 pkgbase = fbterm-git
 	pkgdesc = A fast framebuffer-based terminal emulator for Linux
 	pkgver = 20150509
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/izmntuk/fbterm
 	install = fbterm-git.install
 	arch = x86_64
@@ -18,8 +18,10 @@ pkgbase = fbterm-git
 	conflicts = fbterm
 	source = git+https://github.com/izmntuk/fbterm
 	source = fbterm-insertmode.patch
+	source = 0001-Fix-build-with-gcc-6.patch
 	sha1sums = SKIP
 	sha1sums = 11b95e4a90519156bc02dc0fa3b086f37820431b
+	sha1sums = 28772b49dbf9bfbeb21606a9e204d5ffa7fee45d
 
 pkgname = fbterm-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..a5401c5d685d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+pkg/
+src/
+*.pkg.tar.xz
diff --git a/0001-Fix-build-with-gcc-6.patch b/0001-Fix-build-with-gcc-6.patch
new file mode 100644
index 000000000000..ad5dd65c48ca
--- /dev/null
+++ b/0001-Fix-build-with-gcc-6.patch
@@ -0,0 +1,104 @@
+From 69917d25c6f718572433262d86691bf24e72e4c8 Mon Sep 17 00:00:00 2001
+From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+Date: Wed, 13 Jul 2016 12:02:10 +0900
+Subject: [PATCH] Fix build with gcc-6
+
+Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+---
+ src/lib/vterm.cpp        |  4 ++--
+ src/lib/vterm_states.cpp | 18 +++++++++---------
+ 2 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/src/lib/vterm.cpp b/src/lib/vterm.cpp
+index 3a5dcc7..f79f44c 100644
+--- a/src/lib/vterm.cpp
++++ b/src/lib/vterm.cpp
+@@ -68,13 +68,13 @@ u8 VTerm::control_map[MAX_CONTROL_CODE], VTerm::escape_map[NR_STATES][MAX_ESCAPE
+ 
+ void VTerm::init_state()
+ {
+-	for (u8 i = 1; control_sequences[i].code != (u16)-1; i++) {
++	for (u8 i = 1; control_sequences[i].code != (u16)0xFFFF; i++) {
+ 		control_map[control_sequences[i].code] = i;
+ 	}
+ 
+ 	u8 state = ESnormal;
+ 	for (u8 i = 1; ; i++) {
+-		if (escape_sequences[i].code == (u16)-1) {
++		if (escape_sequences[i].code == (u16)0xFFFF) {
+ 			state++;
+ 			if (state == NR_STATES) break;
+ 		} else {
+diff --git a/src/lib/vterm_states.cpp b/src/lib/vterm_states.cpp
+index 49e7588..6aaa8b3 100644
+--- a/src/lib/vterm_states.cpp
++++ b/src/lib/vterm_states.cpp
+@@ -39,14 +39,14 @@ const VTerm::Sequence VTerm::control_sequences[] = {
+ 	{ 0x1B, 0,	ESesc },
+ 	{ 0x7F, 0,	ESkeep },
+ 	{ 0x9B, 0,	ESsquare },
+-	{ -1}
++	{ 0xFFFF}
+ };
+ 
+ const VTerm::Sequence VTerm::escape_sequences[] = {
+ 	{   0, 0, ESnormal },
+ 
+ 	// ESnormal
+-	{ -1 },
++	{ 0xFFFF },
+ 
+ 	// ESesc
+ 	{ '[', &VTerm::clear_param,	ESsquare },
+@@ -65,7 +65,7 @@ const VTerm::Sequence VTerm::escape_sequences[] = {
+ 	{ '8', &VTerm::restore_cursor,	ESnormal },
+ 	{ '>', &VTerm::keypad_numeric,	ESnormal },
+ 	{ '=', &VTerm::keypad_application,	ESnormal },
+-	{ -1 },
++	{ 0xFFFF },
+ 
+ 	// ESsquare
+ 	{ '[', 0,	ESfunckey },
+@@ -104,7 +104,7 @@ const VTerm::Sequence VTerm::escape_sequences[] = {
+ 	{ '`', &VTerm::cursor_position_col,	ESnormal },
+ 	{ ']', &VTerm::linux_specific, ESnormal },
+ 	{ '}', &VTerm::fbterm_specific, ESnormal },
+-	{ -1 },
++	{ 0xFFFF },
+ 
+ 	// ESnonstd
+ 	{ '0' | ADDSAME(9), &VTerm::set_palette,    ESkeep },
+@@ -112,25 +112,25 @@ const VTerm::Sequence VTerm::escape_sequences[] = {
+ 	{ 'a' | ADDSAME(5), &VTerm::set_palette,    ESkeep },
+ 	{ 'P', &VTerm::begin_set_palette, ESkeep },
+ 	{ 'R', &VTerm::reset_palette, ESnormal },
+-	{ -1 },
++	{ 0xFFFF },
+ 
+ 	// ESpercent
+ 	{ '@', &VTerm::clear_utf8,	ESnormal },
+ 	{ 'G', &VTerm::set_utf8,	ESnormal },
+ 	{ '8', &VTerm::set_utf8,	ESnormal },
+-	{ -1 },
++	{ 0xFFFF },
+ 
+ 	// EScharset
+ 	{ '0', &VTerm::set_charset, ESnormal },
+ 	{ 'B', &VTerm::set_charset, ESnormal },
+ 	{ 'U', &VTerm::set_charset, ESnormal },
+ 	{ 'K', &VTerm::set_charset, ESnormal },
+-	{ -1 },
++	{ 0xFFFF },
+ 
+ 	// EShash
+ 	{ '8', &VTerm::screen_align,	ESnormal },
+-	{ -1 },
++	{ 0xFFFF },
+ 
+ 	// ESfunckey
+-	{ -1 },
++	{ 0xFFFF },
+ };
+-- 
+2.8.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 84ffaff51211..28f9b54dd6a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 ## Maintainer: N. Izumi aka izmntuk
 pkgname=fbterm-git
 pkgver=20150509
-pkgrel=2
+pkgrel=3
 pkgdesc='A fast framebuffer-based terminal emulator for Linux'
 arch=(x86_64 i686)
 url='https://github.com/izmntuk/fbterm'
@@ -15,10 +15,7 @@ install="${pkgname}.install"
 source=(
 	'git+https://github.com/izmntuk/fbterm'
 	'fbterm-insertmode.patch'
-)
-sha1sums=(
-	'SKIP'
-	'11b95e4a90519156bc02dc0fa3b086f37820431b'
+	'0001-Fix-build-with-gcc-6.patch'
 )
 
 pkgver() {
@@ -29,6 +26,7 @@ pkgver() {
 prepare() {
 	cd "${srcdir}/fbterm"
 	patch -Np1 -i "${srcdir}/fbterm-insertmode.patch"
+	patch -Np1 -i "${srcdir}/0001-Fix-build-with-gcc-6.patch"
 }
 
 build() {
@@ -42,3 +40,6 @@ package() {
 	install -Dm644 terminfo/fbterm "${pkgdir}/usr/share/terminfo/f/fbterm"
 	make DESTDIR="${pkgdir}" TERMINFO="${pkgdir}/usr/share/terminfo" install
 }
+sha1sums=('SKIP'
+          '11b95e4a90519156bc02dc0fa3b086f37820431b'
+          '28772b49dbf9bfbeb21606a9e204d5ffa7fee45d')