From bc2165c8b2d16b46846fbbf61edad9341a69f0b1 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Feb 18 2019 10:24:58 +0000 Subject: Update to texinfo-6.6 --- diff --git a/.gitignore b/.gitignore index 601df86..d3b8ba7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -/texinfo-6.4.tar.xz -/texinfo-6.4.tar.xz.sig -/texinfo-6.5.tar.xz -/texinfo-6.5.tar.xz.sig +/texinfo-6.6.tar.xz +/texinfo-6.6.tar.xz.sig diff --git a/sources b/sources index ea238ff..b522b9d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (texinfo-6.5.tar.xz) = 06831b4c74a1ba7a9cff937069e40ab26db1204aa8761d63254651ffacf6b0cb95d7078ba1cc59d95427239ab7e4f4aedf582967854281bfea3850b1ed5b1fdc -SHA512 (texinfo-6.5.tar.xz.sig) = d1b3e0bdaf80316410bb10edd25edfbf83afd6ac9a34881487722a9aafeab381272c946acd649b745f1bd9a55f279d05ac638ef610c09f4347f5e3e893b47c4f +SHA512 (texinfo-6.6.tar.xz) = 96e0764d0808152d3662e65c3287fb0f86ed918912cdc036380637dbadaacd6a489b516543c07b08105686575e8d495a945f73e23ff0909d5a0f12026e4131e0 +SHA512 (texinfo-6.6.tar.xz.sig) = b4af1d28e4cc20b6e86255b907542122aa1da423652ea962b885b2f2d1cc135747d12c4eb78a24c25320b981e2448ce87f66bf9ac264527f989dc7439cefd03b diff --git a/texinfo-20180310-texinfo.tex.patch b/texinfo-20180310-texinfo.tex.patch deleted file mode 100644 index 526fd22..0000000 --- a/texinfo-20180310-texinfo.tex.patch +++ /dev/null @@ -1,311 +0,0 @@ -diff -up texinfo-6.5/doc/texinfo.tex.old texinfo-6.5/doc/texinfo.tex ---- texinfo-6.5/doc/texinfo.tex.old 2017-08-27 05:21:32.000000000 -0400 -+++ texinfo-6.5/doc/texinfo.tex 2018-03-10 08:40:29.000000000 -0500 -@@ -3,11 +3,11 @@ - % Load plain if necessary, i.e., if running under initex. - \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi - % --\def\texinfoversion{2017-08-23.19} -+\def\texinfoversion{2018-03-10.14} - % - % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, - % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, --% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 -+% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 - % Free Software Foundation, Inc. - % - % This texinfo.tex file is free software: you can redistribute it and/or -@@ -21,7 +21,7 @@ - % General Public License for more details. - % - % You should have received a copy of the GNU General Public License --% along with this program. If not, see . -+% along with this program. If not, see . - % - % As a special exception, when this file is read by TeX when processing - % a Texinfo source document, you may use the result without -@@ -30,9 +30,9 @@ - % - % Please try the latest version of texinfo.tex before submitting bug - % reports; you can get the latest version from: --% http://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or --% http://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or --% http://www.gnu.org/software/texinfo/ (the Texinfo home page) -+% https://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or -+% https://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or -+% https://www.gnu.org/software/texinfo/ (the Texinfo home page) - % The texinfo.tex in any given distribution could well be out - % of date, so if that's what you're using, please check. - % -@@ -56,7 +56,7 @@ - % extent. You can get the existing language-specific files from the - % full Texinfo distribution. - % --% The GNU Texinfo home page is http://www.gnu.org/software/texinfo. -+% The GNU Texinfo home page is https://www.gnu.org/software/texinfo. - - - \message{Loading texinfo [version \texinfoversion]:} -@@ -2235,6 +2235,20 @@ end - \font\smallersy=cmsy8 - \def\smallerecsize{0800} - -+% Fonts for math mode superscripts (7pt). -+\def\sevennominalsize{7pt} -+\setfont\sevenrm\rmshape{7}{1000}{OT1} -+\setfont\seventt\ttshape{10}{700}{OT1TT} -+\setfont\sevenbf\bfshape{10}{700}{OT1} -+\setfont\sevenit\itshape{7}{1000}{OT1IT} -+\setfont\sevensl\slshape{10}{700}{OT1} -+\setfont\sevensf\sfshape{10}{700}{OT1} -+\setfont\sevensc\scshape{10}{700}{OT1} -+\setfont\seventtsl\ttslshape{10}{700}{OT1TT} -+\font\seveni=cmmi7 -+\font\sevensy=cmsy7 -+\def\sevenecsize{0700} -+ - % Fonts for title page (20.4pt): - \def\titlenominalsize{20pt} - \setfont\titlerm\rmbshape{12}{\magstep3}{OT1} -@@ -2369,6 +2383,20 @@ end - \font\smallersy=cmsy8 - \def\smallerecsize{0800} - -+% Fonts for math mode superscripts (7pt). -+\def\sevennominalsize{7pt} -+\setfont\sevenrm\rmshape{7}{1000}{OT1} -+\setfont\seventt\ttshape{10}{700}{OT1TT} -+\setfont\sevenbf\bfshape{10}{700}{OT1} -+\setfont\sevenit\itshape{7}{1000}{OT1IT} -+\setfont\sevensl\slshape{10}{700}{OT1} -+\setfont\sevensf\sfshape{10}{700}{OT1} -+\setfont\sevensc\scshape{10}{700}{OT1} -+\setfont\seventtsl\ttslshape{10}{700}{OT1TT} -+\font\seveni=cmmi7 -+\font\sevensy=cmsy7 -+\def\sevenecsize{0700} -+ - % Fonts for title page (20.4pt): - \def\titlenominalsize{20pt} - \setfont\titlerm\rmbshape{12}{\magstep3}{OT1} -@@ -2503,13 +2531,20 @@ end - - - % In order for the font changes to affect most math symbols and letters, --% we have to define the \textfont of the standard families. We don't --% bother to reset \scriptfont and \scriptscriptfont; awaiting user need. -+% we have to define the \textfont of the standard families. -+% We don't bother to reset \scriptscriptfont; awaiting user need. - % - \def\resetmathfonts{% - \textfont0=\rmfont \textfont1=\ifont \textfont2=\syfont - \textfont\itfam=\itfont \textfont\slfam=\slfont \textfont\bffam=\bffont - \textfont\ttfam=\ttfont \textfont\sffam=\sffont -+ % -+ % Fonts for superscript. Note that the 7pt fonts are used regardless -+ % of the current font size. -+ \scriptfont0=\sevenrm \scriptfont1=\seveni \scriptfont2=\sevensy -+ \scriptfont\itfam=\sevenit \scriptfont\slfam=\sevensl -+ \scriptfont\bffam=\sevenbf \scriptfont\ttfam=\seventt -+ \scriptfont\sffam=\sevensf - } - - % -@@ -2519,6 +2554,9 @@ end - % to also set the current \fam for math mode. Our \STYLE (e.g., \rm) - % commands hardwire \STYLEfont to set the current font. - % -+% The fonts used for \ifont are for "math italics" (\itfont is for italics -+% in regular text). \syfont is also used in math mode only. -+% - % Each font-changing command also sets the names \lsize (one size lower) - % and \lllsize (three sizes lower). These relative commands are used - % in, e.g., the LaTeX logo and acronyms. -@@ -2619,26 +2657,11 @@ end - % Markup style infrastructure. \defmarkupstylesetup\INITMACRO will - % define and register \INITMACRO to be called on markup style changes. - % \INITMACRO can check \currentmarkupstyle for the innermost --% style and the set of \ifmarkupSTYLE switches for all styles --% currently in effect. --\newif\ifmarkupvar --\newif\ifmarkupsamp --\newif\ifmarkupkey --%\newif\ifmarkupfile % @file == @samp. --%\newif\ifmarkupoption % @option == @samp. --\newif\ifmarkupcode --\newif\ifmarkupkbd --%\newif\ifmarkupenv % @env == @code. --%\newif\ifmarkupcommand % @command == @code. --\newif\ifmarkuptex % @tex (and part of @math, for now). --\newif\ifmarkupexample --\newif\ifmarkupverb --\newif\ifmarkupverbatim -+% style. - - \let\currentmarkupstyle\empty - - \def\setupmarkupstyle#1{% -- \csname markup#1true\endcsname - \def\currentmarkupstyle{#1}% - \markupstylesetup - } -@@ -2700,11 +2723,15 @@ end - % lilypond developers report. xpdf does work with the regular 0x27. - % - \def\codequoteright{% -- \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax -- \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax -- '% -+ \ifmonospace -+ \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax -+ \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax -+ '% -+ \else \char'15 \fi - \else \char'15 \fi -- \else \char'15 \fi -+ \else -+ '% -+ \fi - } - % - % and a similar option for the left quote char vs. a grave accent. -@@ -2712,13 +2739,17 @@ end - % the code environments to do likewise. - % - \def\codequoteleft{% -- \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax -- \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax -- % [Knuth] pp. 380,381,391 -- % \relax disables Spanish ligatures ?` and !` of \tt font. -- \relax`% -+ \ifmonospace -+ \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax -+ \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax -+ % [Knuth] pp. 380,381,391 -+ % \relax disables Spanish ligatures ?` and !` of \tt font. -+ \relax`% -+ \else \char'22 \fi - \else \char'22 \fi -- \else \char'22 \fi -+ \else -+ \relax`% -+ \fi - } - - % Commands to set the quote options. -@@ -5969,24 +6000,30 @@ end - % Split the last of the double-column material. - \savemarks - \balancecolumns -- % -+ }% -+ \eject % call the \output just set -+ \ifdim\pagetotal=0pt - % Having called \balancecolumns once, we do not - % want to call it again. Therefore, reset \output to its normal - % definition right away. - \global\output = {\onepageout{\pagecontents\PAGE}}% -- }% -- \eject -- \endgroup % started in \begindoublecolumns -- \restoremarks -- % Leave the double-column material on the current page, no automatic -- % page break. -- \box\balancedcolumns -- % -- % \pagegoal was set to the doubled \vsize above, since we restarted -- % the current page. We're now back to normal single-column -- % typesetting, so reset \pagegoal to the normal \vsize. -- \global\vsize = \txipageheight % -- \pagegoal = \txipageheight % -+ % -+ \endgroup % started in \begindoublecolumns -+ \restoremarks -+ % Leave the double-column material on the current page, no automatic -+ % page break. -+ \box\balancedcolumns -+ % -+ % \pagegoal was set to the doubled \vsize above, since we restarted -+ % the current page. We're now back to normal single-column -+ % typesetting, so reset \pagegoal to the normal \vsize. -+ \global\vsize = \txipageheight % -+ \pagegoal = \txipageheight % -+ \else -+ % We had some left-over material. This might happen when \doublecolumnout -+ % is called in \balancecolumns. Try again. -+ \expandafter\enddoublecolumns -+ \fi - } - \newbox\balancedcolumns - \setbox\balancedcolumns=\vbox{shouldnt see this}% -@@ -6001,6 +6038,7 @@ end - \ifdim\dimen@<5\baselineskip - % Don't split a short final column in two. - \setbox2=\vbox{}% -+ \global\setbox\balancedcolumns=\vbox{\pagesofar}% - \else - \divide\dimen@ by 2 % target to split to - \dimen@ii = \dimen@ -@@ -6016,15 +6054,15 @@ end - \repeat - }% - % Now the left column is in box 1, and the right column in box 3. -+ % - % Check whether the left column has come out higher than the page itself. - % (Note that we have doubled \vsize for the double columns, so - % the actual height of the page is 0.5\vsize). - \ifdim2\ht1>\vsize -- % Just split the last of the double column material roughly in half. -- \setbox2=\box0 -- \setbox0 = \vsplit2 to \dimen@ii -- \setbox0=\vbox to \dimen@ii {\unvbox0\vfill}% -- \setbox2=\vbox to \dimen@ii {\unvbox2\vfill}% -+ % It appears that we have been called upon to balance too much material. -+ % Output some of it with \doublecolumnout, leaving the rest on the page. -+ \setbox\PAGE=\box0 -+ \doublecolumnout - \else - % Compare the heights of the two columns. - \ifdim4\ht1>5\ht3 -@@ -6037,10 +6075,10 @@ end - \setbox2=\vbox to\ht1{\unvbox3\unskip}% - \setbox0=\vbox to\ht1{\unvbox1\unskip}% - \fi -+ \global\setbox\balancedcolumns=\vbox{\pagesofar}% - \fi - \fi - % -- \global\setbox\balancedcolumns=\vbox{\pagesofar}% - } - \catcode`\@ = \other - -@@ -9446,7 +9484,7 @@ end - \newif\ifwarnednoepsf - \newhelp\noepsfhelp{epsf.tex must be installed for images to - work. It is also included in the Texinfo distribution, or you can get -- it from ftp://tug.org/tex/epsf.tex.} -+ it from https://ctan.org/texarchive/macros/texinfo/texinfo/doc/epsf.tex.} - % - \def\image#1{% - \ifx\epsfbox\thisisundefined -@@ -11425,9 +11463,11 @@ directory should work if nowhere else do - % - \dimen0 = #1\relax - \advance\dimen0 by \voffset -+ \advance\dimen0 by 1in % reference point for DVI is 1 inch from top of page - % - \dimen2 = \hsize - \advance\dimen2 by \normaloffset -+ \advance\dimen2 by 1in % reference point is 1 inch from left edge of page - % - \internalpagesizes{#1}{\hsize}% - {\voffset}{\normaloffset}% -@@ -11675,7 +11715,7 @@ directory should work if nowhere else do - @markupsetuprqdefault - - @c Local variables: --@c eval: (add-hook 'write-file-hooks 'time-stamp) -+@c eval: (add-hook 'before-save-hook 'time-stamp) - @c page-delimiter: "^\\\\message\\|emacs-page" - @c time-stamp-start: "def\\\\texinfoversion{" - @c time-stamp-format: "%:y-%02m-%02d.%02H" diff --git a/texinfo-4.12-zlib.patch b/texinfo-4.12-zlib.patch index 0fc5bb4..78ef437 100644 --- a/texinfo-4.12-zlib.patch +++ b/texinfo-4.12-zlib.patch @@ -1,7 +1,7 @@ -diff -up texinfo-6.4/install-info/install-info.c.orig texinfo-6.4/install-info/install-info.c ---- texinfo-6.4/install-info/install-info.c.orig 2016-03-04 18:52:26.000000000 +0100 -+++ texinfo-6.4/install-info/install-info.c 2017-06-27 15:14:20.167998983 +0200 -@@ -22,6 +22,7 @@ +diff -up texinfo-6.5.91/install-info/install-info.c.orig texinfo-6.5.91/install-info/install-info.c +--- texinfo-6.5.91/install-info/install-info.c.orig 2019-01-13 12:43:10.000000000 +0100 ++++ texinfo-6.5.91/install-info/install-info.c 2019-01-14 09:31:45.322849494 +0100 +@@ -19,6 +19,7 @@ #include #include #include @@ -9,7 +9,7 @@ diff -up texinfo-6.4/install-info/install-info.c.orig texinfo-6.4/install-info/i #define TAB_WIDTH 8 -@@ -684,15 +685,15 @@ The first time you invoke Info you start +@@ -681,15 +682,15 @@ The first time you invoke Info you start Return either stdin reading the file, or a non-stdin pipe reading the output of the compression program. */ @@ -28,7 +28,7 @@ diff -up texinfo-6.4/install-info/install-info.c.orig texinfo-6.4/install-info/i /* We let them pass NULL if they don't want this info, but it's easier to always determine it. */ -@@ -700,48 +701,48 @@ open_possibly_compressed_file (char *fil +@@ -697,48 +698,48 @@ open_possibly_compressed_file (char *fil opened_filename = &local_opened_filename; *opened_filename = filename; @@ -85,7 +85,7 @@ diff -up texinfo-6.4/install-info/install-info.c.orig texinfo-6.4/install-info/i } #endif /* __MSDOS__ */ if (!f) -@@ -757,7 +758,7 @@ open_possibly_compressed_file (char *fil +@@ -754,7 +755,7 @@ open_possibly_compressed_file (char *fil (*create_callback) (filename); /* And try opening it again. */ @@ -94,7 +94,7 @@ diff -up texinfo-6.4/install-info/install-info.c.orig texinfo-6.4/install-info/i if (!f) return 0; } -@@ -767,26 +768,26 @@ open_possibly_compressed_file (char *fil +@@ -764,26 +765,26 @@ open_possibly_compressed_file (char *fil /* Read first few bytes of file rather than relying on the filename. If the file is shorter than this it can't be usable anyway. */ @@ -129,7 +129,7 @@ diff -up texinfo-6.4/install-info/install-info.c.orig texinfo-6.4/install-info/i return 0; goto determine_file_type; /* success */ } -@@ -857,35 +858,40 @@ determine_file_type: +@@ -854,35 +855,40 @@ determine_file_type: *compression_program = NULL; /* Seek back over the magic bytes. */ @@ -177,7 +177,7 @@ diff -up texinfo-6.4/install-info/install-info.c.orig texinfo-6.4/install-info/i } return f; -@@ -904,7 +910,8 @@ readfile (char *filename, int *sizep, +@@ -901,7 +907,8 @@ readfile (char *filename, int *sizep, void (*create_callback) (char *), char **opened_filename, char **compression_program) { @@ -187,7 +187,7 @@ diff -up texinfo-6.4/install-info/install-info.c.orig texinfo-6.4/install-info/i int filled = 0; int data_size = 8192; char *data = xmalloc (data_size); -@@ -912,14 +919,20 @@ readfile (char *filename, int *sizep, +@@ -909,14 +916,20 @@ readfile (char *filename, int *sizep, /* If they passed the space for the file name to return, use it. */ f = open_possibly_compressed_file (filename, create_callback, opened_filename, @@ -210,7 +210,7 @@ diff -up texinfo-6.4/install-info/install-info.c.orig texinfo-6.4/install-info/i if (nread < 0) return 0; if (nread == 0) -@@ -938,8 +951,10 @@ readfile (char *filename, int *sizep, +@@ -935,8 +948,10 @@ readfile (char *filename, int *sizep, /* We need to close the stream, since on some systems the pipe created by popen is simulated by a temporary file which only gets removed inside pclose. */ @@ -222,10 +222,10 @@ diff -up texinfo-6.4/install-info/install-info.c.orig texinfo-6.4/install-info/i *sizep = filled; return data; -diff -up texinfo-6.4/install-info/Makefile.in.orig texinfo-6.4/install-info/Makefile.in ---- texinfo-6.4/install-info/Makefile.in.orig 2017-06-23 08:04:39.000000000 +0200 -+++ texinfo-6.4/install-info/Makefile.in 2017-06-27 15:14:20.167998983 +0200 -@@ -221,7 +221,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" +diff -up texinfo-6.5.91/install-info/Makefile.in.orig texinfo-6.5.91/install-info/Makefile.in +--- texinfo-6.5.91/install-info/Makefile.in.orig 2019-01-14 09:32:31.729895052 +0100 ++++ texinfo-6.5.91/install-info/Makefile.in 2019-01-14 09:32:52.574914503 +0100 +@@ -218,7 +218,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am_ginstall_info_OBJECTS = install-info.$(OBJEXT) ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) @@ -233,4 +233,4 @@ diff -up texinfo-6.4/install-info/Makefile.in.orig texinfo-6.4/install-info/Make +ginstall_info_LDADD = $(LDADD) -lz am__DEPENDENCIES_1 = ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) diff --git a/texinfo-6.0-disable-failing-info-test.patch b/texinfo-6.0-disable-failing-info-test.patch index 813cc4b..5a8b72a 100644 --- a/texinfo-6.0-disable-failing-info-test.patch +++ b/texinfo-6.0-disable-failing-info-test.patch @@ -1,49 +1,25 @@ -diff -up texinfo-6.4.90/info/Makefile.in.orig texinfo-6.4.90/info/Makefile.in ---- texinfo-6.4.90/info/Makefile.in.orig 2017-07-10 21:06:01.000000000 +0200 -+++ texinfo-6.4.90/info/Makefile.in 2017-07-11 09:58:06.501153160 +0200 -@@ -1367,7 +1367,6 @@ TESTS = \ - t/end-of-line.sh \ - t/goal-column.sh \ - t/star-note-non-whitespace.sh \ -- t/c-u-m-x-scroll-forward.sh \ - t/last-no-history.sh \ - t/split-footnotes.sh \ - t/window-split-dir.sh \ -@@ -1392,10 +1391,6 @@ TESTS = \ - t/search-skip-screen.sh \ - t/search-empty.sh \ - t/close-window-after-search.sh \ -- t/inc-sea-forward.sh \ -- t/inc-sea-forward-nonregex.sh \ -- t/inc-sea-insensitive.sh \ -- t/inc-sea-history.sh \ - t/inc-sea-bs.sh \ - t/gc-split.sh \ - t/anchor-positions.sh \ -diff -up texinfo-6.4.90/tp/tests/Makefile.in.orig texinfo-6.4.90/tp/tests/Makefile.in ---- texinfo-6.4.90/tp/tests/Makefile.in.orig 2017-07-10 20:52:24.000000000 +0200 -+++ texinfo-6.4.90/tp/tests/Makefile.in 2017-07-11 09:59:30.838233561 +0200 -@@ -1308,7 +1308,6 @@ one_test_files_generated_list = \ - test_scripts/formatting_simplest_test_prefix_info.sh \ - test_scripts/formatting_simplest_test_css.sh \ - test_scripts/formatting_simplest_test_date_in_header.sh \ -- test_scripts/formatting_documentlanguage_set_option.sh \ - test_scripts/formatting_documentlanguage_set_unknown.sh \ - test_scripts/formatting_documentlanguage_set_option_info.sh \ - test_scripts/formatting_float_copying.sh \ -@@ -1348,7 +1347,6 @@ one_test_files_generated_list = \ - test_scripts/sectioning_top_node_up_explicit.sh \ - test_scripts/coverage_texi_formatting.sh \ - test_scripts/coverage_formatting.sh \ -- test_scripts/coverage_formatting_fr.sh \ - test_scripts/indices_double_index_entry.sh \ - test_scripts/indices_split_chapter_index.sh \ - test_scripts/indices_index_split.sh \ -@@ -1447,7 +1445,6 @@ one_test_files_generated_list = \ +diff -up texinfo-6.5.92/install-info/tests/Makefile.in.orig texinfo-6.5.92/install-info/tests/Makefile.in +--- texinfo-6.5.92/install-info/tests/Makefile.in.orig 2019-02-01 16:16:49.000000000 +0100 ++++ texinfo-6.5.92/install-info/tests/Makefile.in 2019-02-18 10:33:52.078877104 +0100 +@@ -1229,8 +1229,8 @@ ii-0021-test ii-0022-test ii-0023-test i + ii-0026-test ii-0027-test ii-0028-test ii-0029-test ii-0030-test \ + ii-0031-test ii-0032-test ii-0033-test ii-0034-test ii-0035-test \ + ii-0036-test ii-0037-test ii-0038-test ii-0039-test ii-0040-test \ +-ii-0041-test ii-0042-test ii-0043-test ii-0044-test ii-0045-test \ +-ii-0046-test ii-0047-test ii-0048-test ii-0049-test ii-0050-test \ ++ii-0042-test ii-0043-test ii-0044-test ii-0045-test \ ++ii-0046-test ii-0047-test ii-0048-test ii-0049-test \ + ii-0051-test ii-0052-test ii-0053-test ii-0054-test ii-0055-test \ + ii-0056-test ii-0057-test + +diff -up texinfo-6.5.92/tp/tests/Makefile.in.orig texinfo-6.5.92/tp/tests/Makefile.in +--- texinfo-6.5.92/tp/tests/Makefile.in.orig 2019-02-01 16:16:50.000000000 +0100 ++++ texinfo-6.5.92/tp/tests/Makefile.in 2019-02-18 10:33:13.774827269 +0100 +@@ -1374,7 +1374,6 @@ one_test_files_generated_list = \ test_scripts/layout_formatting_html32.sh \ test_scripts/layout_formatting_regions.sh \ test_scripts/layout_formatting_exotic.sh \ - test_scripts/layout_formatting_fr_icons.sh \ test_scripts/layout_formatting_chm.sh \ test_scripts/layout_formatting_nodes.sh \ - test_scripts/tex_html_block_EOL_tex.sh \ + test_scripts/layout_formatting.sh \ diff --git a/texinfo-6.5-covscan-fixes.patch b/texinfo-6.5-covscan-fixes.patch index 892685a..522d511 100644 --- a/texinfo-6.5-covscan-fixes.patch +++ b/texinfo-6.5-covscan-fixes.patch @@ -1,6 +1,6 @@ -unchanged: ---- texinfo-6.4/contrib/fix-info-dir.orig 2014-04-22 03:56:56.000000000 +0200 -+++ texinfo-6.4/contrib/fix-info-dir 2018-08-08 10:40:42.585496361 +0200 +diff -up texinfo-6.5.91/contrib/fix-info-dir.p7 texinfo-6.5.91/contrib/fix-info-dir +--- texinfo-6.5.91/contrib/fix-info-dir.p7 2019-01-21 10:52:18.453973008 +0100 ++++ texinfo-6.5.91/contrib/fix-info-dir 2019-01-21 10:52:18.456973012 +0100 @@ -28,7 +28,6 @@ if test -z "$LINENO"; then fi @@ -9,32 +9,10 @@ unchanged: MENU_FILTER1='s/^\*\([ ]\)\{1,\}/* /' MENU_FILTER2='s/\([ ]\)\{1,\}$//g' -unchanged: ---- texinfo-6.4/info/echo-area.c.orig 2018-07-25 12:42:38.806784712 +0200 -+++ texinfo-6.4/info/echo-area.c 2018-07-25 12:43:15.452815108 +0200 -@@ -979,6 +979,7 @@ info_read_completing_internal (const cha - inform_in_echo_area (_("No completions")); - else - inform_in_echo_area (_("Not complete")); -+ free (line); - continue; - } - } -unchanged: ---- texinfo-6.4/info/info.c.orig 2018-07-25 14:12:18.086188150 +0200 -+++ texinfo-6.4/info/info.c 2018-07-25 14:13:00.915223083 +0200 -@@ -295,6 +295,7 @@ get_initial_file (int *argc, char ***arg - ref_index, ref_list, ref_slots, 2); - - initial_file = MANPAGE_FILE_BUFFER_NAME; -+ free (man_node); - return; - } - } -unchanged: ---- texinfo-6.4/info/infomap.c.orig 2017-05-15 18:35:24.000000000 +0200 -+++ texinfo-6.4/info/infomap.c 2018-07-30 09:40:58.517674645 +0200 -@@ -603,6 +603,7 @@ fetch_user_maps (char *init_file) +diff -up texinfo-6.5.91/info/infomap.c.p7 texinfo-6.5.91/info/infomap.c +--- texinfo-6.5.91/info/infomap.c.p7 2019-01-13 12:43:10.000000000 +0100 ++++ texinfo-6.5.91/info/infomap.c 2019-01-21 10:52:18.457973013 +0100 +@@ -589,6 +589,7 @@ fetch_user_maps (char *init_file) compile (inf, filename, &sup_info, &sup_ea); free (filename); @@ -42,25 +20,10 @@ unchanged: return 1; } -unchanged: ---- texinfo-6.4/info/m-x.c.orig 2017-05-14 12:55:17.000000000 +0200 -+++ texinfo-6.4/info/m-x.c 2018-07-30 10:11:23.799858816 +0200 -@@ -81,7 +81,10 @@ DECLARE_INFO_COMMAND (describe_command, - InfoCommand *cmd = named_function (line); - - if (!cmd) -- return; -+ { -+ free (line); -+ return; -+ } - - window_message_in_echo_area ("%s: %s.", - line, function_documentation (cmd)); -unchanged: ---- texinfo-6.4/info/makedoc.c.orig 2014-11-07 11:58:55.000000000 +0100 -+++ texinfo-6.4/info/makedoc.c 2018-07-30 10:23:55.128644559 +0200 -@@ -427,7 +427,11 @@ process_one_file (char *filename, FILE * +diff -up texinfo-6.5.91/info/makedoc.c.p7 texinfo-6.5.91/info/makedoc.c +--- texinfo-6.5.91/info/makedoc.c.p7 2019-01-13 12:43:10.000000000 +0100 ++++ texinfo-6.5.91/info/makedoc.c 2019-01-21 10:52:18.457973013 +0100 +@@ -425,7 +425,11 @@ process_one_file (char *filename, FILE * offset++; if (offset >= file_size) @@ -73,10 +36,25 @@ unchanged: doc = xmalloc (1 + (offset - point)); strncpy (doc, buffer + point, offset - point); -unchanged: ---- texinfo-6.4/info/nodes.c 2018-07-30 10:59:25.515087533 +0200 -+++ texinfo-6.4/info/nodes.c 2018-07-30 11:10:47.547853493 +0200 -@@ -305,7 +305,10 @@ +diff -up texinfo-6.5.91/info/m-x.c.p7 texinfo-6.5.91/info/m-x.c +--- texinfo-6.5.91/info/m-x.c.p7 2019-01-13 12:43:10.000000000 +0100 ++++ texinfo-6.5.91/info/m-x.c 2019-01-21 10:52:18.457973013 +0100 +@@ -79,7 +79,10 @@ DECLARE_INFO_COMMAND (describe_command, + InfoCommand *cmd = named_function (line); + + if (!cmd) +- return; ++ { ++ free (line); ++ return; ++ } + + window_message_in_echo_area ("%s: %s.", + line, function_documentation (cmd)); +diff -up texinfo-6.5.91/info/nodes.c.p7 texinfo-6.5.91/info/nodes.c +--- texinfo-6.5.91/info/nodes.c.p7 2019-01-13 12:43:10.000000000 +0100 ++++ texinfo-6.5.91/info/nodes.c 2019-01-21 10:52:18.457973013 +0100 +@@ -303,7 +303,10 @@ get_nodes_of_tags_table (FILE_BUFFER *fi for (p = 0; nodedef[p] && nodedef[p] != INFO_TAGSEP; p++) ; if (nodedef[p] != INFO_TAGSEP) @@ -88,7 +66,7 @@ unchanged: entry->nodename = xmalloc (p + 1); strncpy (entry->nodename, nodedef, p); -@@ -479,6 +482,7 @@ +@@ -477,6 +480,7 @@ get_tags_of_indirect_tags_table (FILE_BU } file_buffer->subfiles = NULL; free_file_buffer_tags (file_buffer); @@ -96,10 +74,10 @@ unchanged: return; } -unchanged: ---- texinfo-6.4/info/session.c.orig 2018-07-30 11:11:33.997905448 +0200 -+++ texinfo-6.4/info/session.c 2018-07-30 11:38:27.135721289 +0200 -@@ -3554,6 +3554,7 @@ DECLARE_INFO_COMMAND (info_goto_invocati +diff -up texinfo-6.5.91/info/session.c.p7 texinfo-6.5.91/info/session.c +--- texinfo-6.5.91/info/session.c.p7 2019-01-13 12:43:10.000000000 +0100 ++++ texinfo-6.5.91/info/session.c 2019-01-21 10:52:18.458973014 +0100 +@@ -3552,6 +3552,7 @@ DECLARE_INFO_COMMAND (info_goto_invocati if (!line) { info_abort_key (window, 0); @@ -107,10 +85,10 @@ unchanged: return; } if (*line) -unchanged: ---- texinfo-6.4/info/variables.c.def24 2017-05-03 21:48:19.000000000 +0200 -+++ texinfo-6.4/info/variables.c 2018-07-30 12:53:06.692694120 +0200 -@@ -361,6 +361,7 @@ read_variable_name (char *prompt, WINDOW +diff -up texinfo-6.5.91/info/variables.c.p7 texinfo-6.5.91/info/variables.c +--- texinfo-6.5.91/info/variables.c.p7 2019-01-13 12:43:10.000000000 +0100 ++++ texinfo-6.5.91/info/variables.c 2019-01-21 10:52:18.459973015 +0100 +@@ -359,6 +359,7 @@ read_variable_name (char *prompt, WINDOW { char *line; REFERENCE **variables; @@ -118,7 +96,7 @@ unchanged: /* Get the completion array of variable names. */ variables = make_variable_completions_array (); -@@ -384,7 +385,9 @@ read_variable_name (char *prompt, WINDOW +@@ -382,7 +383,9 @@ read_variable_name (char *prompt, WINDOW return NULL; } @@ -129,10 +107,10 @@ unchanged: } /* Make an array of REFERENCE which actually contains the names of the -diff -u texinfo-6.4/install-info/install-info.c texinfo-6.4/install-info/install-info.c ---- texinfo-6.4/install-info/install-info.c 2018-07-30 13:47:00.265812976 +0200 -+++ texinfo-6.4/install-info/install-info.c 2018-07-30 13:53:50.427431251 +0200 -@@ -867,10 +867,16 @@ +diff -up texinfo-6.5.91/install-info/install-info.c.p7 texinfo-6.5.91/install-info/install-info.c +--- texinfo-6.5.91/install-info/install-info.c.p7 2019-01-21 10:52:18.447973002 +0100 ++++ texinfo-6.5.91/install-info/install-info.c 2019-01-21 10:52:18.460973016 +0100 +@@ -864,10 +864,16 @@ determine_file_type: char *command = concat (*compression_program, " -d", ""); if (gzclose (f) < 0) @@ -151,7 +129,7 @@ diff -u texinfo-6.4/install-info/install-info.c texinfo-6.4/install-info/install p = popen (command, "r"); if (!p) { -@@ -880,6 +886,7 @@ +@@ -877,6 +883,7 @@ determine_file_type: } else *is_pipe = 1; @@ -159,7 +137,7 @@ diff -u texinfo-6.4/install-info/install-info.c texinfo-6.4/install-info/install return p; } else -@@ -923,7 +930,10 @@ +@@ -920,7 +927,10 @@ readfile (char *filename, int *sizep, &pipe_p); if (!f) @@ -171,7 +149,7 @@ diff -u texinfo-6.4/install-info/install-info.c texinfo-6.4/install-info/install for (;;) { -@@ -983,6 +993,7 @@ +@@ -980,6 +990,7 @@ output_dirfile (char *dirfile, int dir_n { char *command = concat (compression_program, ">", dirfile_tmp); output = popen (command, "w"); @@ -179,7 +157,7 @@ diff -u texinfo-6.4/install-info/install-info.c texinfo-6.4/install-info/install } else output = fopen (dirfile_tmp, "w"); -@@ -1724,6 +1735,8 @@ +@@ -1721,6 +1732,8 @@ reformat_new_entries (struct spec_entry format_entry (name, name_len, desc, desc_len, calign, align, maxwidth, &entry->text, &entry->text_len); diff --git a/texinfo-6.5-fix-for-perl-5.28.patch b/texinfo-6.5-fix-for-perl-5.28.patch deleted file mode 100644 index 77346a8..0000000 --- a/texinfo-6.5-fix-for-perl-5.28.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up texinfo-6.5/tp/Texinfo/Parser.pm.orig texinfo-6.5/tp/Texinfo/Parser.pm ---- texinfo-6.5/tp/Texinfo/Parser.pm.orig 2018-06-12 13:40:29.356030136 +0200 -+++ texinfo-6.5/tp/Texinfo/Parser.pm 2018-06-12 13:41:28.357725639 +0200 -@@ -5478,11 +5478,11 @@ sub _parse_special_misc_command($$$$) - } - } elsif ($command eq 'clickstyle') { - # REMACRO -- if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) { -+ if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{})?\s*/) { - $args = ['@'.$1]; - $self->{'clickstyle'} = $1; - $remaining = $line; -- $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//; -+ $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{})?\s*(\@(c|comment)((\@|\s+).*)?)?//; - $has_comment = 1 if (defined($4)); - } else { - $self->line_error (sprintf($self->__( diff --git a/texinfo.spec b/texinfo.spec index a04e5a1..a1841f8 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -2,8 +2,8 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo -Version: 6.5 -Release: 12%{?dist} +Version: 6.6 +Release: 1%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -15,14 +15,10 @@ Patch1: texinfo-6.0-disable-failing-info-test.patch Patch2: texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch # Patch3: we need to fix template fix-info-dir generates Patch3: info-6.5-sync-fix-info-dir.patch -# Update to 2018-03-10 texinfo.tex -Patch4: texinfo-20180310-texinfo.tex.patch -# rhbz#1592433, bug in fix-info-dir --delete -Patch5: texinfo-6.5-fix-info-dir.patch -# Patch6: rhbz#1590308, fixes test fail with unescaped left brace -Patch6: texinfo-6.5-fix-for-perl-5.28.patch -# Patch7: fixes issues detected by static analysis -Patch7: texinfo-6.5-covscan-fixes.patch +# Patch4: rhbz#1592433, bug in fix-info-dir --delete +Patch4: texinfo-6.5-fix-info-dir.patch +# Patch5: fixes issues detected by static analysis +Patch5: texinfo-6.5-covscan-fixes.patch BuildRequires: gcc BuildRequires: perl-generators @@ -145,6 +141,10 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Mon Feb 18 2019 Vitezslav Crhonek - 6.6-1 +- Update to texinfo-6.6 + Resolves: #1677911 + * Sun Feb 03 2019 Fedora Release Engineering - 6.5-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild