From 3ea1225d4f73025e8ce42264835303a8790c0d01 Mon Sep 17 00:00:00 2001 From: Titouan Christophe Date: Wed, 2 Jul 2025 10:38:04 +0200 Subject: [PATCH] package/gvfs: bump to v1.57.2 This bump includes 23 minor or patch-level releases, mostly containing bugfixes, and improvements on many filesystem backends and translations. Specifically for the Buildroot package: - Switch from libsoup (v2) to libsoup3, since gvfs v1.49.90 - Drop patch applied upstream - Explicitely disable goa (gnome-online-accounts) which is enabled by default in meson_options.txt See the upstream changelog: https://gitlab.gnome.org/GNOME/gvfs/-/blob/1.57.2/NEWS Signed-off-by: Titouan Christophe [Julien: remove .checkpackageignore entry to fix check-package error] Signed-off-by: Julien Olivain --- .checkpackageignore | 1 - ...e-incorrect-i18n.merge_file-argument.patch | 33 ------------------- package/gvfs/gvfs.hash | 4 +-- package/gvfs/gvfs.mk | 9 ++--- 4 files changed, 7 insertions(+), 40 deletions(-) delete mode 100644 package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch diff --git a/.checkpackageignore b/.checkpackageignore index de311a232f..dbe0963ca2 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -531,7 +531,6 @@ package/guile/0002-Makefile.am-fix-build-without-makeinfo.patch lib_patch.Upstre package/gumbo-parser/0001-configure.ac-fix-build-without-C.patch lib_patch.Upstream package/gutenprint/0001-use-pregen-xmli18n-header.patch lib_patch.Upstream package/gutenprint/0002-cups-support-replaces-static-with-static-libtool-lib.patch lib_patch.Upstream -package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch lib_patch.Upstream package/harfbuzz/0001-meson.build-check-for-pthread.h.patch lib_patch.Upstream package/haserl/0001-add-haserl_lualib.inc.patch lib_patch.Upstream package/haveged/S21haveged Shellcheck lib_sysv.Variables diff --git a/package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch b/package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch deleted file mode 100644 index a85a1a374e..0000000000 --- a/package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0 Mon Sep 17 00:00:00 2001 -From: Ondrej Holy -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 - -[Retrieved (and backported) from: -https://gitlab.gnome.org/GNOME/gvfs/-/commit/17a067b9b823a0d54e061eae45ff8e2c7e4a88d0] -Signed-off-by: Fabrice Fontaine ---- - 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 - ) - - i18n.merge_file( -- policy, - input: policy_in, - output: '@BASENAME@', - po_dir: po_dir, --- -GitLab - diff --git a/package/gvfs/gvfs.hash b/package/gvfs/gvfs.hash index fc068ddb94..4f81421af6 100644 --- a/package/gvfs/gvfs.hash +++ b/package/gvfs/gvfs.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gvfs/1.48/gvfs-1.48.1.sha256sum -sha256 b2ea4f271aad2711f16b43c03151e2ec5a9874ff1a21142ef6d6406486a19dc2 gvfs-1.48.1.tar.xz +# From https://download.gnome.org/sources/gvfs/1.57/gvfs-1.57.2.sha256sum +sha256 f16bef8eca1fd6c117e85db011d21e915669790d55867349c5f1b291299e9585 gvfs-1.57.2.tar.xz # Hash for license file sha256 45cf336e2e48176993babc5aabf44437390f40e6a86a472c6abfc7ce9c035db4 COPYING diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk index 50efed1abb..b46b438dc6 100644 --- a/package/gvfs/gvfs.mk +++ b/package/gvfs/gvfs.mk @@ -4,8 +4,8 @@ # ################################################################################ -GVFS_VERSION_MAJOR = 1.48 -GVFS_VERSION = $(GVFS_VERSION_MAJOR).1 +GVFS_VERSION_MAJOR = 1.57 +GVFS_VERSION = $(GVFS_VERSION_MAJOR).2 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.xz GVFS_SITE = https://download.gnome.org/sources/gvfs/$(GVFS_VERSION_MAJOR) GVFS_INSTALL_STAGING = YES @@ -28,6 +28,7 @@ GVFS_CONF_OPTS = \ -Dafc=false \ -Dgoa=false \ -Dgoogle=false \ + -Donedrive=false \ -Dmtp=false \ -Dsftp=false \ -Dudisks2=false @@ -125,8 +126,8 @@ else GVFS_CONF_OPTS += -Dkeyring=false endif -ifeq ($(BR2_PACKAGE_LIBSOUP)$(BR2_PACKAGE_LIBXML2),yy) -GVFS_DEPENDENCIES += libsoup libxml2 +ifeq ($(BR2_PACKAGE_LIBSOUP3)$(BR2_PACKAGE_LIBXML2),yy) +GVFS_DEPENDENCIES += libsoup3 libxml2 GVFS_CONF_OPTS += -Dhttp=true else GVFS_CONF_OPTS += -Dhttp=false