Merge meson 1.12.1

.github/workflows/cygwin.yml

@@ -57,23 +57,20 @@ jobs:
             gcc-fortran
             gcc-objc++
             gcc-objc
+            gcovr
             git
             gobject-introspection
             gtk-doc
             libboost-devel
             libglib2.0-devel
             libgtk3-devel
-            libxml2-devel
-            libxslt-devel
             make
             ninja
-            python2-devel
-            python3-devel
-            python3-libxml2
-            python3-libxslt
-            python3-gi
-            python39-pip
-            python39-wheel
+            python312-devel
+            python312-fastjsonschema
+            python312-pefile
+            python312-pip
+            python312-wheel
             vala
             zlib-devel
 
@@ -94,7 +91,7 @@ jobs:
       - name: Run pip
         run: |
           export PATH=/usr/bin:/usr/local/bin:$(cygpath ${SYSTEMROOT})/system32
-          python3 -m pip --disable-pip-version-check install gcovr fastjsonschema pefile pytest pytest-subtests pytest-xdist
+          python3 -m pip --disable-pip-version-check install pytest pytest-subtests pytest-xdist
         shell: bash --noprofile --norc -o igncr -eo pipefail '{0}'
 
       - uses: actions/cache/save@v4

.github/workflows/images.yml

@@ -43,11 +43,9 @@ jobs:
           - { name: Fedora,                       id: fedora         }
           - { name: Gentoo,                       id: gentoo         }
           - { name: OpenSUSE,                     id: opensuse       }
-          - { name: Ubuntu Bionic,                id: bionic         }
           - { name: Ubuntu Rolling,               id: ubuntu-rolling }
     steps:
-        # Need v3 because of bionic
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
 
       # Login to dockerhub
       - name: Docker login

.github/workflows/lint.yml

@@ -52,8 +52,8 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         python-version: '3.x'
-    # Pin mypy to version 1.8, so we retain the ability to lint for Python 3.7
-    - run: python -m pip install "mypy==1.8" strictyaml truststore types-PyYAML types-tqdm types-chevron
+    # Pin mypy to version 1.19, so we retain the ability to lint for Python 3.10
+    - run: python -m pip install "mypy==1.19" strictyaml truststore types-PyYAML types-tqdm types-chevron types-lxml
     - run: python run_mypy.py --allver
       env:
         PYTHONUNBUFFERED: 1

.github/workflows/macos.yml

@@ -32,11 +32,21 @@ jobs:
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v4
-    - run: |
-        export PATH="$HOME/Library/Python/3.9/bin:$PATH"
-        /usr/bin/python3 -m pip install --upgrade pip
-        /usr/bin/python3 -m pip install pytest pytest-xdist pytest-subtests fastjsonschema
-    - run: brew install pkg-config ninja llvm qt@5
+    - run: brew update
+    # github actions overwrites brew's python. Force it to reassert itself, by running in a separate step.
+    - name: unbreak python in github actions
+      run: |
+        find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
+        sudo rm -rf /Library/Frameworks/Python.framework/
+        brew install --force python3 && brew unlink python3 && brew unlink python3 && brew link --overwrite python3
+        # Delete nonsensical PEP 668 breakage. It is the wrong solution to the problem and isn't designed to be
+        # productive -- only victim blaming -- however it bites particularly badly because this is a container/VM
+        # See commit 5c479d7a13a518c18ccb4dc3b6bdd7bfc2a9bdb5 for a more thorough analysis.
+        find /opt/homebrew/Cellar/python* -name EXTERNALLY-MANAGED -print0 | xargs -0 rm -vf
+    - name: Install Python dependencies
+      run: |
+        python3 -m pip install pytest pytest-xdist pytest-subtests fastjsonschema
+    - run: brew install pkg-config ninja llvm qt@6
     - env:
         CPPFLAGS: "-I/opt/homebrew/include"
         LDFLAGS: "-L/opt/homebrew/lib"
