Hello community, here is the log from the commit of package lynx for openSUSE:Factory checked in at 2017-04-11 09:29:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lynx (Old) and /work/SRC/openSUSE:Factory/.lynx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lynx" Tue Apr 11 09:29:20 2017 rev:32 rq:485195 version:2.8.8rel.2 Changes: -------- --- /work/SRC/openSUSE:Factory/lynx/lynx.changes 2017-04-03 11:04:06.160204393 +0200 +++ /work/SRC/openSUSE:Factory/.lynx.new/lynx.changes 2017-04-11 09:29:23.250786616 +0200 @@ -1,0 +2,6 @@ +Mon Apr 3 08:27:28 UTC 2017 - [email protected] + +- Use upstream commit f0b064b47bfa046da941f5029cdc1b4c851553ce to + replace workaround in patch lynx-2.8.8-ncurses-6.0-20170318.patch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lynx.spec ++++++ --- /var/tmp/diff_new_pack.DrBo1f/_old 2017-04-11 09:29:24.594596828 +0200 +++ /var/tmp/diff_new_pack.DrBo1f/_new 2017-04-11 09:29:24.602595699 +0200 @@ -60,7 +60,7 @@ %patch103 %patch104 %patch105 -p1 -%patch106 -p1 +%patch106 -p1 -b .106 # containing a few test msg's only: # rm -f po/{es,fr,it,ko,no,pl,pt}.po ++++++ lynx-2.8.8-ncurses-6.0-20170318.patch ++++++ --- /var/tmp/diff_new_pack.DrBo1f/_old 2017-04-11 09:29:24.634591181 +0200 +++ /var/tmp/diff_new_pack.DrBo1f/_new 2017-04-11 09:29:24.634591181 +0200 @@ -1,44 +1,75 @@ -Workaround for ncurses 6.0 patchlevel 20170318 - - + change TERMINAL structure in term.h to make it opaque. Some - applications misuse its members, e.g., directly modifying it - rather than using def_prog_mode(). +From f0b064b47bfa046da941f5029cdc1b4c851553ce Mon Sep 17 00:00:00 2001 +From: "Thomas E. Dickey" <[email protected]> +Date: Sat, 18 Mar 2017 21:44:28 +0000 +Subject: [PATCH] snapshot of project "lynx", label v2-8-9dev_11m --- - lynx2-8-8/src/LYCurses.h | 4 ++++ - lynx2-8-8/src/LYStrings.c | 4 ++-- - 2 files changed, 6 insertions(+), 2 deletions(-) + src/LYCurses.c | 16 +++++++++++----- + src/LYStrings.c | 5 +++-- + 2 files changed, 14 insertions(+), 7 deletions(-) ---- lynx2-8-8/src/LYCurses.h -+++ lynx2-8-8/src/LYCurses.h 2017-03-30 14:16:32.181566069 +0000 -@@ -234,6 +234,7 @@ typedef char chtype; - # define getbkgd(w) wgetbkgd(w) /* workaround pre-1.9.9g bug */ - # endif - -+# define NCURSES_INTERNALS 1 - # ifdef FANCY_CURSES - # if defined(NCURSES) && defined(HAVE_NCURSESW_TERM_H) - # include <ncursesw/term.h> -@@ -251,6 +252,9 @@ typedef char chtype; - # endif - # endif - -+# define CUR_TP ((TERMTYPE *)(cur_term)) -+# undef NCURSES_INTERNALS +diff --git a/src/LYCurses.c b/src/LYCurses.c +--- a/src/LYCurses.c ++++ b/src/LYCurses.c +@@ -1695,7 +1695,7 @@ void lynx_enable_mouse(int state) + void lynx_nl2crlf(int normal GCC_UNUSED) + { + #if defined(NCURSES_VERSION_PATCH) && defined(SET_TTY) && defined(TERMIOS) && defined(ONLCR) +- static TTY saved_tty; ++ static struct termios saved_tty; + static int did_save = FALSE; + static int waiting = FALSE; + static int can_fix = TRUE; +@@ -1704,8 +1704,10 @@ void lynx_nl2crlf(int normal GCC_UNUSED) + if (cur_term == 0) { + can_fix = FALSE; + } else { +- saved_tty = cur_term->Nttyb; ++ tcgetattr(fileno(stdout), &saved_tty); + did_save = TRUE; ++ if ((saved_tty.c_oflag & ONLCR)) ++ can_fix = FALSE; + #if NCURSES_VERSION_PATCH < 20010529 + /* workaround for optimizer bug with nonl() */ + if ((tigetstr("cud1") != 0 && *tigetstr("cud1") == '\n') +@@ -1717,14 +1719,18 @@ void lynx_nl2crlf(int normal GCC_UNUSED) + if (can_fix) { + if (normal) { + if (!waiting) { +- cur_term->Nttyb.c_oflag |= ONLCR; ++ struct termios alter_tty = saved_tty; + - # if defined(NCURSES_VERSION) && defined(HAVE_DEFINE_KEY) - # define USE_KEYMAPS 1 - # endif ---- lynx2-8-8/src/LYStrings.c -+++ lynx2-8-8/src/LYStrings.c 2017-03-30 13:54:46.564223023 +0000 -@@ -1008,8 +1008,8 @@ static const char *expand_tiname(const c ++ alter_tty.c_oflag |= ONLCR; ++ tcsetattr(fileno(stdout), TCSAFLUSH, &alter_tty); ++ def_prog_mode(); + waiting = TRUE; + nonl(); + } + } else { + if (waiting) { +- cur_term->Nttyb = saved_tty; +- SET_TTY(fileno(stdout), &saved_tty); ++ tcsetattr(fileno(stdout), TCSAFLUSH, &saved_tty); ++ def_prog_mode(); + waiting = FALSE; + nl(); + LYrefresh(); +diff --git a/src/LYStrings.c b/src/LYStrings.c +--- a/src/LYStrings.c ++++ b/src/LYStrings.c +@@ -1004,12 +1004,13 @@ static const char *expand_tiname(const c + { + char name[BUFSIZ]; + int code; ++ TERMTYPE *tp = (TERMTYPE *) (cur_term); + LYStrNCpy(name, first, len); if ((code = lookup_tiname(name, strnames)) >= 0 || (code = lookup_tiname(name, strfnames)) >= 0) { - if (cur_term->type.Strings[code] != 0) { - LYStrNCpy(*result, cur_term->type.Strings[code], (final - *result)); -+ if (CUR_TP->Strings[code] != 0) { -+ LYStrNCpy(*result, CUR_TP->Strings[code], (final - *result)); ++ if (tp->Strings[code] != 0) { ++ LYStrNCpy(*result, tp->Strings[code], (final - *result)); (*result) += strlen(*result); } }
