octave: depend on texinfo (mingw-w64)

mingw-w64-octave/0005-makeinfo-perl.patch

@@ -1,24 +0,0 @@
-# HG changeset patch
-# User Markus Mützel <markus.muetzel@gmx.de>
-# Date 1647626170 -3600
-#      Fri Mar 18 18:56:10 2022 +0100
-# Branch stable
-# Node ID fa26a529cf60ee8e048390eac38c33f92d4d8b11
-# Parent  4d2da8a3dca69327150b4ecc5e6b7bb9630877e5
-Set up for correctly executing makeinfo perl script on Windows.
-
-* scripts/startup/version-rcfile: On Windows, perl scripts cannot be executed
-using the shebang mechanism. Set up for calling it with perl explicitly instead.
-
-diff -r 4d2da8a3dca6 -r fa26a529cf60 scripts/startup/version-rcfile
---- a/scripts/startup/version-rcfile	Thu Mar 17 16:41:42 2022 +0100
-+++ b/scripts/startup/version-rcfile	Fri Mar 18 18:56:10 2022 +0100
-@@ -25,3 +25,8 @@
- if (strcmp (PAGER (), "less") && isempty (getenv ("LESS")))
-   PAGER_FLAGS ('-e -X -P"-- less ?pB(%pB\\%):--. (f)orward, (b)ack, (q)uit$"');
- endif
-+
-+## On Windows, perl scripts must be run using the perl interpreter
-+[~, tempval] = system ("cygpath -w /usr/bin");
-+makeinfo_program (sprintf ("%s && cd %s && perl makeinfo", tempval(1:2), strtrim (tempval)));
-+clear ("tempval");

mingw-w64-octave/PKGBUILD

@@ -4,7 +4,7 @@ _realname=octave
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=9.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="GNU Octave: Interactive programming environment for numerical computations (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -43,6 +43,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-readline"
          "${MINGW_PACKAGE_PREFIX}-suitesparse"
          "${MINGW_PACKAGE_PREFIX}-sundials"
+         "${MINGW_PACKAGE_PREFIX}-texinfo"
          "${MINGW_PACKAGE_PREFIX}-zlib")
 makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
              "${MINGW_PACKAGE_PREFIX}-cc"
@@ -54,8 +55,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
              "${MINGW_PACKAGE_PREFIX}-rapidjson")
 checkdepends=("unzip"
               "zip")
-optdepends=('texinfo: for help-support in Octave'
-            "unzip: for decompressing .zip archives"
+optdepends=("unzip: for decompressing .zip archives"
             "zip: for compressing .zip archives"
             "${MINGW_PACKAGE_PREFIX}-epstool: eps output with tight bounding box"
             "${MINGW_PACKAGE_PREFIX}-fltk: alternative plotting and dialogs"
@@ -64,15 +64,13 @@ optdepends=('texinfo: for help-support in Octave'
 source=(https://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.xz{,.sig}
         "0001-correct-LIBS.patch::https://hg.savannah.gnu.org/hgweb/octave/raw-rev/557fbfea93ab"
         "0002-mk-doc-cache-path.patch"
-        "0003-no-community-support.patch"
-        "0005-makeinfo-perl.patch")
+        "0003-no-community-support.patch")
 validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
 sha256sums=('ed654b024aea56c44b26f131d31febc58b7cf6a82fad9f0b0bf6e3e9aa1a134b'
             'SKIP'
             '71fb01e039c79781e52cf95506ad3126c9e911a5f20e796195ca84faa73e9b9c'
             'aa5bd559d9774abc0f0c930a606762d1e452cc90278d16d8ae83561c0cae3bf8'
-            'e53af21ad087e10a2906506589aab89ab8b43f4e3e4994b4c28e4d8ae83639ad'
-            '3f6756b39547d996955762b71ce6845a8ebfde6bad92a3a1a6d72fd43df5973d')
+            'e53af21ad087e10a2906506589aab89ab8b43f4e3e4994b4c28e4d8ae83639ad')
 
 apply_patch_with_msg() {
   for _patch in "$@"
@@ -87,8 +85,7 @@ prepare() {
 
   apply_patch_with_msg \
     0001-correct-LIBS.patch \
-    0002-mk-doc-cache-path.patch \
-    0005-makeinfo-perl.patch
+    0002-mk-doc-cache-path.patch
 
   if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then
     apply_patch_with_msg \

mingw-w64-texinfo/PKGBUILD

@@ -7,7 +7,7 @@ pkgver=7.1
 pkgrel=1
 pkgdesc="GNU documentation system for on-line information and printed output (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64' 'mingw32')
 url="https://www.gnu.org/software/texinfo/"
 msys2_repository_url="https://git.savannah.gnu.org/cgit/texinfo.git"
 msys2_references=(