diff options
Diffstat (limited to 'source/d/meson')
| -rw-r--r-- | source/d/meson/39bb5e07eab736b525abfc66eb5ad0dd626aedc6.patch | 39 | ||||
| -rwxr-xr-x | source/d/meson/meson.SlackBuild | 5 | ||||
| -rw-r--r-- | source/d/meson/meson.import.copy.diff | 10 |
3 files changed, 0 insertions, 54 deletions
diff --git a/source/d/meson/39bb5e07eab736b525abfc66eb5ad0dd626aedc6.patch b/source/d/meson/39bb5e07eab736b525abfc66eb5ad0dd626aedc6.patch deleted file mode 100644 index 0dab0d1e7..000000000 --- a/source/d/meson/39bb5e07eab736b525abfc66eb5ad0dd626aedc6.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 1da694352..6e0faba19 100755 --- a/source/d/meson/meson.SlackBuild +++ b/source/d/meson/meson.SlackBuild @@ -53,11 +53,6 @@ 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 deleted file mode 100644 index d199130df..000000000 --- a/source/d/meson/meson.import.copy.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- ./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 |