@@ -46,9 +56,9 @@ jobs:
         # These cannot evaluate anything, so we cannot set PATH or SDKROOT here
       run: |
         export SDKROOT="$(xcodebuild -version -sdk macosx Path)"
-        export PATH="$HOME/Library/Python/3.9/bin:$HOME/tools:/opt/homebrew/opt/qt@5/bin:/opt/homebrew/opt/llvm/bin:$PATH"
-        export PKG_CONFIG_PATH="/Applications/Xcode.app/Contents/Developer/Library/Frameworks/Python3.framework/Versions/Current/lib/pkgconfig:/opt/homebrew/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_PATH"
-        /usr/bin/python3 ./run_unittests.py
+        export PATH="$HOME/tools:/opt/homebrew/opt/qt@6/bin:/opt/homebrew/opt/llvm/bin:$PATH"
+        export PKG_CONFIG_PATH="/Applications/Xcode.app/Contents/Developer/Library/Frameworks/Python3.framework/Versions/Current/lib/pkgconfig:/opt/homebrew/opt/qt@6/lib/pkgconfig:$PKG_CONFIG_PATH"
+        python3 ./run_unittests.py
 
 
   project-tests-appleclang:
@@ -83,7 +93,7 @@ jobs:
         find /opt/homebrew/Cellar/python* -name EXTERNALLY-MANAGED -print0 | xargs -0 rm -vf
     # use python3 from homebrew because it is a valid framework, unlike the actions one:
     # https://github.com/actions/setup-python/issues/58
-    - run: brew install pkg-config ninja llvm qt@5 boost ldc hdf5 openmpi lapack scalapack sdl2 boost-python3 gtk-doc zstd ncurses objfw libomp
+    - run: brew install pkg-config ninja llvm qt@6 boost ldc hdf5 openmpi lapack scalapack sdl2 boost-python3 gtk-doc zstd ncurses objfw libomp
     - run: |
         python3 -m pip install cython
     - env:
@@ -97,6 +107,6 @@ jobs:
         export SDKROOT="$(xcodebuild -version -sdk macosx Path)"
         # Append LLVM's bin directory to PATH to prioritise Apple Clang over Homebrew Clang.
         # We need this to avoid objfw test failures.
-        export PATH="$HOME/tools:/opt/homebrew/opt/qt@5/bin:/opt/homebrew/opt/ncurses/bin:$PATH:/opt/homebrew/opt/llvm/bin"
-        export PKG_CONFIG_PATH="/opt/homebrew/opt/qt@5/lib/pkgconfig:/opt/homebrew/opt/lapack/lib/pkgconfig:/opt/homebrew/opt/ncurses/lib/pkgconfig:$PKG_CONFIG_PATH"
-        ./run_project_tests.py --backend=ninja
+        export PATH="$HOME/tools:/opt/homebrew/opt/qt@6/bin:/opt/homebrew/opt/ncurses/bin:$PATH:/opt/homebrew/opt/llvm/bin"
+        export PKG_CONFIG_PATH="/opt/homebrew/opt/qt@6/lib/pkgconfig:/opt/homebrew/opt/lapack/lib/pkgconfig:/opt/homebrew/opt/ncurses/lib/pkgconfig:$PKG_CONFIG_PATH"
+        ./run_project_tests.py --backend=ninja -- $MESON_ARGS

.github/workflows/msys2.yml

@@ -83,14 +83,13 @@ jobs:
             mingw-w64-${{ matrix.MSYS2_ARCH }}-python-lxml
             mingw-w64-${{ matrix.MSYS2_ARCH }}-python-setuptools
             mingw-w64-${{ matrix.MSYS2_ARCH }}-python-pip
