Mercurial > mxe-octave
view src/mingw-texinfo-1-fixes.patch @ 4543:7d1e45c2f175
update: more PKG_UPDATE updates, added update-octaveforge target
* src/libxml++.mk, src/libxml2.mk, src/libxshmfence.mk,
src/libxslt.mk, src/llvm.mk, src/mingwrt.mk,
src/msys-libcrypt.mk, src/msys-libopenssl.mk,
src/muparser.mk, rc/nsis.mk: update PKG_UPDATE rule
* src/of-actuarial.mk, src/of-communications.mk,
src/of-control.mk, src/of-data-smoothing.mk,
src/of-database.mk, src/of-dataframe.mk,
src/of-dicom.mk, src/of-financial.mk, src/of-fits.mk,
src/of-fl-core.mk, src/of-fuzzy-logic-toolkit.mk,
src/of-ga.mk, src/of-ga.mk, src/of-general.mk,
src/of-generate_html.mk, src/of-geometry.mk,
src/of-gsl.mk, src/of-image.mk, src/of-instrument-control.mk,
src/of-interval.mk, src/of-io.mk, src/of-linear-algebra.mk,
src/of-lssa.mk, src/of-ltfat.mk, src/of-mapping.mk,
src/of-miscellaneous.mk, src/of-nan.mk, src/of-netcdf.mk,
src/of-nurbs.mk, src/of-ocs.mk, src/of-octcdf.mk,
src/of-odepkg.mk, src/of-optim.mk, src/of-quaternion.mk,
src/of-signal.mk, src/of-sockets.mk, src/of-sparsersb.mk,
src/of-specfun.mk, src/of-splines.mk, src/of-statistics.mk,
src/of-stk.mk, src/of-strings.mk, src/of-struct.mk,
src/of-tisean.mk, src/of-tsa.mk, src/of-video.mk,
src/of-windows.mk, src/of-zeromq.mk, src/of-queueing.mk,
: use $(OCTAVE_FORGE_PKG_UPDATE)
* Makefile.in: added OCTAVE_FORGE_PKG_UPDATE macro, added update-octaveforge target
author | John D |
---|---|
date | Wed, 22 Nov 2017 15:26:02 -0500 |
parents | e50cac70e5a7 |
children | b88723578fec |
line wrap: on
line source
diff -ur texinfo-6.3.orig/info/echo-area.c texinfo-6.3/info/echo-area.c --- texinfo-6.3.orig/info/echo-area.c 2016-12-17 14:57:59.207522263 -0500 +++ texinfo-6.3/info/echo-area.c 2016-12-17 14:58:29.837452042 -0500 @@ -1528,7 +1528,7 @@ static void pause_or_input (void) { -#ifdef FD_SET +#if defined(FD_SET) && !defined(__MINGW32__) struct timeval timer; fd_set readfds; diff -ur texinfo-6.3.orig/info/man.c texinfo-6.3/info/man.c --- texinfo-6.3.orig/info/man.c 2016-12-17 14:57:59.212939079 -0500 +++ texinfo-6.3/info/man.c 2016-12-17 14:58:29.837452042 -0500 @@ -414,7 +414,7 @@ int bsize = 0; int bindex = 0; int select_result; -#if defined (FD_SET) +#if defined (FD_SET) && !defined(__MINGW32__) fd_set read_fds; timeout.tv_sec = 15; diff -ur texinfo-6.3.orig/info/pcterm.c texinfo-6.3/info/pcterm.c --- texinfo-6.3.orig/info/pcterm.c 2016-12-17 14:57:59.206438899 -0500 +++ texinfo-6.3/info/pcterm.c 2016-12-17 14:58:29.836368678 -0500 @@ -1621,7 +1621,7 @@ } /* These should never be called, but they make the linker happy. */ - +#ifndef __MINGW32__ int tputs (const char *a, int b, int (*c)(int)) { perror ("tputs"); return 0; /* here and below, added dummy retvals */ @@ -1661,3 +1661,4 @@ { perror ("tcsetattr"); return 0; } +#endif diff -ur texinfo-6.3.orig/info/session.c texinfo-6.3/info/session.c --- texinfo-6.3.orig/info/session.c 2016-12-17 14:57:59.212939079 -0500 +++ texinfo-6.3/info/session.c 2016-12-17 14:58:29.838535405 -0500 @@ -456,7 +456,7 @@ space_avail = sizeof (info_input_buffer) - (push_index - pop_index); /* If we can just find out how many characters there are to read, do so. */ -#if defined (FIONREAD) +#if defined (FIONREAD) && !defined(__MINGW32__) { ioctl (tty, FIONREAD, &chars_avail); @@ -648,7 +648,7 @@ if (in_map && pop_index == push_index) { int ready = 0; -#if defined (FD_SET) +#if defined (FD_SET) && !defined(__MINGW32__) struct timeval timer, *timerp = 0; fd_set readfds; @@ -5490,7 +5490,7 @@ ready = 1; if (!info_any_buffered_input_p ()) { -#if defined (FD_SET) +#if defined (FD_SET) && !defined(__MINGW32__) struct timeval timer; fd_set readfds; diff -ur texinfo-6.3.orig/tp/texi2any.pl texinfo-6.3/tp/texi2any.pl --- texinfo-6.3.orig/tp/texi2any.pl 2016-12-17 14:57:59.069935127 -0500 +++ texinfo-6.3/tp/texi2any.pl 2016-12-17 14:59:58.097974426 -0500 @@ -53,7 +53,7 @@ my $updir = File::Spec->updir(); # These are substituted by the Makefile to create "texi2any". - my $datadir = '@datadir@'; + my $datadir = '/usr/share'; my $package = '@PACKAGE@'; my $packagedir = '@pkglibdir@';