Version in base suite: 1.6-9 Base version: geeqie_1.6-9 Target version: geeqie_1.6-9+deb11u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/g/geeqie/geeqie_1.6-9.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/g/geeqie/geeqie_1.6-9+deb11u1.dsc changelog | 6 + patches/0008-Fix-939-Ctrl-click-inside-of-a-block-selection-resul.patch | 41 ++++++++++ patches/series | 1 3 files changed, 48 insertions(+) diff: /srv/release.debian.org/tmp/FkdVwj33jQ/geeqie-1.6/auxdir/depcomp: No such file or directory diff: /srv/release.debian.org/tmp/XFN_odFIxh/geeqie-1.6/auxdir/depcomp: No such file or directory diff: /srv/release.debian.org/tmp/FkdVwj33jQ/geeqie-1.6/auxdir/install-sh: No such file or directory diff: /srv/release.debian.org/tmp/XFN_odFIxh/geeqie-1.6/auxdir/install-sh: No such file or directory diff -Nru geeqie-1.6/debian/changelog geeqie-1.6/debian/changelog --- geeqie-1.6/debian/changelog 2021-05-27 21:43:23.000000000 +0000 +++ geeqie-1.6/debian/changelog 2022-03-23 10:40:44.000000000 +0000 @@ -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 00:00:00.000000000 +0000 +++ geeqie-1.6/debian/patches/0008-Fix-939-Ctrl-click-inside-of-a-block-selection-resul.patch 2022-03-23 10:40:44.000000000 +0000 @@ -0,0 +1,41 @@ +From: Colin Clark +Date: Sun, 9 Jan 2022 10:10:50 +0000 +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), &cursor_path, NULL); +- if (cursor_path) +- { +- gtk_tree_model_get_iter(store, &iter, cursor_path); +- gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &VFLIST(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, &iter, tpath)) + { +- VFLIST(vf)->select_fd = NULL; ++ gtk_tree_view_get_cursor(GTK_TREE_VIEW(vf->listview), &cursor_path, NULL); ++ if (cursor_path) ++ { ++ gtk_tree_model_get_iter(store, &iter, cursor_path); ++ gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &VFLIST(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 12:38:32.000000000 +0000 +++ geeqie-1.6/debian/patches/series 2022-03-23 10:40:44.000000000 +0000 @@ -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