Tue May 11 19:35:17 UTC 202120210511193517

a/btrfs-progs-5.12-x86_64-1.txz:  Upgraded.
a/hdparm-9.62-x86_64-1.txz:  Upgraded.
a/kernel-generic-5.10.36-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.10.36-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.10.36-x86_64-1.txz:  Upgraded.
d/kernel-headers-5.10.36-x86-1.txz:  Upgraded.
d/meson-0.58.0-x86_64-2.txz:  Rebuilt.
  Applied upstream fix for GNOME projects failing to build.
  Some projects still require an adjustment to implicit_include_directories.
k/kernel-source-5.10.36-noarch-1.txz:  Upgraded.
l/elfutils-0.184-x86_64-1.txz:  Upgraded.
l/glib2-2.68.2-x86_64-1.txz:  Upgraded.
n/libtirpc-1.3.2-x86_64-1.txz:  Upgraded.
n/snownews-1.8-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

3 files changed, 55 insertions, 1 deletions

diff --git a/source/d/meson/39bb5e07eab736b525abfc66eb5ad0dd626aedc6.patch b/source/d/meson/39bb5e07eab736b525abfc66eb5ad0dd626aedc6.patch
new file mode 100644
index 000000000..0dab0d1e7
--- /dev/null
+++ b/source/d/meson/39bb5e07eab736b525abfc66eb5ad0dd626aedc6.patch
@@ -0,0 +1,39 @@
+From 39bb5e07eab736b525abfc66eb5ad0dd626aedc6 Mon Sep 17 00:00:00 2001
+From: Xavier Claessens <xavier.claessens@collabora.com>
+Date: Tue, 11 May 2021 09:18:47 -0400
+Subject: [PATCH] install_scripts: Restore @SOURCE_ROOT@ and @BUILD_ROOT@
+ replacements
+
+They are not documented for add_install_script() public API, but gnome
+module relies on it internally.
+
+Fixes: #8744
+---
+ mesonbuild/backend/backends.py | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
+index ee5f4463a5..ac6d5f0669 100644
+--- a/mesonbuild/backend/backends.py
++++ b/mesonbuild/backend/backends.py
+@@ -1429,7 +1429,19 @@ def generate_target_install(self, d: InstallData) -> None:
+                         d.targets.append(i)
+ 
+     def generate_custom_install_script(self, d: InstallData) -> None:
+-        d.install_scripts = self.build.install_scripts
++        result: T.List[ExecutableSerialisation] = []
++        srcdir = self.environment.get_source_dir()
++        builddir = self.environment.get_build_dir()
++        for i in self.build.install_scripts:
++            fixed_args = []
++            for a in i.cmd_args:
++                a = a.replace('@SOURCE_ROOT@', srcdir)
++                a = a.replace('@BUILD_ROOT@', builddir)
++                fixed_args.append(a)
++            es = copy.copy(i)
++            es.cmd_args = fixed_args
++            result.append(es)
++        d.install_scripts = result
+ 
+     def generate_header_install(self, d: InstallData) -> None:
+         incroot = self.environment.get_includedir()
diff --git a/source/d/meson/meson.SlackBuild b/source/d/meson/meson.SlackBuild
index 6e0faba19..a428c81aa 100755
--- a/source/d/meson/meson.SlackBuild
+++ b/source/d/meson/meson.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=meson
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -53,6 +53,11 @@ rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
+# Upstream fix for GNOME projects build failures:
+zcat $CWD/39bb5e07eab736b525abfc66eb5ad0dd626aedc6.patch.gz | patch -p1 --verbose || exit 1
+# Needs this as well:
+zcat $CWD/meson.import.copy.diff.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/source/d/meson/meson.import.copy.diff b/source/d/meson/meson.import.copy.diff
new file mode 100644
index 000000000..d199130df
--- /dev/null
+++ b/source/d/meson/meson.import.copy.diff
@@ -0,0 +1,10 @@
+--- ./mesonbuild/backend/backends.py.orig	2021-04-27 01:50:21.000000000 -0500
++++ ./mesonbuild/backend/backends.py	2021-05-11 13:55:37.317838468 -0500
+@@ -23,6 +23,7 @@
+ import re
+ import typing as T
+ import hashlib
++import copy
+ 
+ from .. import build
+ from .. import dependencies