Mercurial > octave

changeset 33444:f57b492b5527

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Mon, 22 Apr 2024 17:52:32 +0200
parents 411e19dc791b (current diff) f428a432ed4f (diff)
children 2383f7553930 5fded8395daa
files .github/workflows/make.yaml m4/acinclude.m4
diffstat 2 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/.github/workflows/make.yaml	Sun Apr 21 13:04:32 2024 -0700
+++ b/.github/workflows/make.yaml	Mon Apr 22 17:52:32 2024 +0200
@@ -731,7 +731,7 @@
             ${{ matrix.target-prefix }}-ccache
             ${{ matrix.target-prefix }}-icoutils
             ${{ matrix.target-prefix }}-librsvg
-            texinfo
+            ${{ matrix.target-prefix }}-texinfo
 
             unzip
             zip
@@ -826,15 +826,10 @@
         continue-on-error: true
         timeout-minutes: 60
 
-        # Perl scripts cannot be run as executables on Windows (no shebang mechanism).
-        # We need to wrap them by calling the perl executable explicitly.
-
         # mkoctfile seems to have trouble when gcc is called via ccache. So,
         # remove the directory with the ccache wrappers from PATH.
 
         run: |
-          echo "makeinfo_program (sprintf ('%s && cd %s && perl makeinfo', [s=nthargout(2, @system, 'cygpath -w /usr/bin')](1:2), strtrim (s)));" \
-            >> ./scripts/startup/site-rcfile
           export PATH=$(echo "$PATH" | sed -e "s|$MINGW_PREFIX/lib/ccache/bin:||g")
           make -C ./.build check RUN_OCTAVE_OPTIONS="--no-gui-libs" | tee ./test-suite.log
 
--- a/m4/acinclude.m4	Sun Apr 21 13:04:32 2024 -0700
+++ b/m4/acinclude.m4	Mon Apr 22 17:52:32 2024 +0200
@@ -2047,10 +2047,10 @@
     ## Check for Qt libraries
     case "$qt_version" in
       5)
-        QT_MODULES="Qt5Core Qt5Gui Qt5Help Qt5Network Qt5OpenGL Qt5PrintSupport Qt5Xml"
+        QT_MODULES="Qt5Core Qt5Gui Qt5Help Qt5Network Qt5OpenGL Qt5PrintSupport Qt5Widgets Qt5Xml"
       ;;
       6)
-        QT_MODULES="Qt6Core Qt6Gui Qt6Help Qt6Network Qt6OpenGL Qt6OpenGLWidgets Qt6PrintSupport Qt6Xml"
+        QT_MODULES="Qt6Core Qt6Gui Qt6Help Qt6Network Qt6OpenGL Qt6OpenGLWidgets Qt6PrintSupport Qt6Widgets Qt6Xml"
         case $host_os in
           mingw* | msdosmsvc*)
           ;;