changeset 32526:42bb43092702

maint: Merge stable to default. Keep intentional differences.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 03 Dec 2023 12:22:56 +0100
parents d2eabc48cf80 (current diff) 14cb31ec0251 (diff)
children 2fbfc4490921
files .github/workflows/make.yaml
diffstat 2 files changed, 5 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/.github/workflows/make.yaml	Sat Dec 02 18:03:12 2023 -0800
+++ b/.github/workflows/make.yaml	Sun Dec 03 12:22:56 2023 +0100
@@ -772,17 +772,6 @@
 
           msystem: ${{ matrix.msystem }}
 
-      - name: install run-time dependency "mesa"
-        # The mesa3d OpenGL driver seems to be needed for correct off-screen
-        # rendering.  But the version from MSYS2 currently crashes Octave on
-        # MINGW32.  See: https://github.com/msys2/MINGW-packages/issues/10876
-        # Without it, `test getframe` "just" fails without crashing Octave.
-        # So, skip installation for MINGW32.
-        if: matrix.msystem != 'MINGW32'
-        env:
-          TARGET_PREFIX: ${{ matrix.target-prefix }}
-        run: pacman --noconfirm -S ${TARGET_PREFIX}-mesa
-
       - name: checkout repository
         uses: actions/checkout@v3
 
@@ -842,8 +831,7 @@
           cd .build && ../configure \
             JAVA_HOME="" \
             --disable-docs \
-            ${{ matrix.extra-config-flags }} \
-            gl_cv_have_weak=no
+            ${{ matrix.extra-config-flags }}
 
       - name: build
         # Spawning processes seems to have a big overhead on this platform. Use a somewhat larger number of parallel processes to compensate for that.
--- a/doc/interpreter/contributors.in	Sat Dec 02 18:03:12 2023 -0800
+++ b/doc/interpreter/contributors.in	Sun Dec 03 12:22:56 2023 +0100
@@ -3,6 +3,7 @@
 NVS Abhilash
 Andy Adler
 Adam H. Aitkenhead
+Fernando Alvarruiz
 Joakim Andén
 Giles Anderson
 Joel Andersson
@@ -11,7 +12,7 @@
 Damjan Angelovski
 Muthiah Annamalai
 Markus Appel
-Leonardo Araújo
+Leonardo Araujo
 Branden Archer
 Willem Atsma
 Marco Atzeri
@@ -173,6 +174,7 @@
 Marcel Jacobse
 Geoff Jacobsen
 Vytautas Jančauskas
+Andrew Janke
 Nicholas R. Jankowski
 Mats Jansson
 Robert Jenssen
@@ -262,6 +264,7 @@
 Thorsten Meyer
 Stefan Miereis
 Petr Mikulik
+Linton Miller
 Mike Miller
 Serviscope Minor
 Stefan Monnier