Mercurial > mxe-octave

annotate src/of-miscellaneous-2-fixes.patch @ 4733:1ecb1e67eaa1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/src-msys-dos2unix.mk: update checksum
author John Donoghue <john.donoghue@ieee.org>
date Sat, 09 Jun 2018 10:13:46 -0400
parents ffb45d855a81
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4683
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 diff -uNr a/src/configure.ac b/src/configure.ac
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 --- a/src/configure.ac 2014-06-05 02:17:00.000000000 -0400
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 +++ b/src/configure.ac 2018-04-21 11:03:02.000000000 -0400
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 @@ -6,7 +6,10 @@
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 [],
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 [AC_CHECK_HEADER([termcap.h],
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 [],
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 - [AC_MSG_ERROR([Unable to find ncurses library headers.])]
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 + [AC_CHECK_HEADER([ncurses/termcap.h],
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 + [],
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 + [AC_MSG_ERROR([Unable to find ncurses library headers.])]
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 + ])
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 ])
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 )
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16 diff -uNr a/src/text_waitbar.cc b/src/text_waitbar.cc
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 --- a/src/text_waitbar.cc 2014-06-05 02:17:00.000000000 -0400
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 +++ b/src/text_waitbar.cc 2018-04-21 11:03:37.000000000 -0400
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 @@ -23,6 +23,8 @@
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 # include <term.h>
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21 #elif defined (HAVE_TERMCAP_H)
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22 # include <termcap.h>
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 +#elif defined (HAVE_NCURSES_TERMCAP_H)
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 +# include <ncurses/termcap.h>
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 #endif
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 };
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 diff -uNr a/src/configure b/src/configure
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29 --- a/src/configure 2014-06-05 02:18:24.000000000 -0400
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 +++ b/src/configure 2018-04-21 11:06:46.000000000 -0400
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 @@ -3205,10 +3205,18 @@
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32 if test "x$ac_cv_header_termcap_h" = xyes; then :
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34 else
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35 + ac_fn_c_check_header_mongrel "$LINENO" "ncurses/termcap.h" "ac_cv_header_ncurses_termcap_h" "$ac_includes_default"
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
36 +if test "x$ac_cv_header_ncurses_termcap_h" = xyes; then :
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
37 +
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38 +else
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
39 as_fn_error $? "Unable to find ncurses library headers." "$LINENO" 5
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
40
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
41 fi
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
42
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
43 +
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
44 +
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
45 +fi
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
46 +
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
47
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
48
ffb45d855a81 of-miscellanous: allow build to work with ncurses/termcap.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49 fi