summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2022-01-22 13:40:09 -0500
committerMike Gilbert <floppym@gentoo.org>2022-01-22 13:40:35 -0500
commit4f2e9e58208431cbcca93aafba1784618ef970e9 (patch)
tree0c5f832d39d08d1c2350c298c45daa6f8becb130 /gnome-base
parentdev-libs/link-grammar: remove #include <fpu_control.h> (diff)
downloadgentoo-4f2e9e58208431cbcca93aafba1784618ef970e9.tar.gz
gentoo-4f2e9e58208431cbcca93aafba1784618ef970e9.tar.bz2
gentoo-4f2e9e58208431cbcca93aafba1784618ef970e9.zip
gnome-base/gvfs: backport fix for meson-0.61
Closes: https://bugs.gentoo.org/831840 Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gvfs/files/meson-0.61.patch33
-rw-r--r--gnome-base/gvfs/gvfs-1.48.1-r1.ebuild6
2 files changed, 38 insertions, 1 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
+
diff --git a/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild b/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild
index f4b50cffc64b..38deee759bc2 100644
--- a/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -82,6 +82,10 @@ BDEPEND="
test? ( dev-libs/libgdata )
"
+PATCHES=(
+ "${FILESDIR}/meson-0.61.patch"
+)
+
src_configure() {
local enable_logind="false"
if use systemd || use elogind; then