mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-10 04:30:00 +00:00
gvfs: upgrade 1.48.1 -> 1.49.1
backport upstream patch to fix issue with meson 0.60.0: | Configuring org.gtk.vfs.file-operations.policy.in using configuration | | ../gvfs-1.49.1/daemon/meson.build:362:7: ERROR: Function does not take positional arguments. Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -0,0 +1,34 @@
|
|||||||
|
Upstream-Status: Backport
|
||||||
|
|
||||||
|
Fixes "../gvfs-1.49.1/daemon/meson.build:362:7: ERROR: Function does not take positional arguments.
|
||||||
|
|
||||||
|
Signed-off-by: Markus Volk f_l_k@t-online.de
|
||||||
|
|
||||||
|
From 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0 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
|
||||||
|
---
|
||||||
|
daemon/meson.build | 1 -
|
||||||
|
1 file changed, 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/daemon/meson.build b/daemon/meson.build
|
||||||
|
index 5f9559aa..e20ada29 100644
|
||||||
|
--- a/daemon/meson.build
|
||||||
|
+++ b/daemon/meson.build
|
||||||
|
@@ -360,7 +360,6 @@ if enable_admin
|
||||||
|
policy = gvfs_namespace + '.file-operations.policy'
|
||||||
|
|
||||||
|
i18n.merge_file(
|
||||||
|
- policy,
|
||||||
|
input: configure_file(
|
||||||
|
input: policy + '.in.in',
|
||||||
|
output: '@BASENAME@',
|
||||||
|
--
|
||||||
|
|
||||||
+6
-2
@@ -10,8 +10,12 @@ DEPENDS += "libsecret glib-2.0 glib-2.0-native libgudev shadow-native \
|
|||||||
|
|
||||||
RDEPENDS:${PN} += "gsettings-desktop-schemas"
|
RDEPENDS:${PN} += "gsettings-desktop-schemas"
|
||||||
|
|
||||||
SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive"
|
SRC_URI = " \
|
||||||
SRC_URI[archive.sha256sum] = "b2ea4f271aad2711f16b43c03151e2ec5a9874ff1a21142ef6d6406486a19dc2"
|
https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive \
|
||||||
|
file://Remove-incorrect-i18n.merge_file-argument.patch \
|
||||||
|
"
|
||||||
|
|
||||||
|
SRC_URI[archive.sha256sum] = "b0d1dda4e475066207305b0776b0daefeae790f6c0107ffd2687994c8e71915a"
|
||||||
|
|
||||||
# depends on gsettings-desktop-schemas->gcr->gtk+3-> x11
|
# depends on gsettings-desktop-schemas->gcr->gtk+3-> x11
|
||||||
REQUIRED_DISTRO_FEATURES = "x11"
|
REQUIRED_DISTRO_FEATURES = "x11"
|
||||||
Reference in New Issue
Block a user