Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gvfs for openSUSE:Factory checked in at 2023-04-13 14:10:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gvfs (Old) and /work/SRC/openSUSE:Factory/.gvfs.new.19717 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gvfs" Thu Apr 13 14:10:02 2023 rev:183 rq:1078631 version:1.50.4 Changes: -------- --- /work/SRC/openSUSE:Factory/gvfs/gvfs.changes 2023-03-24 15:17:05.993843076 +0100 +++ /work/SRC/openSUSE:Factory/.gvfs.new.19717/gvfs.changes 2023-04-13 14:10:14.952124892 +0200 @@ -1,0 +2,7 @@ +Wed Apr 12 08:23:53 UTC 2023 - Bjørn Lie <bjorn....@gmail.com> + +- Add 41862c0179f834d8bc3bd84ce78ee495050f2676.patch: trash: Sync + trash dir items when files change. +- Use auto(setup|patch) macros. + +------------------------------------------------------------------- New: ---- 41862c0179f834d8bc3bd84ce78ee495050f2676.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gvfs.spec ++++++ --- /var/tmp/diff_new_pack.TSvJjy/_old 2023-04-13 14:10:15.476127901 +0200 +++ /var/tmp/diff_new_pack.TSvJjy/_new 2023-04-13 14:10:15.480127924 +0200 @@ -27,6 +27,9 @@ Source0: https://download.gnome.org/sources/gvfs/1.50/%{name}-%{version}.tar.xz Source99: baselibs.conf +# PATCH-FIX-UPSTREAM 41862c0179f834d8bc3bd84ce78ee495050f2676.patch -- trash: Sync trash dir items when files change +Patch0: https://gitlab.gnome.org/GNOME/gvfs/-/commit/41862c0179f834d8bc3bd84ce78ee495050f2676.patch + ### NOTE: Please, keep SLE-only patches at bottom (starting on 1000). # PATCH-FEATURE-SLE gvfs-nds.patch ksam...@novell.com -- Provides NDS browsing for nautilus Patch1000: gvfs-nds.patch @@ -170,11 +173,10 @@ %lang_package %prep -%setup -q - +%autosetup -N +%autopatch -p1 -M 999 %if 0%{?sle_version} -%patch1000 -p1 -%patch1001 -p1 +%autopatch -p1 -m 1000 %endif %build ++++++ 41862c0179f834d8bc3bd84ce78ee495050f2676.patch ++++++ >From 41862c0179f834d8bc3bd84ce78ee495050f2676 Mon Sep 17 00:00:00 2001 From: rong wang <wangr...@uniontech.com> Date: Thu, 23 Mar 2023 10:26:24 +0800 Subject: [PATCH] trash: Sync trash dir items when files change In the case of an application monitoring the trash can, delete a file on the mounted device to the trash can, and then unmount the device. At this time, if you check the status of the trash can, you will find that the number of files queried is inconsistent with the number of files obtained through the enumeration job. This is because the number of files queried includes some files that do not exist when the device is unmounted. The solution is to synchronize the status of the trash can in time to ensure that the trash can does not record files that do not exist. --- daemon/trashlib/trashdir.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/daemon/trashlib/trashdir.c b/daemon/trashlib/trashdir.c index c470d3bdf..0d7d2b1be 100644 --- a/daemon/trashlib/trashdir.c +++ b/daemon/trashlib/trashdir.c @@ -163,10 +163,27 @@ trash_dir_changed (GFileMonitor *monitor, TrashDir *dir = user_data; if (event_type == G_FILE_MONITOR_EVENT_CREATED) - trash_root_add_item (dir->root, file, dir->topdir, dir->is_homedir); + { + dir->items = g_slist_insert_sorted (dir->items, + g_object_ref (file), + (GCompareFunc) compare_basename); + trash_root_add_item (dir->root, file, dir->topdir, dir->is_homedir); + } else if (event_type == G_FILE_MONITOR_EVENT_DELETED) - trash_root_remove_item (dir->root, file, dir->is_homedir); + { + GSList *node; + + node = g_slist_find_custom (dir->items, + file, + (GCompareFunc) compare_basename); + if (node) + { + g_object_unref (node->data); + dir->items = g_slist_delete_link (dir->items, node); + } + trash_root_remove_item (dir->root, file, dir->is_homedir); + } else if (event_type == G_FILE_MONITOR_EVENT_PRE_UNMOUNT || event_type == G_FILE_MONITOR_EVENT_UNMOUNTED || -- GitLab
