meson: Update to 1.8.1 (#24340)

* 0004-fix-gtk-doc.patch: refresh
* the other PR is included in the new release

Fixes #24204
This commit is contained in:
Christoph Reiter
2025-05-24 00:52:05 +02:00
committed by GitHub
parent 3b4afdf739
commit 754a39b491
2 changed files with 16 additions and 21 deletions

View File

@@ -1,15 +1,15 @@
--- meson-0.57.2/mesonbuild/scripts/gtkdochelper.py.orig 2021-04-29 12:15:43.756190700 -0700
+++ meson-0.57.2/mesonbuild/scripts/gtkdochelper.py 2021-04-29 12:17:17.646837400 -0700
@@ -16,7 +16,7 @@
import subprocess
import shutil
--- meson-1.8.1/mesonbuild/scripts/gtkdochelper.py.orig 2025-05-23 23:51:05.000000000 +0200
+++ meson-1.8.1/mesonbuild/scripts/gtkdochelper.py 2025-05-24 00:25:29.262973900 +0200
@@ -9,7 +9,7 @@
import argparse
-from ..mesonlib import MesonException, Popen_safe, is_windows, is_cygwin, split_args
+from ..mesonlib import MesonException, Popen_safe, is_windows, is_cygwin, join_args, split_args
from ..mesonlib import (
MesonException, Popen_safe, is_windows, is_cygwin, is_parent_path,
- split_args,
+ join_args, split_args,
)
from . import destdir_join
import typing as T
@@ -65,7 +65,7 @@
@@ -59,7 +59,7 @@
library_paths.extend(env['LD_LIBRARY_PATH'].split(os.pathsep))
env['LD_LIBRARY_PATH'] = os.pathsep.join(library_paths)
@@ -18,7 +18,7 @@
cmd.insert(0, sys.executable)
# Put stderr into stdout since we want to print it out anyway.
@@ -149,6 +149,15 @@
@@ -143,6 +143,15 @@
if gobject_typesfile:
scanobjs_cmd = [options.gtkdoc_scangobj] + scanobjs_args
@@ -34,7 +34,7 @@
scanobjs_cmd += ['--types=' + gobject_typesfile,
'--module=' + module,
'--run=' + run,
@@ -158,11 +167,6 @@
@@ -152,11 +161,6 @@
'--ld=' + ld,
'--output-dir=' + abs_out]

View File

@@ -3,7 +3,7 @@
_realname=meson
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.7.2
pkgver=1.8.1
pkgrel=1
pkgdesc="High-productivity build system (mingw-w64)"
arch=('any')
@@ -30,14 +30,12 @@ source=("https://github.com/mesonbuild/${_realname}/releases/download/${pkgver}/
'color-term.patch'
'0002-Default-to-sys.prefix-as-the-default-prefix.patch'
'0004-fix-gtk-doc.patch'
'install-man.patch'
"https://github.com/lb90/meson/commit/2406eccf1b1170760c87bbc6a45742ca6bca003d.patch")
sha256sums=('4d40d63aa748a9c139cc41ab9bffe43edd113c5639d78bde81544ca955aea890'
'install-man.patch')
sha256sums=('b4e3b80e8fa633555abf447a95a700aba1585419467b2710d5e5bf88df0a7011'
'5805aed0a117536eb16dd8eef978c6be57c2471b655ede63e25517c28b4f4cf0'
'032b38f0b2765dc88e1fcb34e27b69b611e07c869c13c6e703bcf182e586fccb'
'0f9177102976bbcbdf50c1da49842783a0c77be939e839f1bf91dcaba6a5cdee'
'0682a36cb75e545a78b81293303835a16171f25baf949905dc08029436efff84'
'999e0751148bd47c4496509210618cdba5e7baeb2601fbf810a88fc193bd0378')
'bc43a2695498885afa08f2aeb927d6958741aa1a9fc66850de1a6c79fdf59241'
'0682a36cb75e545a78b81293303835a16171f25baf949905dc08029436efff84')
apply_patch_with_msg() {
for _patch in "$@"
@@ -55,9 +53,6 @@ prepare() {
0002-Default-to-sys.prefix-as-the-default-prefix.patch \
0004-fix-gtk-doc.patch \
install-man.patch
# https://github.com/mesonbuild/meson/pull/12861
apply_patch_with_msg 2406eccf1b1170760c87bbc6a45742ca6bca003d.patch
}
build() {