-            mingw-w64-${{ matrix.MSYS2_ARCH }}-python-fastjsonschema
             mingw-w64-${{ matrix.MSYS2_ARCH }}-${{ matrix.MSYSTEM != 'MINGW32' && 'objfw' || 'ninja' }}
             mingw-w64-${{ matrix.MSYS2_ARCH }}-${{ matrix.MSYSTEM != 'MINGW32' && 'llvm' || 'ninja' }}
             mingw-w64-${{ matrix.MSYS2_ARCH }}-${{ matrix.TOOLCHAIN }}
 
       - name: Install dependencies
         run: |
-          python3 -m pip --disable-pip-version-check install gcovr pefile pytest pytest-subtests pytest-xdist
+          python3 -m pip --disable-pip-version-check install fastjsonschema gcovr pefile pytest pytest-subtests pytest-xdist
 
       - name: Install pypy3 on x86_64
         run: |

.github/workflows/nonnative.yml

@@ -28,7 +28,7 @@ permissions:
 jobs:
   cross-only-armhf:
     runs-on: ubuntu-latest
-    container: mesonbuild/eoan:latest
+    container: mesonbuild/ubuntu-rolling:latest
     env:
       MESON_CI_JOBNAME: ubuntu-${{ github.job }}
 

.github/workflows/os_comp.yml

@@ -42,24 +42,13 @@ jobs:
           - { name: Fedora,           id: fedora   }
           - { name: Gentoo,           id: gentoo   }
           - { name: OpenSUSE,         id: opensuse }
-          - { name: Ubuntu Bionic,    id: bionic   }
     container:
       image: mesonbuild/${{ matrix.cfg.id }}:latest
-      volumes:
-        - ${{ matrix.cfg.id == 'bionic' && '/node20217:/node20217:rw,rshared' || ' ' }}
-        - ${{ matrix.cfg.id == 'bionic' && '/node20217:/__e/node20:ro,rshared' || ' ' }}
     env:
       MESON_CI_JOBNAME: linux-${{ matrix.cfg.id }}-gcc
 
     steps:
-    - name: install nodejs20glibc2.17
-      if: ${{ matrix.cfg.id == 'bionic' }}
-      run: |
-        apt install curl -y
-        curl -LO https://unofficial-builds.nodejs.org/download/release/v20.9.0/node-v20.9.0-linux-x64-glibc-217.tar.xz
-        tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217
-        ldd /__e/node20/bin/node
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
 
     - name: Run tests
       # All environment variables are stored inside the docker image in /ci/env_vars.sh
@@ -72,6 +61,8 @@ jobs:
 
         source /ci/env_vars.sh
         cd $GITHUB_WORKSPACE
+        # disable git ownership checks
+        git config --global safe.directory '*'
         ./run_tests.py $CI_ARGS
 
   pypy:

.github/workflows/windows.yml

@@ -10,7 +10,7 @@ on:
       - 'mesonbuild/**'
       - 'test cases/**'
       - 'unittests/**'
-      - '.github/workflows/*.yml'
+      - '.github/workflows/windows.yml'
       - 'ci/run.ps1'
       - 'run_project_tests.py'
       - 'run_tests.py'
@@ -20,7 +20,7 @@ on:
       - 'mesonbuild/**'
       - 'test cases/**'
       - 'unittests/**'
-      - '.github/workflows/*.yml'
+      - '.github/workflows/windows.yml'
       - 'ci/run.ps1'
       - 'run_project_tests.py'
       - 'run_tests.py'
@@ -61,7 +61,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v6
         with:
-          python-version: '3.7'
+          python-version: '3.10'
 
       - name: Setup MSVC
         uses: ilammy/msvc-dev-cmd@v1
@@ -98,9 +98,9 @@ jobs:
           Invoke-WebRequest -Uri "https://raw.githubusercontent.com/mesonbuild/cidata/refs/heads/master/win32/pkg-config.exe" -OutFile "$pkgconfigDir\pkg-config.exe"
           echo "$pkgconfigDir" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
-      - name: Install NASM
+      - name: Install Chocolatey Dependencies
         shell: pwsh
-        run: choco install -y nasm
+        run: choco install -y nasm winflexbison3
 
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@stable

