diff options
| author |   Wang Mingyu <wangmy@fujitsu.com> | 2022-03-22 08:09:11 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2022-03-24 09:45:25 -0700 |
| commit | 99ad5f2a7e79b002e1396336e424fb497f39c23b (patch) | |
| tree | 82915c8473fc5762e28697a82f88a0ab10f70789 /meta-gnome | |
| parent | cead5f8f86d9d5ab85a14b14102c11497554bfbf (diff) | |
| download | meta-openembedded-contrib-99ad5f2a7e79b002e1396336e424fb497f39c23b.tar.gz | |
gvfs: upgrade 1.49.1 -> 1.50.0
Remove-incorrect-i18n.merge_file-argument.patch
removed since it's include in new version
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-gnome')
| -rw-r--r-- | meta-gnome/recipes-gnome/gvfs/gvfs/Remove-incorrect-i18n.merge_file-argument.patch | 34 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gvfs/gvfs_1.50.0.bb (renamed from meta-gnome/recipes-gnome/gvfs/gvfs_1.49.1.bb) | 7 |
2 files changed, 2 insertions, 39 deletions
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs/Remove-incorrect-i18n.merge_file-argument.patch b/meta-gnome/recipes-gnome/gvfs/gvfs/Remove-incorrect-i18n.merge_file-argument.patch deleted file mode 100644 index a6e3523743..0000000000 --- a/meta-gnome/recipes-gnome/gvfs/gvfs/Remove-incorrect-i18n.merge_file-argument.patch +++ /dev/null @@ -1,34 +0,0 @@ -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@', --- - diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.49.1.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.0.bb index 9df054d3b5..93f7f57617 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.49.1.bb +++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.0.bb @@ -10,12 +10,9 @@ DEPENDS += "libsecret glib-2.0 glib-2.0-native libgudev shadow-native \ RDEPENDS:${PN} += "gsettings-desktop-schemas" -SRC_URI = " \ - 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 = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" -SRC_URI[archive.sha256sum] = "b0d1dda4e475066207305b0776b0daefeae790f6c0107ffd2687994c8e71915a" +SRC_URI[archive.sha256sum] = "cbc2f564d2e9f00c760673f42d6803bce3e081ab7ffb4456deffffba9339b4dd" # depends on gsettings-desktop-schemas->gcr->gtk+3-> x11 REQUIRED_DISTRO_FEATURES = "x11" |