[rpms/catfish] rawhide: Backport upstream patch to restore functionality for sorting by column

[rpms/catfish] rawhide: Backport upstream patch to restore functionality for sorting by column

[Mamoru TASAKA]

A new commit has been pushed.

Repo   : rpms/catfish
Branch : rawhide
Commit : 3b4f75bdec296faab894b8b87fe09a2ee9c516b3
Author : Mamoru TASAKA <mtasaka@fedoraproject.org>
Date   : 2026-06-23T23:37:41+09:00
Stats  : +46/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/catfish/c/3b4f75bdec296faab894b8b87fe09a2ee9c516b3?branch=rawhide

Log:
Backport upstream patch to restore functionality for sorting by column

---
diff --git a/catfish-4.20.1-restore-use-of-GtkTreeModelSort.patch b/catfish-4.20.1-restore-use-of-GtkTreeModelSort.patch
new file mode 100644
index 0000000..9109e3a
--- /dev/null
+++ b/catfish-4.20.1-restore-use-of-GtkTreeModelSort.patch
@@ -0,0 +1,38 @@
+From 816eda5a3b1ab3c2e9532039629d205a056e5d3e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
+Date: Tue, 9 Jun 2026 22:33:10 +0200
+Subject: [PATCH] Restore use of GtkTreeModelSort
+
+It seems necessary for the sort column feature to work.
+
+Closes: #152
+Fixes: 3b4118d4ad646c8a0c2a1c3c3708b04a97b7672e
+---
+ catfish/CatfishWindow.py | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/catfish/CatfishWindow.py b/catfish/CatfishWindow.py
+index 1143657f..8920817a 100644
+--- a/catfish/CatfishWindow.py
++++ b/catfish/CatfishWindow.py
+@@ -2399,12 +2399,12 @@ class CatfishWindow(Window):
+         # Initialize the results filter.
+         self.results_filter = model.filter_new()
+         self.results_filter.set_visible_func(self.results_filter_func)
+-        model.set_default_sort_func(lambda w,x,y,z: 0)
+-        model.set_sort_func(2, self.size_sort_func, None)
++        sort = Gtk.TreeModelSort(model=self.results_filter)
++        sort.set_sort_func(2, self.size_sort_func, None)
+         if self.sort[0]:  # command-line sort method
+-            model.set_sort_column_id(self.sort[0], self.sort[1])
+-        self.treeview.set_model(self.results_filter)
+-        model.clear()
++            sort.set_sort_column_id(self.sort[0], self.sort[1])
++        self.treeview.set_model(sort)
++        sort.get_model().get_model().clear()
+         self.treeview.columns_autosize()
+ 
+         # Enable multiple-selection
+-- 
+GitLab
+

diff --git a/catfish.spec b/catfish.spec
index 21237e9..9789361 100644
--- a/catfish.spec
+++ b/catfish.spec
@@ -9,7 +9,7 @@ BuildRequires:	%1 \
 %define		mainver		4.20.1
 %undefine		betaver		
 
-%define		baserelease		8
+%define		baserelease		9
 
 Name:		catfish
 Version:	%{mainver}
@@ -20,6 +20,9 @@ Summary:	A handy file search tool
 License:	GPL-2.0-only
 URL:		https://docs.xfce.org/apps/catfish/start
 Source0:	https://archive.xfce.org/src/apps/catfish/%{majorver}/catfish-%{version}%{?betaver}.tar.xz
+# https://gitlab.xfce.org/apps/catfish/-/work_items/152
+# https://gitlab.xfce.org/apps/catfish/-/commit/816eda5a3b1ab3c2e9532039629d205a056e5d3e
+Patch0:	catfish-4.20.1-restore-use-of-GtkTreeModelSort.patch
 BuildArch:	noarch
 
 BuildRequires:	desktop-file-utils
@@ -61,6 +64,7 @@ options.
 
 %prep
 %setup -q -n %{name}-%{mainver}%{?betaver}
+%patch -P0 -p1
 
 # Fix up permissions...
 find . -type f -print0 | xargs --null chmod 0644
@@ -148,6 +152,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat
 
 
 %changelog
+* Tue Jun 23 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.20.1-9
+- Backport upstream patch to restore functionality for sorting by column
+
 * Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 4.20.1-8
 - Rebuilt for Python 3.15