diff --git a/0001-Fix-memory-leaks-detected-by-valgrind.patch b/0001-Fix-memory-leaks-detected-by-valgrind.patch deleted file mode 100644 index 630a52958e4c7a64fec66c90076c0e202c0b1cfa..0000000000000000000000000000000000000000 --- a/0001-Fix-memory-leaks-detected-by-valgrind.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 64581a94ceeb3f3d3121823fbd309a8c81c8b4fb Mon Sep 17 00:00:00 2001 -From: wang xiaomeng -Date: Tue, 18 Jul 2023 09:04:19 +0000 -Subject: [PATCH] Fix various memory leaks - -Valgrind detects various memory leaks in gvfs daemons. Let's fix some of them. - -Fixes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/682 ---- - common/gvfsmountinfo.c | 2 +- - daemon/gvfsbackendnetwork.c | 9 +-------- - daemon/gvfsdaemon.c | 3 +++ - monitor/gphoto2/ggphoto2volumemonitor.c | 1 + - 4 files changed, 6 insertions(+), 9 deletions(-) - -diff --git a/common/gvfsmountinfo.c b/common/gvfsmountinfo.c -index c3f31af..287b9db 100644 ---- a/common/gvfsmountinfo.c -+++ b/common/gvfsmountinfo.c -@@ -640,7 +640,7 @@ _g_find_file_insensitive_async (GFile *parent, - G_FILE_QUERY_INFO_NONE, G_PRIORITY_DEFAULT, - cancellable, - find_file_insensitive_exists_callback, task); -- -+ g_object_unref (direct_file); - - } - -diff --git a/daemon/gvfsbackendnetwork.c b/daemon/gvfsbackendnetwork.c -index 87cfec7..50cdc27 100644 ---- a/daemon/gvfsbackendnetwork.c -+++ b/daemon/gvfsbackendnetwork.c -@@ -902,14 +902,7 @@ g_vfs_backend_network_init (GVfsBackendNetwork *network_backend) - network_backend->smb_settings = g_settings_new ("org.gnome.system.smb"); - - current_workgroup = g_settings_get_string (network_backend->smb_settings, "workgroup"); -- -- if (current_workgroup == NULL || -- current_workgroup[0] == 0) -- /* it's okay if current_workgroup is null here, -- * it's checked before the NetworkFile is added anyway. */ -- network_backend->current_workgroup = NULL; -- else -- network_backend->current_workgroup = current_workgroup; -+ network_backend->current_workgroup = current_workgroup; - - g_signal_connect (network_backend->smb_settings, - "change-event", -diff --git a/daemon/gvfsdaemon.c b/daemon/gvfsdaemon.c -index a6d6236..f659041 100644 ---- a/daemon/gvfsdaemon.c -+++ b/daemon/gvfsdaemon.c -@@ -145,6 +145,9 @@ g_vfs_daemon_finalize (GObject *object) - - daemon = G_VFS_DAEMON (object); - -+ if (daemon->thread_pool != NULL) -+ g_thread_pool_free (daemon->thread_pool, TRUE, FALSE); -+ - /* There may be some jobs outstanding if we've been force unmounted. */ - if (daemon->jobs) - g_warning ("daemon->jobs != NULL when finalizing daemon!"); -diff --git a/monitor/gphoto2/ggphoto2volumemonitor.c b/monitor/gphoto2/ggphoto2volumemonitor.c -index 54dec6e..77d458a 100644 ---- a/monitor/gphoto2/ggphoto2volumemonitor.c -+++ b/monitor/gphoto2/ggphoto2volumemonitor.c -@@ -331,6 +331,7 @@ gudev_coldplug_cameras (GGPhoto2VolumeMonitor *monitor) - if (g_udev_device_has_property (d, "ID_GPHOTO2")) - gudev_add_camera (monitor, d, FALSE); - } -+ g_list_free_full (usb_devices, g_object_unref); - } - - static GObject * --- -2.33.0 - diff --git a/gvfs-1.50.2.tar.xz b/gvfs-1.50.2.tar.xz deleted file mode 100644 index e7660b31bb2719d3f0144333af5ef9af339c0bde..0000000000000000000000000000000000000000 Binary files a/gvfs-1.50.2.tar.xz and /dev/null differ diff --git a/gvfs-1.53.91.tar.xz b/gvfs-1.53.91.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..e4b4557ed30834a9ee48e2ddf3b47cea86fefbfc Binary files /dev/null and b/gvfs-1.53.91.tar.xz differ diff --git a/gvfs.spec b/gvfs.spec index d9a513fe07f8068b10c40de8d8da36380646ae96..37f5bee8a1425601515067dd43b378290b8b980e 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -21,21 +21,19 @@ %global udisks2_version 1.97 Name: gvfs -Version: 1.50.2 -Release: 6 +Version: 1.53.91 +Release: 1 Summary: gvfs is a backends for the gio framework in GLib License: GPLv3 and LGPLv2+ and BSD and MPLv2.0 URL: https://wiki.gnome.org/Projects/gvfs -Source0: https://download.gnome.org/sources/gvfs/1.50/gvfs-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gvfs/1.53/gvfs-%{version}.tar.xz -# Modify memory leaks patch errors by backporting upstream patch -Patch01: 0001-Fix-memory-leaks-detected-by-valgrind.patch BuildRequires: /usr/bin/ssh meson gcc libexif-devel gettext-devel docbook-style-xsl chrpath BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(gcr-3) +BuildRequires: pkgconfig(gcr-4) BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libbluray) @@ -113,6 +111,8 @@ This package containers the headers and other files which are required for devel -Darchive=false \ -Dafp=false \ -Dgcrypt=false \ + -Donedrive=false \ + -Dgoogle=false \ %{nil} %meson_build @@ -173,6 +173,9 @@ killall -USR1 gvfsd >&/dev/null || : %{_mandir}/man1/gvfsd-fuse.1* %changelog +* Mon Mar 11 2024 liweigang - 1.53.91-1 +- update to version 1.53.91 + * Fri Jan 12 2024 wangxiaomeng - 1.50.2-6 - Modify memory-leaks patch errors