Package: release.debian.org
User: release.debian@packages.debian.org
Usertags: pu
Tags: bullseye
Severity: normal
I would like to fix a bug in geeqie in bullseye where selecting several
items in a file-list and then trying to deselect one item using
Ctrl+click doesn't work as it should.
Unfortunately this isn't reported in the Debian BTS, but the bug I
reacted to is upstream [1], and the original bug [2] also showing a
video of the problem. (I asked the reporter to report it in Debian, but
he/she hasn't done that yet).
The fix is cherry-picked from upstream, and also available in versions
from 1.7 and forward, already packaged and tested in unstable. I have
tested the cherry-picked fix in stable and it works.
1: https://github.com/BestImageViewer/geeqie/issues/969
2: https://github.com/BestImageViewer/geeqie/issues/939
[ Risks ]
This is a small change in leaf package, should be very low risk.
[ Checklist ]
[X] *all* changes are documented in the d/changelog
[X] I reviewed all changes and I approve them
[X] attach debdiff against the package in (old)stable
[X] the issue is verified as fixed in unstable
diff -Nru geeqie-1.6/debian/changelog geeqie-1.6/debian/changelog
--- geeqie-1.6/debian/changelog 2021-05-27 23:43:23.0 +0200
+++ geeqie-1.6/debian/changelog 2022-03-23 11:40:44.0 +0100
@@ -1,3 +1,9 @@
+geeqie (1:1.6-9+deb11u1) bullseye; urgency=medium
+
+ * Add patch to fix Ctrl click inside of a block selection
+
+ -- Andreas Rönnquist Wed, 23 Mar 2022 11:40:44 +0100
+
geeqie (1:1.6-9) unstable; urgency=medium
* Remove ufraw and ufraw-batch from recommends/suggests
diff -Nru geeqie-1.6/debian/patches/0008-Fix-939-Ctrl-click-inside-of-a-block-selection-resul.patch geeqie-1.6/debian/patches/0008-Fix-939-Ctrl-click-inside-of-a-block-selection-resul.patch
--- geeqie-1.6/debian/patches/0008-Fix-939-Ctrl-click-inside-of-a-block-selection-resul.patch 1970-01-01 01:00:00.0 +0100
+++ geeqie-1.6/debian/patches/0008-Fix-939-Ctrl-click-inside-of-a-block-selection-resul.patch 2022-03-23 11:33:16.0 +0100
@@ -0,0 +1,41 @@
+From: Colin Clark
+Date: Sun, 9 Jan 2022 10:10:50 +
+Subject: Fix #939: Ctrl-click inside of a block selection results in whole
+ selection being cancelled
+
+https://github.com/BestImageViewer/geeqie/issues/939
+---
+ src/view_file/view_file_list.c | 19 ++-
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/src/view_file/view_file_list.c b/src/view_file/view_file_list.c
+index 6418b41..76d6422 100644
+--- a/src/view_file/view_file_list.c
b/src/view_file/view_file_list.c
+@@ -798,16 +798,17 @@ static gboolean vflist_select_cb(GtkTreeSelection *selection, GtkTreeModel *stor
+ GtkTreeIter iter;
+ GtkTreePath *cursor_path;
+
+- gtk_tree_view_get_cursor(GTK_TREE_VIEW(vf->listview), _path, NULL);
+- if (cursor_path)
+- {
+- gtk_tree_model_get_iter(store, , cursor_path);
+- gtk_tree_model_get(store, , FILE_COLUMN_POINTER, (vf)->select_fd, -1);
+- gtk_tree_path_free(cursor_path);
+- }
+- else
++ VFLIST(vf)->select_fd = NULL;
++
++ if (!path_currently_selected && gtk_tree_model_get_iter(store, , tpath))
+ {
+- VFLIST(vf)->select_fd = NULL;
++ gtk_tree_view_get_cursor(GTK_TREE_VIEW(vf->listview), _path, NULL);
++ if (cursor_path)
++ {
++ gtk_tree_model_get_iter(store, , cursor_path);
++ gtk_tree_model_get(store, , FILE_COLUMN_POINTER, (vf)->select_fd, -1);
++ gtk_tree_path_free(cursor_path);
++ }
+ }
+
+ if (vf->layout &&
diff -Nru geeqie-1.6/debian/patches/series geeqie-1.6/debian/patches/series
--- geeqie-1.6/debian/patches/series 2021-03-10 13:38:32.0 +0100
+++ geeqie-1.6/debian/patches/series 2022-03-23 11:33:16.0 +0100
@@ -5,3 +5,4 @@
0005-Fix-822-The-image-rotation-keys-and-affect-the-wrong.patch
0006-Fix-860-871-remote-and-slideshow-on-startup.patch
0007-Fix-644-Images-fail-to-render-on-MacOS.patch
+0008-Fix-939-Ctrl-click-inside-of-a-block-selection-resul.patch