.mypy.ini

@@ -26,3 +26,54 @@ check_untyped_defs            = True
 # future default behaviors
 allow_redefinition_new        = True
 local_partial_types           = True
+
+[mypy-mesonbuild.cmdline]
+strict_optional               = True
+
+[mypy-mesonbuild.coredata]
+strict_optional               = True
+
+[mypy-mesonbuild.depfile]
+strict_optional               = True
+
+[mypy-mesonbuild.envconfig]
+strict_optional               = True
+
+[mypy-mesonbuild.environment]
+strict_optional               = True
+
+[mypy-mesonbuild.machinefile]
+strict_optional               = True
+
+[mypy-mesonbuild.mcompile]
+strict_optional               = True
+
+[mypy-mesonbuild.mconf]
+strict_optional               = True
+
+[mypy-mesonbuild.mdevenv]
+strict_optional               = True
+
+[mypy-mesonbuild.mdist]
+strict_optional               = True
+
+[mypy-mesonbuild.mesondata]
+strict_optional               = True
+
+[mypy-mesonbuild.mesonmain]
+strict_optional               = True
+
+[mypy-mesonbuild.minit]
+strict_optional               = True
+
+[mypy-mesonbuild.minstall]
+strict_optional               = True
+
+[mypy-mesonbuild.mlog]
+strict_optional               = True
+
+[mypy-mesonbuild.programs]
+strict_optional               = True
+
+[mypy-mesonbuild.tooldetect]
+strict_optional               = True

README.md

@@ -12,7 +12,7 @@ build system.
 
 #### Dependencies
 
- - [Python](https://python.org) (version 3.7 or newer)
+ - [Python](https://python.org) (version 3.10 or newer)
  - [Ninja](https://ninja-build.org) (version 1.8.2 or newer)
 
 Latest Meson version supporting previous Python versions:

azure-pipelines.yml

@@ -80,11 +80,11 @@ jobs:
   - bash: ci/intel-scripts/cache_exclude_windows.sh
     displayName: exclude unused files from cache
     condition: and(ne(variables.CACHE_RESTORED, 'true'), eq(variables.ifort, 'true'))
-  - script: choco install -y nasm
-    displayName: install NASM
+  - script: choco install -y nasm winflexbison3
+    displayName: install Chocolatey Dependencies
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.7'
+      versionSpec: '3.10'
       addToPath: true
       architecture: 'x64'
   - task: BatchScript@1

ci/ciimage/arch/install.sh

@@ -10,12 +10,12 @@ pkgs=(
   python python-pip pypy3
   ninja make git sudo fakeroot autoconf automake patch
   libelf gcc gcc-fortran gcc-objc vala rust byacc flex cython go dlang-dmd
-  mono boost qt5-base gtkmm3 gtest gmock protobuf gobject-introspection
+  mono boost boost-libs qt5-base gtkmm3 gtest gmock protobuf gobject-introspection
   itstool glib2-devel gtk3 java-environment=8 gtk-doc llvm clang sdl2 graphviz
   doxygen vulkan-headers vulkan-icd-loader vulkan-validation-layers openssh mercurial gtk-sharp-3 qt5-tools
   libwmf cmake netcdf-fortran openmpi nasm gnustep-base gettext
   python-lxml hotdoc rust-bindgen qt6-base qt6-tools qt6-declarative wayland wayland-protocols
-  intel-oneapi-mkl
+  intel-oneapi-mkl zlib-static
   # cuda
 )
 
@@ -61,4 +61,6 @@ su $AUR_USER -c "yay -S $PACMAN_OPTS ${aur_pkgs[*]}"
 
 # cleanup
 pacman -Rs --noconfirm "${cleanup_pkgs[@]}"
-su $AUR_USER -c "yes | yay -Scc"
+# clear the pacman cache first, since the yay user may not have permission
+pacman -Sc --noconfirm
+su $AUR_USER -c "yes | yay -Sc --aur"