Author: mtasaka
Update of /cvs/extras/rpms/libfm/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1331/F-13
Modified Files:
libfm.spec
Added Files:
libfm-0.1.12-sort-in-cs_CZ.UTF-8.patch
Log Message:
* Thu Jun 4 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.12-2
- Fix an issue in sorting by name in cs_CZ.UTF-8 (upstream bug 3009374)
libfm-0.1.12-sort-in-cs_CZ.UTF-8.patch:
fm-folder-model.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
--- NEW FILE libfm-0.1.12-sort-in-cs_CZ.UTF-8.patch ---
diff --git a/src/gtk/fm-folder-model.c b/src/gtk/fm-folder-model.c
index f0a26e6..7a13b48 100644
--- a/src/gtk/fm-folder-model.c
+++ b/src/gtk/fm-folder-model.c
@@ -689,7 +689,12 @@ static gint fm_folder_model_compare(FmFolderItem* item1,
_sort_by_name:
key1 = fm_file_info_get_collate_key(file1);
key2 = fm_file_info_get_collate_key(file2);
- ret = g_ascii_strcasecmp(key1, key2);
+ /*
+ collate keys are already passed to g_utf8_casefold, no need to
+ use strcasecmp here (and g_utf8_collate_key returns a string of
+ which case cannot be ignored)
+ */
+ ret = g_strcmp0(key1, key2);
break;
}
case COL_FILE_SIZE:
Index: libfm.spec
===================================================================
RCS file: /cvs/extras/rpms/libfm/F-13/libfm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- libfm.spec 29 May 2010 11:12:03 -0000 1.13
+++ libfm.spec 3 Jun 2010 20:38:55 -0000 1.14
@@ -5,7 +5,7 @@
Name: libfm
Version: 0.1.12
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GIO-based library for file manager-like programs
Group: System Environment/Libraries
@@ -16,6 +16,8 @@ Source0: http://downloads.sourcef
Patch0: libfm-0.1.9-pref-apps.patch
# Patches already in git
# Patches need discussing with the upstream
+# Upstream bug 3009374, sorting by name broken in cs_CZ.UTF-8
+Patch1: libfm-0.1.12-sort-in-cs_CZ.UTF-8.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel >= 2.16.0
@@ -79,6 +81,7 @@ developing applications that use %{name}
%setup -q
%patch0 -p1 -b .orig
+%patch1 -p1 -b .sort_cs
# treak rpath
sed -i.libdir_syssearch -e \
@@ -185,6 +188,9 @@ update-mime-database %{_datadir}/mime &>
%changelog
+* Thu Jun 4 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.12-2
+- Fix an issue in sorting by name in cs_CZ.UTF-8 (upstream bug 3009374)
+
* Sat May 29 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.12-1
- Update to 0.1.12, drop upstreamed patches