diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
commit | fcc5224904648a8e6eb528d7603154160a20022f (patch) | |
tree | 3bfce096b38a9cea8eed13fc70c1526c456e9abd /gnome-base/gvfs/files | |
parent | 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff) |
gentoo resync : 02.02.2022
Diffstat (limited to 'gnome-base/gvfs/files')
-rw-r--r-- | gnome-base/gvfs/files/meson-0.61.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/gnome-base/gvfs/files/meson-0.61.patch b/gnome-base/gvfs/files/meson-0.61.patch new file mode 100644 index 000000000000..20e03388d7c6 --- /dev/null +++ b/gnome-base/gvfs/files/meson-0.61.patch @@ -0,0 +1,33 @@ +https://bugs.gentoo.org/831840 +https://gitlab.gnome.org/GNOME/gvfs/-/merge_requests/133 + +From 1522bf6a9741cf6f1fe16eaf50fd20af46882873 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy <oholy@redhat.com> +Date: Fri, 21 Jan 2022 08:32:31 +0100 +Subject: [PATCH] build: Remove incorrect i18n.merge_file argument + +The positional argument was being silently ignored until meson 0.60.0 where +it fails with "ERROR: Function does not take positional arguments". + +Related: https://github.com/mesonbuild/meson/issues/9441 +Fixes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/599 +(cherry picked from commit 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0) +--- + daemon/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/daemon/meson.build b/daemon/meson.build +index dffeef3e..bdc506fe 100644 +--- a/daemon/meson.build ++++ b/daemon/meson.build +@@ -366,7 +366,6 @@ if enable_admin + ) + + i18n.merge_file( +- policy, + input: policy_in, + output: '@BASENAME@', + po_dir: po_dir, +-- +2.34.1 + |