浏览代码

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 <titouan.christophe@mind.be>
[Julien: remove .checkpackageignore entry to fix check-package error]
Signed-off-by: Julien Olivain <ju.o@free.fr>
Titouan Christophe 1 月之前
父节点
当前提交
3ea1225d4f

+ 0 - 1
.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/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/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/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/harfbuzz/0001-meson.build-check-for-pthread.h.patch lib_patch.Upstream
 package/haserl/0001-add-haserl_lualib.inc.patch lib_patch.Upstream
 package/haserl/0001-add-haserl_lualib.inc.patch lib_patch.Upstream
 package/haveged/S21haveged Shellcheck lib_sysv.Variables
 package/haveged/S21haveged Shellcheck lib_sysv.Variables

+ 0 - 33
package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch

@@ -1,33 +0,0 @@
-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
-
-[Retrieved (and backported) from:
-https://gitlab.gnome.org/GNOME/gvfs/-/commit/17a067b9b823a0d54e061eae45ff8e2c7e4a88d0]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- 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
-

+ 2 - 2
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
 # Hash for license file
 sha256  45cf336e2e48176993babc5aabf44437390f40e6a86a472c6abfc7ce9c035db4  COPYING
 sha256  45cf336e2e48176993babc5aabf44437390f40e6a86a472c6abfc7ce9c035db4  COPYING

+ 5 - 4
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_SOURCE = gvfs-$(GVFS_VERSION).tar.xz
 GVFS_SITE = https://download.gnome.org/sources/gvfs/$(GVFS_VERSION_MAJOR)
 GVFS_SITE = https://download.gnome.org/sources/gvfs/$(GVFS_VERSION_MAJOR)
 GVFS_INSTALL_STAGING = YES
 GVFS_INSTALL_STAGING = YES
@@ -28,6 +28,7 @@ GVFS_CONF_OPTS = \
 	-Dafc=false \
 	-Dafc=false \
 	-Dgoa=false \
 	-Dgoa=false \
 	-Dgoogle=false \
 	-Dgoogle=false \
+	-Donedrive=false \
 	-Dmtp=false \
 	-Dmtp=false \
 	-Dsftp=false \
 	-Dsftp=false \
 	-Dudisks2=false
 	-Dudisks2=false
@@ -125,8 +126,8 @@ else
 GVFS_CONF_OPTS += -Dkeyring=false
 GVFS_CONF_OPTS += -Dkeyring=false
 endif
 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
 GVFS_CONF_OPTS += -Dhttp=true
 else
 else
 GVFS_CONF_OPTS += -Dhttp=false
 GVFS_CONF_OPTS += -Dhttp=false