Merge pull request #4779 from lazka/meson-backport-2
meson: backport a regression fix
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
pkgname=meson
|
||||
pkgver=1.5.0
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc='High-productivity build system'
|
||||
arch=('any')
|
||||
url="https://mesonbuild.com/"
|
||||
@@ -20,11 +20,13 @@ makedepends=(
|
||||
)
|
||||
source=("https://github.com/mesonbuild/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.asc}
|
||||
"0001-cygwin-disguise.patch"
|
||||
"https://patch-diff.githubusercontent.com/raw/mesonbuild/meson/pull/12861.patch")
|
||||
"https://patch-diff.githubusercontent.com/raw/mesonbuild/meson/pull/12861.patch"
|
||||
"https://patch-diff.githubusercontent.com/raw/mesonbuild/meson/pull/13411.patch")
|
||||
sha256sums=('45d7b8653c1e5139df35b33be2dd5b2d040c5b2c6129f9a7c890d507e33312b8'
|
||||
'SKIP'
|
||||
'7025acbbf8bfd26cf806542eeedb4bfd072b5382db43c1f39e605ab5d155c45a'
|
||||
'cf346c13f9548d7c4f61ecc399ec9797cc642c3e39867deed8c788d825b877f6')
|
||||
'cf346c13f9548d7c4f61ecc399ec9797cc642c3e39867deed8c788d825b877f6'
|
||||
'ef273b4898c57d52f64b9e0a84508f1db158d323939c6664340f67bf88bf97eb')
|
||||
validpgpkeys=("19E2D6D9B46D8DAA6288F877C24E631BABB1FE70") # Jussi Pakkanen <jpakkane@gmail.com>
|
||||
|
||||
prepare() {
|
||||
@@ -34,6 +36,8 @@ prepare() {
|
||||
# https://github.com/mesonbuild/meson/pull/12861
|
||||
patch -p1 -i "${srcdir}"/12861.patch
|
||||
|
||||
# https://github.com/mesonbuild/meson/pull/13411
|
||||
patch -p1 -i "${srcdir}"/13411.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
||||
Reference in New Issue
Block a user