From 65bc9bf9e124dffbaa1ca838aa237d8ca4be7dbe Mon Sep 17 00:00:00 2001 From: Florian Franzmann Date: Fri, 30 Mar 2018 23:08:09 +0200 Subject: display/fbterm: fix build with gcc 7 --- .../fbterm/0001-fix-compilation-with-gcc-7.patch | 82 ++++++++++++++++++++++ display/fbterm/HISTORY | 3 + display/fbterm/PRE_BUILD | 5 ++ display/fbterm/configure_exit_1.patch | 25 ------- 4 files changed, 90 insertions(+), 25 deletions(-) create mode 100644 display/fbterm/0001-fix-compilation-with-gcc-7.patch create mode 100755 display/fbterm/PRE_BUILD delete mode 100644 display/fbterm/configure_exit_1.patch (limited to 'display/fbterm') diff --git a/display/fbterm/0001-fix-compilation-with-gcc-7.patch b/display/fbterm/0001-fix-compilation-with-gcc-7.patch new file mode 100644 index 0000000000..b699dbdd97 --- /dev/null +++ b/display/fbterm/0001-fix-compilation-with-gcc-7.patch @@ -0,0 +1,82 @@ +From 97e4cd15a9f56d0606f80bcb234a7d13cc870661 Mon Sep 17 00:00:00 2001 +From: Florian Franzmann +Date: Fri, 30 Mar 2018 23:05:34 +0200 +Subject: [PATCH] fix compilation with gcc 7 + +--- + src/lib/vterm_states.cpp | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/lib/vterm_states.cpp b/src/lib/vterm_states.cpp +index 49e7588..ecaf8fe 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} ++ { static_cast< u16 >(-1) } + }; + + const VTerm::Sequence VTerm::escape_sequences[] = { + { 0, 0, ESnormal }, + + // ESnormal +- { -1 }, ++ { static_cast< u16 >(-1) }, + + // 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 }, ++ { static_cast< u16 >(-1) }, + + // 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 }, ++ { static_cast< u16 >(-1) }, + + // 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 }, ++ { static_cast< u16 >(-1) }, + + // ESpercent + { '@', &VTerm::clear_utf8, ESnormal }, + { 'G', &VTerm::set_utf8, ESnormal }, + { '8', &VTerm::set_utf8, ESnormal }, +- { -1 }, ++ { static_cast< u16 >(-1) }, + + // EScharset + { '0', &VTerm::set_charset, ESnormal }, + { 'B', &VTerm::set_charset, ESnormal }, + { 'U', &VTerm::set_charset, ESnormal }, + { 'K', &VTerm::set_charset, ESnormal }, +- { -1 }, ++ { static_cast< u16 >(-1) }, + + // EShash + { '8', &VTerm::screen_align, ESnormal }, +- { -1 }, ++ { static_cast< u16 >(-1) }, + + // ESfunckey +- { -1 }, ++ { static_cast< u16 >(-1) }, + }; +-- +2.16.3 + diff --git a/display/fbterm/HISTORY b/display/fbterm/HISTORY index 702c77abf3..c233600e0d 100644 --- a/display/fbterm/HISTORY +++ b/display/fbterm/HISTORY @@ -1,5 +1,8 @@ 2018-03-30 Florian Franzmann * DETAILS: update WEB_SITE + * PRE_BUILD, 0001-fix-compilation-with-gcc-7.patch: fix build with gcc 7 + * configure_exit_1.patch: remove unused patch + 2011-07-30 Florian Franzmann * DEPENDS: changed dependency on g++ to dependency on gcc with diff --git a/display/fbterm/PRE_BUILD b/display/fbterm/PRE_BUILD new file mode 100755 index 0000000000..b434f3a176 --- /dev/null +++ b/display/fbterm/PRE_BUILD @@ -0,0 +1,5 @@ +default_pre_build && +cd "$SOURCE_DIRECTORY" && + +patch -p1 < "$SPELL_DIRECTORY/0001-fix-compilation-with-gcc-7.patch" + diff --git a/display/fbterm/configure_exit_1.patch b/display/fbterm/configure_exit_1.patch deleted file mode 100644 index 662ce16f9f..0000000000 --- a/display/fbterm/configure_exit_1.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ru configure configure ---- configure 2009-11-14 09:00:00.000000000 +0800 -+++ configure 2009-11-15 09:45:40.000000000 +0800 -@@ -5754,6 +5754,11 @@ - [ "$SIGNALFD" = "yes" ] && $as_echo "#define HAVE_SIGNALFD 1" >>confdefs.h - - -+[ "$GPM_WARN" = "yes" ] && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gpm.h doesn't exist! gpm mouse support will be disabled!" >&5 -+$as_echo "$as_me: WARNING: gpm.h doesn't exist! gpm mouse support will be disabled!" >&2;} -+[ "$VESA_WARN" = "yes" ] && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libx86.h doesn't exist! VESA support will be disabled!" >&5 -+$as_echo "$as_me: WARNING: libx86.h doesn't exist! VESA support will be disabled!" >&2;} -+ - ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile im/Makefile terminfo/Makefile doc/Makefile doc/fbterm.1" - - ac_config_links="$ac_config_links im/input_key.h:src/input_key.h im/immessage.h:src/immessage.h" -@@ -7236,8 +7241,3 @@ - $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} - fi - -- --[ "$GPM_WARN" = "yes" ] && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gpm.h doesn't exist! gpm mouse support will be disabled!" >&5 --$as_echo "$as_me: WARNING: gpm.h doesn't exist! gpm mouse support will be disabled!" >&2;} --[ "$VESA_WARN" = "yes" ] && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libx86.h doesn't exist! VESA support will be disabled!" >&5 --$as_echo "$as_me: WARNING: libx86.h doesn't exist! VESA support will be disabled!" >&2;} - -- cgit v1.2.3