# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1675101351 -3600
# Node ID f812dd8304d982e09c48a2cc688a3a36127500d0
# Parent  7860fcc69082c27229496eb42b7d10c9ac51bae4# Parent  8b869c5d6ce8d1b8a802eaef5be4fa14f2ae23b0
maint: Merge stable to default.

diff -r 7860fcc69082 -r f812dd8304d9 .github/workflows/codeql-analysis.yaml
--- a/.github/workflows/codeql-analysis.yaml	Mon Jan 30 18:36:03 2023 +0100
+++ b/.github/workflows/codeql-analysis.yaml	Mon Jan 30 18:55:51 2023 +0100
@@ -31,7 +31,7 @@
             libarpack2-dev libblas-dev libcurl4-gnutls-dev libfftw3-dev \
             libfltk1.3-dev libfontconfig1-dev libfreetype6-dev \
             libgl1-mesa-dev libgl2ps-dev libglpk-dev libgraphicsmagick++1-dev \
-            libhdf5-dev liblapack-dev libosmesa6-dev libpcre3-dev \
+            libhdf5-dev liblapack-dev libosmesa6-dev libpcre2-dev \
             libqhull-dev libqscintilla2-qt5-dev libqrupdate-dev \
             libreadline-dev librsvg2-bin libsndfile1-dev libsuitesparse-dev \
             libsundials-dev libtool libxft-dev make openjdk-8-jdk \
@@ -111,10 +111,12 @@
           install: >-
             base-devel
             ${{ matrix.target-prefix }}-autotools
-            ${{ matrix.target-prefix }}-toolchain
+            ${{ matrix.target-prefix }}-cc
+            ${{ matrix.target-prefix }}-gcc-fortran
+            ${{ matrix.target-prefix }}-gperf
             ${{ matrix.target-prefix }}-lapack
             ${{ matrix.target-prefix }}-openblas
-            ${{ matrix.target-prefix }}-pcre
+            ${{ matrix.target-prefix }}-pcre2
 
             ${{ matrix.target-prefix }}-arpack
             ${{ matrix.target-prefix }}-curl
@@ -131,7 +133,10 @@
             ${{ matrix.target-prefix }}-qhull
             ${{ matrix.target-prefix }}-qrupdate
             ${{ matrix.target-prefix }}-qscintilla
-            ${{ matrix.target-prefix }}-qt5
+            ${{ matrix.target-prefix }}-qt5-base
+            ${{ matrix.target-prefix }}-qt5-imageformats
+            ${{ matrix.target-prefix }}-qt5-svg
+            ${{ matrix.target-prefix }}-qt5-tools
             ${{ matrix.target-prefix }}-rapidjson
             ${{ matrix.target-prefix }}-suitesparse
             ${{ matrix.target-prefix }}-sundials
diff -r 7860fcc69082 -r f812dd8304d9 .github/workflows/make.yaml
--- a/.github/workflows/make.yaml	Mon Jan 30 18:36:03 2023 +0100
+++ b/.github/workflows/make.yaml	Mon Jan 30 18:55:51 2023 +0100
@@ -59,7 +59,7 @@
             icoutils libarpack2-dev libblas-dev libcurl4-gnutls-dev \
             libfftw3-dev libfltk1.3-dev libfontconfig1-dev libfreetype6-dev \
             libgl1-mesa-dev libgl2ps-dev libglpk-dev libgraphicsmagick++1-dev \
-            libhdf5-dev liblapack-dev libosmesa6-dev libpcre3-dev \
+            libhdf5-dev liblapack-dev libosmesa6-dev libpcre2-dev \
             libqhull-dev libqscintilla2-qt5-dev libqrupdate-dev \
             libreadline-dev librsvg2-bin libsndfile1-dev libsuitesparse-dev \
             libsundials-dev libtool libxft-dev make openjdk-8-jdk \