On Sun, 13 Feb 2022 at 13:44:37 +0000, Simon McVittie wrote:
> [x] attach debdiff against the package in (old)stable
Ugh, actually attached now.
smcv
diffstat for gtk+3.0-3.24.24 gtk+3.0-3.24.24
debian/changelog | 8 +
debian/control | 2
debian/control.in | 2
debian/gbp.conf | 2
debian/patches/searchenginemodel-finalize-search-results.patch | 43 ++++++++++
debian/patches/series | 1
gtk/gtksearchenginemodel.c | 4
7 files changed, 59 insertions(+), 3 deletions(-)
diff -Nru gtk+3.0-3.24.24/debian/changelog gtk+3.0-3.24.24/debian/changelog
--- gtk+3.0-3.24.24/debian/changelog 2021-05-02 12:34:12.000000000 +0100
+++ gtk+3.0-3.24.24/debian/changelog 2022-02-13 13:27:26.000000000 +0000
@@ -1,3 +1,11 @@
+gtk+3.0 (3.24.24-4+deb11u1) bullseye; urgency=medium
+
+ * Add patch from upstream to fix missing search results when using NFS
+ (Closes: #976334)
+ * d/gbp.conf, d/control.in: Set packaging branch to debian/bullseye
+
+ -- Simon McVittie <s...@debian.org> Sun, 13 Feb 2022 13:27:26 +0000
+
gtk+3.0 (3.24.24-4) unstable; urgency=medium
* Add various patches from upstream 3.24.25 to 3.24.29, mostly
diff -Nru gtk+3.0-3.24.24/debian/control gtk+3.0-3.24.24/debian/control
--- gtk+3.0-3.24.24/debian/control 2021-05-02 12:34:12.000000000 +0100
+++ gtk+3.0-3.24.24/debian/control 2022-02-13 13:27:26.000000000 +0000
@@ -59,7 +59,7 @@
Rules-Requires-Root: no
Standards-Version: 4.5.1
Vcs-Browser: https://salsa.debian.org/gnome-team/gtk3
-Vcs-Git: https://salsa.debian.org/gnome-team/gtk3.git
+Vcs-Git: https://salsa.debian.org/gnome-team/gtk3.git -b debian/bullseye
Homepage: https://www.gtk.org/
Package: libgtk-3-0
diff -Nru gtk+3.0-3.24.24/debian/control.in gtk+3.0-3.24.24/debian/control.in
--- gtk+3.0-3.24.24/debian/control.in 2021-05-02 12:34:12.000000000 +0100
+++ gtk+3.0-3.24.24/debian/control.in 2022-02-13 13:27:26.000000000 +0000
@@ -59,7 +59,7 @@
Rules-Requires-Root: no
Standards-Version: 4.5.1
Vcs-Browser: https://salsa.debian.org/gnome-team/gtk3
-Vcs-Git: https://salsa.debian.org/gnome-team/gtk3.git
+Vcs-Git: https://salsa.debian.org/gnome-team/gtk3.git -b debian/bullseye
Homepage: https://www.gtk.org/
Package: @SHARED_PKG@
diff -Nru gtk+3.0-3.24.24/debian/gbp.conf gtk+3.0-3.24.24/debian/gbp.conf
--- gtk+3.0-3.24.24/debian/gbp.conf 2021-05-02 12:34:12.000000000 +0100
+++ gtk+3.0-3.24.24/debian/gbp.conf 2022-02-13 13:27:26.000000000 +0000
@@ -1,6 +1,6 @@
[DEFAULT]
pristine-tar = True
-debian-branch = debian/master
+debian-branch = debian/bullseye
upstream-branch = upstream/latest
[buildpackage]
diff -Nru gtk+3.0-3.24.24/debian/patches/searchenginemodel-finalize-search-results.patch gtk+3.0-3.24.24/debian/patches/searchenginemodel-finalize-search-results.patch
--- gtk+3.0-3.24.24/debian/patches/searchenginemodel-finalize-search-results.patch 1970-01-01 01:00:00.000000000 +0100
+++ gtk+3.0-3.24.24/debian/patches/searchenginemodel-finalize-search-results.patch 2022-02-13 13:27:26.000000000 +0000
@@ -0,0 +1,43 @@
+From: Pierre Ossman <oss...@cendio.se>
+Date: Mon, 4 Oct 2021 09:23:39 +0200
+Subject: searchenginemodel: finalize search results
+
+It is necessary to signal the search engine that we are finished and
+that we found something for it to reliably show the results. It would
+sometimes work anyway since it is sufficient if any backend signals
+completion. However if GtkSearchEngineModel was the only backend
+returning results then things would break.
+
+Origin: upstream, 3.24.31, commit:aca83684ed4c62210958b3dd2596a0f35404d215
+Bug-Debian: https://bugs.debian.org/976334
+---
+ gtk/gtksearchenginemodel.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/gtk/gtksearchenginemodel.c b/gtk/gtksearchenginemodel.c
+index dae99f2..8f2ca0c 100644
+--- a/gtk/gtksearchenginemodel.c
++++ b/gtk/gtksearchenginemodel.c
+@@ -84,6 +84,7 @@ do_search (gpointer data)
+ GtkSearchEngineModel *model = data;
+ GtkTreeIter iter;
+ GList *hits = NULL;
++ gboolean got_results = FALSE;
+
+ if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model->model), &iter))
+ {
+@@ -110,11 +111,14 @@ do_search (gpointer data)
+ {
+ _gtk_search_engine_hits_added (GTK_SEARCH_ENGINE (model), hits);
+ g_list_free_full (hits, (GDestroyNotify)_gtk_search_hit_free);
++ got_results = TRUE;
+ }
+ }
+
+ model->idle = 0;
+
++ _gtk_search_engine_finished (GTK_SEARCH_ENGINE (model), got_results);
++
+ return G_SOURCE_REMOVE;
+ }
+
diff -Nru gtk+3.0-3.24.24/debian/patches/series gtk+3.0-3.24.24/debian/patches/series
--- gtk+3.0-3.24.24/debian/patches/series 2021-05-02 12:34:12.000000000 +0100
+++ gtk+3.0-3.24.24/debian/patches/series 2022-02-13 13:27:26.000000000 +0000
@@ -20,3 +20,4 @@
060_ignore-random-icons.patch
reftest-known-fail.patch
Disable-accessibility-dump-aka-a11ytests-test.patch
+searchenginemodel-finalize-search-results.patch
diff -Nru gtk+3.0-3.24.24/gtk/gtksearchenginemodel.c gtk+3.0-3.24.24/gtk/gtksearchenginemodel.c
--- gtk+3.0-3.24.24/gtk/gtksearchenginemodel.c 2020-12-02 22:21:56.000000000 +0000
+++ gtk+3.0-3.24.24/gtk/gtksearchenginemodel.c 2022-02-13 13:35:24.000000000 +0000
@@ -84,6 +84,7 @@
GtkSearchEngineModel *model = data;
GtkTreeIter iter;
GList *hits = NULL;
+ gboolean got_results = FALSE;
if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model->model), &iter))
{
@@ -110,11 +111,14 @@
{
_gtk_search_engine_hits_added (GTK_SEARCH_ENGINE (model), hits);
g_list_free_full (hits, (GDestroyNotify)_gtk_search_hit_free);
+ got_results = TRUE;
}
}
model->idle = 0;
+ _gtk_search_engine_finished (GTK_SEARCH_ENGINE (model), got_results);
+
return G_SOURCE_REMOVE;
}
