Merge pull request #4420 from lazka/meson-backport

meson backport + glib2: Update to 2.78.4

glib2/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgbase=glib2
 pkgname=(glib2 glib2-devel glib2-docs)
-pkgver=2.76.6
+pkgver=2.78.4
 pkgrel=1
 pkgdesc="Common C routines used by GTK+ and other libs"
 license=('spdx:LGPL-2.1-or-later')
@@ -23,7 +23,7 @@ makedepends=('docbook-xsl'
 source=(https://download.gnome.org/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
         001-gmodule-lib-prefix.patch)
 noextract=("glib-$pkgver.tar.xz")
-sha256sums=('1136ae6987dcbb64e0be3197a80190520f7acab81e2bfb937dc85c11c8aa9f04'
+sha256sums=('24b8e0672dca120cc32d394bccb85844e732e04fe75d18bb0573b2dbc7548f63'
             '31bce1aff2dab2262ea372d101081162a77e9310fe0d68400da8c85d698ce65e')
 msys2_references=(
   'cygwin: glib2.0'

meson/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=meson
 pkgver=1.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc='High-productivity build system'
 arch=('any')
 url="https://mesonbuild.com/"
@@ -16,15 +16,21 @@ makedepends=(
   "python-installer"
 )
 source=("https://github.com/mesonbuild/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.asc}
-        "0001-cygwin-disguise.patch")
+        "0001-cygwin-disguise.patch"
+        "https://patch-diff.githubusercontent.com/raw/mesonbuild/meson/pull/12861.patch")
 sha256sums=('492eb450c8b073024276f916f5adbb3c4bb7e90e9e6ec124efda064f3d9b5baa'
             'SKIP'
-            '240f37b8c64446ff5d4e97a2775d48e9c5e48b62926c19900b4cead220f89614')
+            '240f37b8c64446ff5d4e97a2775d48e9c5e48b62926c19900b4cead220f89614'
+            'cf346c13f9548d7c4f61ecc399ec9797cc642c3e39867deed8c788d825b877f6')
 validpgpkeys=("19E2D6D9B46D8DAA6288F877C24E631BABB1FE70") # Jussi Pakkanen <jpakkane@gmail.com>
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p1 -i "${srcdir}"/0001-cygwin-disguise.patch
+
+  # https://github.com/mesonbuild/meson/pull/12861
+  patch -p1 -i "${srcdir}"/12861.patch
+
 }
 
 build() {