On Sun, 2025-08-24 at 10:13 +0100, Jonathan Wiltshire wrote: > Control: tag -1 confirmed > > Hi, > > Please go ahead with the backport. > > Thanks, Thanks, uploaded to trixie with the attached debdiff of the isolated fix. -- Yves-Alexis
Differences in thunar between 4.20.2-1 and 4.20.2-1+deb13u1
diff -Nru thunar-4.20.2/debian/changelog thunar-4.20.2/debian/changelog
--- thunar-4.20.2/debian/changelog 2025-02-10 16:56:26.000000000 +0100
+++ thunar-4.20.2/debian/changelog 2025-08-25 10:28:03.000000000 +0200
@@ -1,3 +1,10 @@
+thunar (4.20.2-1+deb13u1) trixie; urgency=medium
+
+ * d/patches: add fix to always warn users before permanente deletion
+ (Closes: #1110905)
+
+ -- Yves-Alexis Perez <corsac@debian.org> Mon, 25 Aug 2025 10:28:03 +0200
+
thunar (4.20.2-1) unstable; urgency=medium
* New upstream version 4.20.2
diff -Nru thunar-4.20.2/debian/gbp.conf thunar-4.20.2/debian/gbp.conf
--- thunar-4.20.2/debian/gbp.conf 2025-02-10 16:56:26.000000000 +0100
+++ thunar-4.20.2/debian/gbp.conf 2025-08-25 10:28:03.000000000 +0200
@@ -1,4 +1,4 @@
[DEFAULT]
pristine-tar = True
-debian-branch = debian/master
+debian-branch = debian/trixie
upstream-branch = upstream/latest
diff -Nru thunar-4.20.2/debian/patches/0002-Always-warn-user-before-permanent-deleting-files.patch thunar-4.20.2/debian/patches/0002-Always-warn-user-before-permanent-deleting-files.patch
--- thunar-4.20.2/debian/patches/0002-Always-warn-user-before-permanent-deleting-files.patch 1970-01-01 01:00:00.000000000 +0100
+++ thunar-4.20.2/debian/patches/0002-Always-warn-user-before-permanent-deleting-files.patch 2025-08-25 10:28:03.000000000 +0200
@@ -0,0 +1,53 @@
+From: Shawn Henson <shawn@shenso.name>
+Date: Mon, 5 May 2025 17:39:52 -0400
+Subject: Always warn user before permanent deleting files
+
+The warn argument on thunar_application_unlink_files currently applies
+to both trashing and permanent deletes. Upstream trash functions do not
+account for the permanent argument being mutable, so permanent deletes
+occur without warning when any file in the file list cannot be trashed.
+
+This commit changes thunar_application_unlink_files to only reference
+the warn argument when moving files to trash, and assume all permanent
+deletions should ask the user for confirmation.
+
+Fixes: #1621
+---
+ thunar/thunar-application.c | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
+index 33bf569..ef75298 100644
+--- a/thunar/thunar-application.c
++++ b/thunar/thunar-application.c
+@@ -2438,7 +2438,7 @@ unlink_stub (GList *source_path_list,
+ * @parent : a #GdkScreen, a #GtkWidget or %NULL.
+ * @file_list : the list of #ThunarFile<!---->s that should be deleted.
+ * @permanently : whether to unlink the files permanently.
+- * @warn : whether to warn the user if deleting permanently.
++ * @warn : whether to warn the user if moving files to trash.
+ * @log_mode : log mode
+ *
+ * Deletes all files in the @file_list and takes care of all user interaction.
+@@ -2489,7 +2489,7 @@ thunar_application_unlink_files (ThunarApplication *application,
+ return FALSE;
+
+ /* ask the user to confirm if deleting permanently */
+- if (G_UNLIKELY (permanently) && warn)
++ if (G_UNLIKELY (permanently))
+ {
+ /* parse the parent pointer */
+ screen = thunar_util_parse_parent (parent, &window);
+@@ -2555,12 +2555,6 @@ thunar_application_unlink_files (ThunarApplication *application,
+ else
+ operation_canceled = TRUE;
+ }
+- else if (G_UNLIKELY (permanently))
+- {
+- thunar_application_launch (application, parent, "edit-delete",
+- _("Deleting files..."), unlink_stub,
+- path_list, path_list, TRUE, FALSE, log_mode, NULL);
+- }
+ else if (G_LIKELY (!permanently) && warn)
+ {
+ /* parse the parent pointer */
diff -Nru thunar-4.20.2/debian/patches/series thunar-4.20.2/debian/patches/series
--- thunar-4.20.2/debian/patches/series 2025-02-10 16:56:26.000000000 +0100
+++ thunar-4.20.2/debian/patches/series 2025-08-25 10:28:03.000000000 +0200
@@ -1 +1,2 @@
01_support-non-multiarch-modules.patch
+0002-Always-warn-user-before-permanent-deleting-files.patch
Attachment:
signature.asc
Description: This is a digitally signed message part