Revert "Update to texinfo-7.1."
This reverts commit 9813bb1d13c625d48ecd950bfaafc274383ca049. ffmpeg fails to build natively with the new makeinfo: perl ./doc/texidep.pl . doc/ffmpeg-utils.texi doc/ffmpeg-utils.html >doc/ffmpeg-utils.html.d makeinfo --html -I doc --no-split -D config-not-all --init-file=./doc/t2h.pm --output doc/ffmpeg-utils.html doc/ffmpeg-utils.texi makeinfo: error parsing ./doc/t2h.pm: Undefined subroutine &Texinfo::Config::set_from_init_file called at ./doc/t2h.pm line 24.
This commit is contained in:
parent
abd57ad77c
commit
c258e9b68d
2 changed files with 15 additions and 46 deletions
|
@ -1,16 +1,3 @@
|
|||
diff -Paur --no-dereference -- texinfo.upstream/Makefile.in texinfo/Makefile.in
|
||||
--- texinfo.upstream/Makefile.in
|
||||
+++ texinfo/Makefile.in
|
||||
@@ -2102,6 +2102,9 @@
|
||||
distclean: distclean-recursive
|
||||
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
|
||||
-rm -f Makefile
|
||||
+ # PATCH: Empty .deps directories are left behind.
|
||||
+ find -type d -name .deps -prune -exec rm -rf '{}' ';'
|
||||
+ rm -rf gnulib/lib/sys
|
||||
distclean-am: clean-am distclean-generic distclean-hdr distclean-local \
|
||||
distclean-tags
|
||||
|
||||
diff -Paur --no-dereference -- texinfo.upstream/configure texinfo/configure
|
||||
--- texinfo.upstream/configure
|
||||
+++ texinfo/configure
|
||||
|
@ -137,34 +124,18 @@ diff -Paur --no-dereference -- texinfo.upstream/configure texinfo/configure
|
|||
+export gl_cv_struct_dirent_d_ino=yes # Only if the OS actually supports this, Sortix does.
|
||||
+export ac_cv_func_realloc_0_nonnull=yes # TODO: Investigate this, found in flex.
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.71 for GNU Texinfo 7.1.
|
||||
# Generated by GNU Autoconf 2.71 for GNU Texinfo 6.8.
|
||||
#
|
||||
@@ -36438,10 +36558,8 @@
|
||||
for euc_cn_iconv_const in '' 'const'; do
|
||||
if test "$cross_compiling" = yes
|
||||
then :
|
||||
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
-as_fn_error $? "cannot run test program while cross compiling
|
||||
-See \`config.log' for more details" "$LINENO" 5; }
|
||||
+ # PATCH: Don't break cross builds on a minor check like this.
|
||||
+ texinfo_cv_sys_iconv_converts_euc_cn=yes
|
||||
else $as_nop
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
diff -Paur --no-dereference -- texinfo.upstream/info/man.c texinfo/info/man.c
|
||||
--- texinfo.upstream/info/man.c
|
||||
+++ texinfo/info/man.c
|
||||
@@ -375,9 +375,9 @@
|
||||
pid_t child;
|
||||
int formatter_status = 0;
|
||||
diff -Paur --no-dereference -- texinfo.upstream/Makefile.in texinfo/Makefile.in
|
||||
--- texinfo.upstream/Makefile.in
|
||||
+++ texinfo/Makefile.in
|
||||
@@ -1795,6 +1795,9 @@
|
||||
distclean: distclean-recursive
|
||||
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
|
||||
-rm -f Makefile
|
||||
+ # PATCH: Empty .deps directories are left behind.
|
||||
+ find -type d -name .deps -prune -exec rm -rf '{}' ';'
|
||||
+ rm -rf gnulib/lib/sys
|
||||
distclean-am: clean-am distclean-generic distclean-hdr distclean-local \
|
||||
distclean-tags
|
||||
|
||||
- putenv ("MAN_KEEP_FORMATTING=1"); /* Get codes for bold etc. */
|
||||
- putenv ("GROFF_SGR=1"); /* for Debian whose man outputs
|
||||
- 'overstrike' sequences without this */
|
||||
+ setenv ("MAN_KEEP_FORMATTING", "1", 1); /* Get codes for bold etc. */
|
||||
+ setenv ("GROFF_SGR", "1", 1); /* for Debian whose man outputs
|
||||
+ 'overstrike' sequences without this */
|
||||
|
||||
/* Open a pipe to this program, read the output, and save it away
|
||||
in FORMATTED_PAGE. The reader end of the pipe is pipes[0]; the
|
||||
|
|
|
@ -1,14 +1,12 @@
|
|||
NAME=texinfo
|
||||
BUILD_LIBRARIES='libiconv? libintl?'
|
||||
VERSION=7.1
|
||||
VERSION=6.8
|
||||
DISTNAME=$NAME-$VERSION
|
||||
COMPRESSION=tar.xz
|
||||
ARCHIVE=$DISTNAME.$COMPRESSION
|
||||
SHA256SUM=deeec9f19f159e046fdf8ad22231981806dac332cc372f1c763504ad82b30953
|
||||
SHA256SUM=8eb753ed28bca21f8f56c1a180362aed789229bd62fff58bf8368e9beb59fec4
|
||||
UPSTREAM_SITE=https://ftp.gnu.org/gnu/texinfo
|
||||
UPSTREAM_ARCHIVE=$ARCHIVE
|
||||
LICENSE=GPL-3.0-or-later
|
||||
BUILD_SYSTEM=configure
|
||||
CONFIGURE_ARGS=--disable-perl-xs
|
||||
MAKE_VARS='V=1'
|
||||
DEVELOPMENT=true
|
||||
|
|
Loading…
Reference in a new issue