diff --git a/texinfo/0000-documentencoding-is-not-file-specific.patch b/texinfo/0000-documentencoding-is-not-file-specific.patch deleted file mode 100644 index 7dd85977..00000000 --- a/texinfo/0000-documentencoding-is-not-file-specific.patch +++ /dev/null @@ -1,125 +0,0 @@ -From f7ecfb787d5c6dd117a499543e4f87683c67698e Mon Sep 17 00:00:00 2001 -From: Gavin Smith -Date: Tue, 19 Feb 2019 19:49:00 +0000 -Subject: [PATCH] @documentencoding is not file-specific. - -* tp/Texinfo/XS/parsetexi/input.c (input_encoding): New -variable. -(set_input_encoding, next_text): -Use that encoding instead of an encoding on the input stack. - -(INPUT): Remove field 'encoding'. -(input_push, input_push_file): Update. - -Eli Zaretskii reported that a @documentencoding command in an -@include'd file would not take effect outside of that file, -which was wrong for the Emacs manuals. ---- - ChangeLog | 16 ++++++++++++++ - tp/Texinfo/XS/parsetexi/input.c | 37 ++++++++++++++------------------- - 2 files changed, 32 insertions(+), 21 deletions(-) - -diff --git a/tp/Texinfo/XS/parsetexi/input.c b/tp/Texinfo/XS/parsetexi/input.c -index cad1edc47..560e637f8 100644 ---- a/tp/Texinfo/XS/parsetexi/input.c -+++ b/tp/Texinfo/XS/parsetexi/input.c -@@ -42,7 +42,6 @@ typedef struct { - enum input_type type; - - FILE *file; -- char *input_encoding; - LINE_NR line_nr; - - char *text; /* Input text to be parsed as Texinfo. */ -@@ -50,6 +49,15 @@ typedef struct { - into lines. */ - } INPUT; - -+static char *input_encoding; -+ -+void -+set_input_encoding (char *encoding) -+{ -+ input_encoding = encoding; -+} -+ -+ - static INPUT *input_stack = 0; - int input_number = 0; - int input_space = 0; -@@ -134,9 +142,9 @@ text_buffer_iconv (TEXT *buf, iconv_t iconv_state, - - - --/* Return conversion of S according to ENC. This function frees S. */ -+/* Return conversion of S according to ENCODING. This function frees S. */ - static char * --convert_to_utf8 (char *s, char *input_encoding) -+convert_to_utf8 (char *s, char *encoding) - { - iconv_t our_iconv; - static TEXT t; -@@ -184,13 +192,13 @@ convert_to_utf8 (char *s, char *input_encoding) - } - - enc = ce_latin1; -- if (!input_encoding) -+ if (!encoding) - ; -- else if (!strcmp (input_encoding, "utf-8")) -+ else if (!strcmp (encoding, "utf-8")) - enc = ce_utf8; -- else if (!strcmp (input_encoding, "iso-8859-2")) -+ else if (!strcmp (encoding, "iso-8859-2")) - enc = ce_latin2; -- else if (!strcmp (input_encoding, "shift_jis")) -+ else if (!strcmp (encoding, "shift_jis")) - enc = ce_shiftjis; - - switch (enc) -@@ -325,7 +333,7 @@ next_text (void) - i->line_nr.line_nr++; - line_nr = i->line_nr; - -- return convert_to_utf8 (line, i->input_encoding); -+ return convert_to_utf8 (line, input_encoding); - } - free (line); line = 0; - break; -@@ -368,7 +376,6 @@ input_push (char *text, char *macro, char *filename, int line_number) - input_stack[input_number].file = 0; - input_stack[input_number].text = text; - input_stack[input_number].ptext = text; -- input_stack[input_number].input_encoding = 0; - - if (!macro) - line_number--; -@@ -473,17 +480,6 @@ top_file_index (void) - return i; - } - --void --set_input_encoding (char *encoding) --{ -- int i; -- -- /* Set encoding of top file in stack. */ -- i = top_file_index (); -- if (i >= 0) -- input_stack[i].input_encoding = encoding; --} -- - - static char **include_dirs; - static size_t include_dirs_number; -@@ -578,7 +574,6 @@ input_push_file (char *filename) - input_stack[input_number].line_nr.macro = 0; - input_stack[input_number].text = 0; - input_stack[input_number].ptext = 0; -- input_stack[input_number].input_encoding = 0; - input_number++; - - return 0; --- -2.17.0 - diff --git a/texinfo/0001-texinfo-6.6-msys2.patch b/texinfo/0001-texinfo-6.7-msys2.patch similarity index 51% rename from texinfo/0001-texinfo-6.6-msys2.patch rename to texinfo/0001-texinfo-6.7-msys2.patch index e2ffbce0..e950d23d 100644 --- a/texinfo/0001-texinfo-6.6-msys2.patch +++ b/texinfo/0001-texinfo-6.7-msys2.patch @@ -1,6 +1,27 @@ -diff -Naur texinfo-6.6-orig/build-aux/compile texinfo-6.6/build-aux/compile ---- texinfo-6.6-orig/build-aux/compile 2019-01-13 14:43:09.000000000 +0300 -+++ texinfo-6.6/build-aux/compile 2019-04-25 12:50:06.138038400 +0300 +diff -Naur texinfo-6.7-orig/build-aux/ar-lib texinfo-6.7/build-aux/ar-lib +--- texinfo-6.7-orig/build-aux/ar-lib 2019-08-25 20:11:44.000000000 +0300 ++++ texinfo-6.7/build-aux/ar-lib 2020-04-20 18:12:12.414515000 +0300 +@@ -53,7 +53,7 @@ + MINGW*) + file_conv=mingw + ;; +- CYGWIN*) ++ CYGWIN*|MSYS*) + file_conv=cygwin + ;; + *) +@@ -65,7 +65,7 @@ + mingw) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; +- cygwin) ++ cygwin|msys) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine) +diff -Naur texinfo-6.7-orig/build-aux/compile texinfo-6.7/build-aux/compile +--- texinfo-6.7-orig/build-aux/compile 2019-08-25 20:11:44.000000000 +0300 ++++ texinfo-6.7/build-aux/compile 2020-04-20 18:01:17.789553000 +0300 @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw @@ -19,9 +40,9 @@ diff -Naur texinfo-6.6-orig/build-aux/compile texinfo-6.6/build-aux/compile file=`cygpath -m "$file" || echo "$file"` ;; wine/*) -diff -Naur texinfo-6.6-orig/build-aux/config.guess texinfo-6.6/build-aux/config.guess ---- texinfo-6.6-orig/build-aux/config.guess 2019-01-13 14:43:09.000000000 +0300 -+++ texinfo-6.6/build-aux/config.guess 2019-04-25 12:50:06.158038400 +0300 +diff -Naur texinfo-6.7-orig/build-aux/config.guess texinfo-6.7/build-aux/config.guess +--- texinfo-6.7-orig/build-aux/config.guess 2019-08-25 20:11:44.000000000 +0300 ++++ texinfo-6.7/build-aux/config.guess 2020-04-20 18:01:18.039202100 +0300 @@ -896,6 +896,9 @@ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-pc-cygwin @@ -32,9 +53,9 @@ diff -Naur texinfo-6.6-orig/build-aux/config.guess texinfo-6.6/build-aux/config. prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; -diff -Naur texinfo-6.6-orig/build-aux/config.rpath texinfo-6.6/build-aux/config.rpath ---- texinfo-6.6-orig/build-aux/config.rpath 2019-01-13 14:43:09.000000000 +0300 -+++ texinfo-6.6/build-aux/config.rpath 2019-04-25 12:50:06.198038500 +0300 +diff -Naur texinfo-6.7-orig/build-aux/config.rpath texinfo-6.7/build-aux/config.rpath +--- texinfo-6.7-orig/build-aux/config.rpath 2019-08-25 20:11:44.000000000 +0300 ++++ texinfo-6.7/build-aux/config.rpath 2020-04-20 18:01:18.289526300 +0300 @@ -57,7 +57,7 @@ aix*) wl='-Wl,' @@ -80,9 +101,9 @@ diff -Naur texinfo-6.6-orig/build-aux/config.rpath texinfo-6.6/build-aux/config. shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; -diff -Naur texinfo-6.6-orig/gnulib/m4/argz.m4 texinfo-6.6/gnulib/m4/argz.m4 ---- texinfo-6.6-orig/gnulib/m4/argz.m4 2019-01-13 14:43:10.000000000 +0300 -+++ texinfo-6.6/gnulib/m4/argz.m4 2019-04-25 12:50:06.218038500 +0300 +diff -Naur texinfo-6.7-orig/gnulib/m4/argz.m4 texinfo-6.7/gnulib/m4/argz.m4 +--- texinfo-6.7-orig/gnulib/m4/argz.m4 2019-08-25 20:11:45.000000000 +0300 ++++ texinfo-6.7/gnulib/m4/argz.m4 2020-04-20 18:01:18.509932600 +0300 @@ -44,7 +44,7 @@ [if argz actually works], [lt_cv_sys_argz_works], @@ -92,9 +113,9 @@ diff -Naur texinfo-6.6-orig/gnulib/m4/argz.m4 texinfo-6.6/gnulib/m4/argz.m4 lt_cv_sys_argz_works=no if test "$cross_compiling" != no; then lt_cv_sys_argz_works="guessing no" -diff -Naur texinfo-6.6-orig/gnulib/m4/btowc.m4 texinfo-6.6/gnulib/m4/btowc.m4 ---- texinfo-6.6-orig/gnulib/m4/btowc.m4 2019-01-13 14:43:10.000000000 +0300 -+++ texinfo-6.6/gnulib/m4/btowc.m4 2019-04-25 12:50:06.238038500 +0300 +diff -Naur texinfo-6.7-orig/gnulib/m4/btowc.m4 texinfo-6.7/gnulib/m4/btowc.m4 +--- texinfo-6.7-orig/gnulib/m4/btowc.m4 2019-08-25 20:11:45.000000000 +0300 ++++ texinfo-6.7/gnulib/m4/btowc.m4 2020-04-20 18:01:18.732333300 +0300 @@ -50,6 +50,8 @@ case "$host_os" in # Guess no on Cygwin. @@ -104,9 +125,9 @@ diff -Naur texinfo-6.6-orig/gnulib/m4/btowc.m4 texinfo-6.6/gnulib/m4/btowc.m4 # Guess yes on native Windows. mingw*) gl_cv_func_btowc_nul="guessing yes" ;; # Guess yes otherwise. -diff -Naur texinfo-6.6-orig/gnulib/m4/double-slash-root.m4 texinfo-6.6/gnulib/m4/double-slash-root.m4 ---- texinfo-6.6-orig/gnulib/m4/double-slash-root.m4 2019-01-13 14:43:10.000000000 +0300 -+++ texinfo-6.6/gnulib/m4/double-slash-root.m4 2019-04-25 12:50:06.258038600 +0300 +diff -Naur texinfo-6.7-orig/gnulib/m4/double-slash-root.m4 texinfo-6.7/gnulib/m4/double-slash-root.m4 +--- texinfo-6.7-orig/gnulib/m4/double-slash-root.m4 2019-08-25 20:11:45.000000000 +0300 ++++ texinfo-6.7/gnulib/m4/double-slash-root.m4 2020-04-20 18:01:18.967718900 +0300 @@ -16,7 +16,7 @@ # special semantics and is distinct from /, please report it to # . @@ -116,44 +137,62 @@ diff -Naur texinfo-6.6-orig/gnulib/m4/double-slash-root.m4 texinfo-6.6/gnulib/m4 gl_cv_double_slash_root=yes ;; *) # Be optimistic and assume that / and // are the same when we -diff -Naur texinfo-6.6-orig/gnulib/m4/malloc.m4 texinfo-6.6/gnulib/m4/malloc.m4 ---- texinfo-6.6-orig/gnulib/m4/malloc.m4 2019-01-13 14:43:10.000000000 +0300 -+++ texinfo-6.6/gnulib/m4/malloc.m4 2019-04-25 12:50:06.288038600 +0300 +diff -Naur texinfo-6.7-orig/gnulib/m4/malloc.m4 texinfo-6.7/gnulib/m4/malloc.m4 +--- texinfo-6.7-orig/gnulib/m4/malloc.m4 2019-09-19 17:18:35.000000000 +0300 ++++ texinfo-6.7/gnulib/m4/malloc.m4 2020-04-20 18:10:06.815038000 +0300 @@ -33,7 +33,7 @@ [case "$host_os" in # Guess yes on platforms where we know the result. - *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \ + *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \ - | hpux* | solaris* | cygwin* | mingw*) + | hpux* | solaris* | cygwin* | msys* | mingw*) - ac_cv_func_malloc_0_nonnull=yes ;; + ac_cv_func_malloc_0_nonnull="guessing yes" ;; # If we don't know, assume the worst. - *) ac_cv_func_malloc_0_nonnull=no ;; -diff -Naur texinfo-6.6-orig/gnulib/m4/printf.m4 texinfo-6.6/gnulib/m4/printf.m4 ---- texinfo-6.6-orig/gnulib/m4/printf.m4 2019-01-13 14:43:10.000000000 +0300 -+++ texinfo-6.6/gnulib/m4/printf.m4 2019-04-25 12:50:06.308038600 +0300 -@@ -850,6 +850,7 @@ + *) ac_cv_func_malloc_0_nonnull="guessing no" ;; +diff -Naur texinfo-6.7-orig/gnulib/m4/printf.m4 texinfo-6.7/gnulib/m4/printf.m4 +--- texinfo-6.7-orig/gnulib/m4/printf.m4 2019-09-19 17:18:35.000000000 +0300 ++++ texinfo-6.7/gnulib/m4/printf.m4 2020-04-20 18:09:17.208335600 +0300 +@@ -795,6 +795,7 @@ + irix*) gl_cv_func_printf_directive_ls="guessing no";; + solaris*) gl_cv_func_printf_directive_ls="guessing no";; + cygwin*) gl_cv_func_printf_directive_ls="guessing no";; ++ msys*) gl_cv_func_printf_directive_ls="guessing no";; + beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";; + # Guess no on Android. + linux*-android*) gl_cv_func_printf_directive_ls="guessing no";; +@@ -878,7 +879,7 @@ + [ changequote(,)dnl case "$host_os" in - cygwin*) gl_cv_func_printf_flag_grouping="guessing no";; -+ msys*) gl_cv_func_printf_flag_grouping="guessing no";; - netbsd*) gl_cv_func_printf_flag_grouping="guessing no";; - # Guess no on native Windows. - mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";; -diff -Naur texinfo-6.6-orig/gnulib/m4/threadlib.m4 texinfo-6.6/gnulib/m4/threadlib.m4 ---- texinfo-6.6-orig/gnulib/m4/threadlib.m4 2019-01-13 14:43:10.000000000 +0300 -+++ texinfo-6.6/gnulib/m4/threadlib.m4 2019-04-25 12:50:06.308038600 +0300 -@@ -66,7 +66,7 @@ +- cygwin*) gl_cv_func_printf_flag_grouping="guessing no";; ++ cygwin* | msys*) gl_cv_func_printf_flag_grouping="guessing no";; + netbsd*) gl_cv_func_printf_flag_grouping="guessing no";; + # Guess no on Android. + linux*-android*) gl_cv_func_printf_flag_grouping="guessing no";; +@@ -1582,6 +1583,8 @@ + darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on Cygwin. + cygwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; ++ # Guess yes on MSYS. ++ msys*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on Solaris >= 2.6. + solaris2.[0-5] | solaris2.[0-5].*) + gl_cv_func_vsnprintf_zerosize_c99="guessing no";; +diff -Naur texinfo-6.7-orig/gnulib/m4/threadlib.m4 texinfo-6.7/gnulib/m4/threadlib.m4 +--- texinfo-6.7-orig/gnulib/m4/threadlib.m4 2019-09-19 17:18:35.000000000 +0300 ++++ texinfo-6.7/gnulib/m4/threadlib.m4 2020-04-20 18:07:56.984758200 +0300 +@@ -69,7 +69,7 @@ + dnl Disable multithreading by default on Cygwin 1.5.x, because it has dnl bugs that lead to endless loops or crashes. See dnl . - osf*) gl_use_threads=no ;; - cygwin*) + cygwin* | msys*) case `uname -r` in 1.[0-5].*) gl_use_threads=no ;; *) gl_use_threads=yes ;; -diff -Naur texinfo-6.6-orig/install-info/tests/defs.in texinfo-6.6/install-info/tests/defs.in ---- texinfo-6.6-orig/install-info/tests/defs.in 2019-01-13 14:43:10.000000000 +0300 -+++ texinfo-6.6/install-info/tests/defs.in 2019-04-25 12:50:06.318038600 +0300 +diff -Naur texinfo-6.7-orig/install-info/tests/defs.in texinfo-6.7/install-info/tests/defs.in +--- texinfo-6.7-orig/install-info/tests/defs.in 2019-08-25 20:11:45.000000000 +0300 ++++ texinfo-6.7/install-info/tests/defs.in 2020-04-20 18:01:19.883357200 +0300 @@ -67,7 +67,7 @@ # directories in TEXINPUTS -- except for Cygwin et al., where COMSPEC # might be inherited, but : is used. @@ -163,9 +202,9 @@ diff -Naur texinfo-6.6-orig/install-info/tests/defs.in texinfo-6.6/install-info/ path_sep=";" else path_sep=":" -diff -Naur texinfo-6.6-orig/tp/Texinfo/XS/compile texinfo-6.6/tp/Texinfo/XS/compile ---- texinfo-6.6-orig/tp/Texinfo/XS/compile 2019-01-03 16:26:43.000000000 +0300 -+++ texinfo-6.6/tp/Texinfo/XS/compile 2019-04-25 12:53:20.827311500 +0300 +diff -Naur texinfo-6.7-orig/tp/Texinfo/XS/compile texinfo-6.7/tp/Texinfo/XS/compile +--- texinfo-6.7-orig/tp/Texinfo/XS/compile 2019-09-17 20:20:38.000000000 +0300 ++++ texinfo-6.7/tp/Texinfo/XS/compile 2020-04-20 18:01:20.111746700 +0300 @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw @@ -184,22 +223,22 @@ diff -Naur texinfo-6.6-orig/tp/Texinfo/XS/compile texinfo-6.6/tp/Texinfo/XS/comp file=`cygpath -m "$file" || echo "$file"` ;; wine/*) -diff -Naur texinfo-6.6-orig/tp/Texinfo/XS/config.guess texinfo-6.6/tp/Texinfo/XS/config.guess ---- texinfo-6.6-orig/tp/Texinfo/XS/config.guess 2019-01-03 16:26:43.000000000 +0300 -+++ texinfo-6.6/tp/Texinfo/XS/config.guess 2019-04-25 12:52:54.696274800 +0300 -@@ -867,6 +867,9 @@ +diff -Naur texinfo-6.7-orig/tp/Texinfo/XS/config.guess texinfo-6.7/tp/Texinfo/XS/config.guess +--- texinfo-6.7-orig/tp/Texinfo/XS/config.guess 2019-09-17 20:20:38.000000000 +0300 ++++ texinfo-6.7/tp/Texinfo/XS/config.guess 2020-04-20 18:07:10.917602100 +0300 +@@ -883,6 +883,9 @@ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; + amd64:MSYS*:*:* | x86_64:MSYS*:*:*) -+ echo x86_64-unknown-msys ++ echo x86_64-unknown-cygwin + exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; -diff -Naur texinfo-6.6-orig/tp/Texinfo/XS/config.rpath texinfo-6.6/tp/Texinfo/XS/config.rpath ---- texinfo-6.6-orig/tp/Texinfo/XS/config.rpath 2019-01-13 14:43:11.000000000 +0300 -+++ texinfo-6.6/tp/Texinfo/XS/config.rpath 2019-04-25 12:53:47.289348600 +0300 +diff -Naur texinfo-6.7-orig/tp/Texinfo/XS/config.rpath texinfo-6.7/tp/Texinfo/XS/config.rpath +--- texinfo-6.7-orig/tp/Texinfo/XS/config.rpath 2019-09-19 17:24:29.000000000 +0300 ++++ texinfo-6.7/tp/Texinfo/XS/config.rpath 2020-04-20 18:01:20.573497200 +0300 @@ -57,7 +57,7 @@ aix*) wl='-Wl,' @@ -245,10 +284,10 @@ diff -Naur texinfo-6.6-orig/tp/Texinfo/XS/config.rpath texinfo-6.6/tp/Texinfo/XS shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; -diff -Naur texinfo-6.6-orig/tp/Texinfo/XS/configure.ac texinfo-6.6/tp/Texinfo/XS/configure.ac ---- texinfo-6.6-orig/tp/Texinfo/XS/configure.ac 2019-02-04 22:27:58.000000000 +0300 -+++ texinfo-6.6/tp/Texinfo/XS/configure.ac 2019-04-25 12:54:07.481377000 +0300 -@@ -104,7 +104,7 @@ +diff -Naur texinfo-6.7-orig/tp/Texinfo/XS/configure.ac texinfo-6.7/tp/Texinfo/XS/configure.ac +--- texinfo-6.7-orig/tp/Texinfo/XS/configure.ac 2019-08-25 20:11:45.000000000 +0300 ++++ texinfo-6.7/tp/Texinfo/XS/configure.ac 2020-04-20 18:01:20.794900900 +0300 +@@ -105,7 +105,7 @@ # variables. host_needs_no_undefined=no @@ -257,7 +296,7 @@ diff -Naur texinfo-6.6-orig/tp/Texinfo/XS/configure.ac texinfo-6.6/tp/Texinfo/XS host_needs_no_undefined=yes ;; esac AM_CONDITIONAL([HOST_NEEDS_NO_UNDEFINED], -@@ -134,7 +134,8 @@ +@@ -135,7 +135,8 @@ PERL_CONF_libperl=`echo $PERL_CONF_libperl \ | sed -e 's/^lib/-l/' \ -e 's/\..*//' \ @@ -267,9 +306,9 @@ diff -Naur texinfo-6.6-orig/tp/Texinfo/XS/configure.ac texinfo-6.6/tp/Texinfo/XS lookup_perl_conf_values([[archlibexp], [privlibexp]]) -diff -Naur texinfo-6.6-orig/tp/Texinfo/XS/gnulib/m4/ltoptions.m4 texinfo-6.6/tp/Texinfo/XS/gnulib/m4/ltoptions.m4 ---- texinfo-6.6-orig/tp/Texinfo/XS/gnulib/m4/ltoptions.m4 2019-01-13 14:43:11.000000000 +0300 -+++ texinfo-6.6/tp/Texinfo/XS/gnulib/m4/ltoptions.m4 2019-04-25 12:54:56.453445700 +0300 +diff -Naur texinfo-6.7-orig/tp/Texinfo/XS/gnulib/m4/ltoptions.m4 texinfo-6.7/tp/Texinfo/XS/gnulib/m4/ltoptions.m4 +--- texinfo-6.7-orig/tp/Texinfo/XS/gnulib/m4/ltoptions.m4 2019-09-17 20:20:32.000000000 +0300 ++++ texinfo-6.7/tp/Texinfo/XS/gnulib/m4/ltoptions.m4 2020-04-20 18:01:21.243781800 +0300 @@ -128,7 +128,7 @@ [enable_win32_dll=yes @@ -279,18 +318,27 @@ diff -Naur texinfo-6.6-orig/tp/Texinfo/XS/gnulib/m4/ltoptions.m4 texinfo-6.6/tp/ AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(OBJDUMP, objdump, false) -diff -Naur texinfo-6.6-orig/tp/Texinfo/XS/gnulib/m4/printf.m4 texinfo-6.6/tp/Texinfo/XS/gnulib/m4/printf.m4 ---- texinfo-6.6-orig/tp/Texinfo/XS/gnulib/m4/printf.m4 2019-01-13 14:43:11.000000000 +0300 -+++ texinfo-6.6/tp/Texinfo/XS/gnulib/m4/printf.m4 2019-04-25 12:55:47.276517000 +0300 -@@ -770,6 +770,7 @@ - irix*) gl_cv_func_printf_directive_ls="guessing no";; - solaris*) gl_cv_func_printf_directive_ls="guessing no";; - cygwin*) gl_cv_func_printf_directive_ls="guessing no";; -+ msys*) gl_cv_func_printf_directive_ls="guessing no";; - beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";; - # Guess yes on native Windows. - mingw*) gl_cv_func_printf_directive_ls="guessing yes";; -@@ -1525,6 +1526,8 @@ +diff -Naur texinfo-6.7-orig/tp/Texinfo/XS/gnulib/m4/printf.m4 texinfo-6.7/tp/Texinfo/XS/gnulib/m4/printf.m4 +--- texinfo-6.7-orig/tp/Texinfo/XS/gnulib/m4/printf.m4 2019-09-19 17:24:30.000000000 +0300 ++++ texinfo-6.7/tp/Texinfo/XS/gnulib/m4/printf.m4 2020-04-20 18:06:02.872707800 +0300 +@@ -795,6 +795,7 @@ + irix*) gl_cv_func_printf_directive_ls="guessing no";; + solaris*) gl_cv_func_printf_directive_ls="guessing no";; + cygwin*) gl_cv_func_printf_directive_ls="guessing no";; ++ msys*) gl_cv_func_printf_directive_ls="guessing no";; + beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";; + # Guess no on Android. + linux*-android*) gl_cv_func_printf_directive_ls="guessing no";; +@@ -878,7 +879,7 @@ + [ + changequote(,)dnl + case "$host_os" in +- cygwin*) gl_cv_func_printf_flag_grouping="guessing no";; ++ cygwin* | msys*) gl_cv_func_printf_flag_grouping="guessing no";; + netbsd*) gl_cv_func_printf_flag_grouping="guessing no";; + # Guess no on Android. + linux*-android*) gl_cv_func_printf_flag_grouping="guessing no";; +@@ -1582,6 +1583,8 @@ darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; # Guess yes on Cygwin. cygwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; diff --git a/texinfo/0006-match-msys-gettext-version.patch b/texinfo/0006-match-msys-gettext-version.patch new file mode 100644 index 00000000..5f837286 --- /dev/null +++ b/texinfo/0006-match-msys-gettext-version.patch @@ -0,0 +1,11 @@ +--- texinfo-6.7/configure.ac.orig 2020-04-20 18:30:32.028533900 +0300 ++++ texinfo-6.7/configure.ac 2020-04-20 18:30:58.115891400 +0300 +@@ -314,7 +314,7 @@ + # i18n support. To update to a new version of gettext, run: + # gettextize -f --po-dir=po --po-dir=po_document + # See http://gnu.org/s/gnulib/manual/html_node/gettextize-and-autopoint.html. +-AM_GNU_GETTEXT_VERSION([0.20]) ++AM_GNU_GETTEXT_VERSION([0.19.8]) + AM_GNU_GETTEXT([external]) + + USE_EXTERNAL_LIBINTL=no diff --git a/texinfo/PKGBUILD b/texinfo/PKGBUILD index 76e69a54..b875994f 100644 --- a/texinfo/PKGBUILD +++ b/texinfo/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Alexey Pavlov pkgname=('texinfo' 'info' 'texinfo-tex') -pkgver=6.6 -pkgrel=2 +pkgver=6.7 +pkgrel=1 pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file" arch=('i686' 'x86_64') url="https://www.gnu.org/software/texinfo/" @@ -10,26 +10,29 @@ license=('GPL3') makedepends=('libcrypt-devel' 'ncurses-devel' 'gettext-devel' 'findutils' 'gzip' 'perl') source=(https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} 0000-documentencoding-is-not-file-specific.patch - 0001-texinfo-6.6-msys2.patch + 0001-texinfo-6.7-msys2.patch 0002-manifest.all.patch 0004-no-w32-stuff.msys2.patch - 0005-fix-makeinfo-exeext.msys2.patch) -sha256sums=('9bb9ca00da53f26a7e5725eee49689cd4a1e18d25d5b061ac8b2053018d93d66' + 0005-fix-makeinfo-exeext.msys2.patch + 0006-match-msys-gettext-version.patch) +sha256sums=('988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa' 'SKIP' 'd16bd1fe877ccf9f96827ff4811afcd986f575d86fd839adf62a67d64555ffc0' - '28f148f9e5af453f87bfd026b81413a4f3b00a3bc60eaaadf5d668c22bbe152e' + '18c9b8118c1c0774298a16efd02d2e9c72523c0bc234ad33f21d141d14bd81e0' 'db2c67546da5f11dc8e374dbf70269227a0df15045dc3456f7a9e74c353083d5' 'ccf696f2777ebd2c85c4cb311a4735957ffa40952ecbe50c7031b9f05dc6cdee' - 'e5b18f11d9a5d99f96f9228266e6204cfb2e076e2d9c336db0eceb72e2252873') + 'e5b18f11d9a5d99f96f9228266e6204cfb2e076e2d9c336db0eceb72e2252873' + 'f30442c35aa9e56740f718f80958450c313beb8ea896864e13046de1c574e3f3') validpgpkeys=('EAF669B31E31E1DECBD11513DDBC579DAB37FBA9') # Gavin Smith prepare() { cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 -i ${srcdir}/0000-documentencoding-is-not-file-specific.patch - patch -p1 -i ${srcdir}/0001-texinfo-6.6-msys2.patch + #patch -p1 -i ${srcdir}/0000-documentencoding-is-not-file-specific.patch + patch -p1 -i ${srcdir}/0001-texinfo-6.7-msys2.patch patch -p1 -i ${srcdir}/0002-manifest.all.patch patch -p1 -i ${srcdir}/0004-no-w32-stuff.msys2.patch patch -p1 -i ${srcdir}/0005-fix-makeinfo-exeext.msys2.patch + patch -p1 -i ${srcdir}/0006-match-msys-gettext-version.patch autoreconf -fiv pushd tp/Texinfo/XS