Re: [Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-migrate-settings-to-yaru into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
> That's what I'll do when sponsoring bileto updates, but if other people > want to do it the .dsc way then I won't argue with them, I just think it's > harder work. We can do both, depending on what the sponsor prefers I think. The reason I said to use the .dsc was also to make sure that the timestamp on the changelog matches the one of the uploaded package, and having that is the easier way. But indeed, if I'd push that commit too (as I normally did), the sponsor then can proceed with tagging only. Up to you guys. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/354136 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-migrate-settings-to-yaru into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/bionic-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/bionic-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/bionic with ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/bionic as a prerequisite. Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1756826 in nautilus (Ubuntu): "hangs when remote search provider performs expensive operation" https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1756826 For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-calculator/+git/gnome-calculator/+merge/354335 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/bionic-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/bionic. diff --git a/debian/changelog b/debian/changelog index a7346e1..ae09540 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,17 @@ gnome-calculator (1:3.28.2-1ubuntu1) UNRELEASED; urgency=medium - Use Ubuntu Vcs-* URIs, and move debian's to XS-Debian-Vcs-* * debian/gbp.conf: - update branches to point to ubuntu/bionic + d/p/search-provider-Use-async-calls-cancel-search-on-inactivi.patch, +d/p/search-provider-renew-inactivity-timeout-at-each-calculat.patch, +d/p/search-provider-Use-lower-inactivity-timeout.patch, +d/p/search-provider-simplify-solve_subprocess.patch, +d/p/search-provider-cache-equations-avoiding-spawning-calcula.patch, +d/p/search-provider-cancel-the-current-process-on-new-calcula.patch, +d/p/search-provider-cache-only-a-limited-number-of-equations.patch, +d/p/ubuntu/search-provider-Cancel-operations-on-XUbuntuCancel.patch: +- Make search provider async and support XUbuntuCancel method to + stop expensive operations that might lead to an unresponsive + process (LP: #1756826) -- Marco Trevisan (Treviño) Wed, 05 Sep 2018 15:26:32 +0200 diff --git a/debian/control b/debian/control index cd4706c..0782192 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,8 @@ Source: gnome-calculator Section: math Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Jeremy Bicha , Laurent Bigonville , Michael Biebl Build-Depends: appstream-util, debhelper (>= 11.1.3), diff --git a/debian/control.in b/debian/control.in index b5194ee..d9e0327 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,7 +1,8 @@ Source: gnome-calculator Section: math Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: appstream-util, debhelper (>= 11.1.3), diff --git a/debian/patches/search-provider-Use-async-calls-cancel-search-on-inactivi.patch b/debian/patches/search-provider-Use-async-calls-cancel-search-on-inactivi.patch new file mode 100644 index 000..324be46 --- /dev/null +++ b/debian/patches/search-provider-Use-async-calls-cancel-search-on-inactivi.patch @@ -0,0 +1,232 @@ +From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= +Date: Fri, 24 Aug 2018 06:57:03 +0200 +Subject: search-provider: Use async calls, cancel search on inactivity + +Move to async methods everywhere and factorize the `solve` calls to a single +method that only uses Subprocess and that can be cancelled. + +As per this, if the the search-provider is trying to compute some complex +operation, the daemon won't hang and once the applications' inactivity +timeout is hit, any running instance of gnome-calculator will be killed and +the daemon will return accordingly. + +This reduces the impact of an issue that can cause gnome-calculator to keep +running forever if a complex computation is required (10!!!) from the shell, +and won't ever be killed (see GNOME/gnome-shell#183). + +This is also a prerequisite for supporting the search Cancellation that is +going to be available on next version of the Search provider protocol +(as per GNOME/gnome-shell#436) + +Bug-Ubuntu: https://launchpad.net/bugs/1756826 +Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/183 +Forwarded: https://gitlab.gnome.org/GNOME/gnome-calculator/merge_requests/10 +--- + search-provider/search-provider.vala | 126 +-- + 1 file changed, 89 insertions(+), 37 deletions(-) + +diff --git a/search-provider/search-provider.vala b/search-provider/search-provider.vala +index 26c72af..659f73d 100644 +--- a/search-provider/search-provider.vala b/search-provider/search-provider.vala +@@ -1,6 +1,7 @@ + /* -*- Mode: vala; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- + * + * Copyright (C) 2014 Michael Catanzaro ++ * Copyright (C) 2018 Marco Trevisan + * + * This program is free software: you can redistribute it and/or modify it under + * the terms of
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-migrate-settings-to-yaru into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
and merged, based on top of my current work as well (and pushed 3.30) -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/354136 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-migrate-settings-to-yaru into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-migrate-settings-to-yaru into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
In my opinion it's enough for the sponsor to be the person that authored the (signed) tag, so no need to make sponsoring bileto uploads even harder by requiring a round trip through the .dsc to fix a finalise commit. That's what I'll do when sponsoring bileto updates, but if other people want to do it the .dsc way then I won't argue with them, I just think it's harder work. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/354136 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-migrate-settings-to-yaru into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/bionic
The proposal to merge ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/bionic has been updated. Description changed to: Lots of garbage as per upstream changes (coming from debian merge), compare actual packaging changes with git diff ubuntu/1%3.28.1-1ubuntu1 debian For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-calculator/+git/gnome-calculator/+merge/354330 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-migrate-settings-to-yaru into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-migrate-settings-to-yaru into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/354136 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-migrate-settings-to-yaru into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master
Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master. Requested reviews: Ubuntu Desktop (ubuntu-desktop) For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-calculator/+git/gnome-calculator/+merge/354328 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master. diff --git a/debian/changelog b/debian/changelog index 193d268..2ced402 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gnome-calculator (1:3.30.0-1ubuntu2) UNRELEASED; urgency=medium + + * debian/control: +- Use Ubuntu Vcs-* URIs, and move debian's to XS-Debian-Vcs-* + + -- Marco Trevisan (Treviño) Wed, 05 Sep 2018 15:35:38 +0200 + gnome-calculator (1:3.30.0-1ubuntu1) cosmic; urgency=medium * Sync with Debian diff --git a/debian/control b/debian/control index 7d6545e..02dbd88 100644 --- a/debian/control +++ b/debian/control @@ -22,8 +22,10 @@ Build-Depends: appstream-util, libmpc-dev, libmpfr-dev Standards-Version: 4.1.5 -Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-calculator -Vcs-Git: https://salsa.debian.org/gnome-team/gnome-calculator.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-calculator +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-calculator.git +Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-calculator +Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-calculator Homepage: https://wiki.gnome.org/Apps/Calculator Rules-Requires-Root: no diff --git a/debian/control.in b/debian/control.in index eb08134..bce57c6 100644 --- a/debian/control.in +++ b/debian/control.in @@ -18,8 +18,10 @@ Build-Depends: appstream-util, libmpc-dev, libmpfr-dev Standards-Version: 4.1.5 -Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-calculator -Vcs-Git: https://salsa.debian.org/gnome-team/gnome-calculator.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-calculator +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-calculator.git +Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-calculator +Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-calculator Homepage: https://wiki.gnome.org/Apps/Calculator Rules-Requires-Root: no -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-calculator/+git/gnome-calculator/+merge/354328 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-xubuntu-cancel-search into
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1756826 in nautilus (Ubuntu): "hangs when remote search provider
performs expensive operation"
https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1756826
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/354346
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-xubuntu-cancel-search into
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 62b7833..312bb43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nautilus (1:3.26.4-0~ubuntu18.04.2) UNRELEASED; urgency=medium
+
+ * d/p/ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch:
+shell-search-provider: implement XUbuntuCancel to request pending
+search cancellation from gnome-shell (LP: #1756826)
+
+ -- Marco Trevisan (Treviño) Wed, 05 Sep 2018 18:03:14 +0200
+
nautilus (1:3.26.4-0~ubuntu18.04.1) bionic; urgency=medium
* New upstream release: 3.26.4 (LP: #1782681, LP: #1765776)
diff --git a/debian/patches/series b/debian/patches/series
index 41a35d1..61d3d3a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,4 @@ query-add-recursive-flags-and-use-it-in-search-engines.patch
appstream-compulsory.patch
nautilusgtkplacesview-show-error-if-volume-is-not-mo.patch
file-view-Always-unset-pending_selection-after-freeing-it.patch
+ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch
diff --git a/debian/patches/ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch b/debian/patches/ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch
new file mode 100644
index 000..ca55544
--- /dev/null
+++ b/debian/patches/ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch
@@ -0,0 +1,212 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Tue, 28 Aug 2018 01:44:49 +0200
+Subject: shell-search-provider: implement XUbuntuCancel to request search cancellation
+
+Stop search and Metadata fetching on XUbuntuCancel dbus method call.
+Only allow this if the caller is the same who triggered the actual event.
+
+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/183
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/bionic/+source/nautilus/+bug/1756826
+Forwarded: not-needed
+---
+ data/shell-search-provider-dbus-interfaces.xml | 1 +
+ src/nautilus-shell-search-provider.c | 96 +++---
+ 2 files changed, 88 insertions(+), 9 deletions(-)
+
+diff --git a/data/shell-search-provider-dbus-interfaces.xml b/data/shell-search-provider-dbus-interfaces.xml
+index f6840e2..4529c1e 100644
+--- a/data/shell-search-provider-dbus-interfaces.xml
b/data/shell-search-provider-dbus-interfaces.xml
+@@ -40,5 +40,6 @@
+
+
+
++
+
+
+diff --git a/src/nautilus-shell-search-provider.c b/src/nautilus-shell-search-provider.c
+index ffc2b7f..58864d6 100644
+--- a/src/nautilus-shell-search-provider.c
b/src/nautilus-shell-search-provider.c
+@@ -60,6 +60,7 @@ struct _NautilusShellSearchProvider
+
+ PendingSearch *current_search;
+
++GList *metas_requests;
+ GHashTable *metas_cache;
+ };
+
+@@ -143,11 +144,25 @@ pending_search_finish (PendingSearch *search,
+ }
+
+ static void
+-cancel_current_search (NautilusShellSearchProvider *self)
++cancel_current_search (NautilusShellSearchProvider *self,
++ gboolean ignore_partial_results)
+ {
+-if (self->current_search != NULL)
++PendingSearch *search = self->current_search;
++
++if (search != NULL)
+ {
+-nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (self->current_search->engine));
++g_debug ("*** Cancel current search");
++
++nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (search->engine));
++
++if (ignore_partial_results)
++{
++g_signal_handlers_disconnect_by_data (G_OBJECT (search->engine),
++ search);
++
++pending_search_finish (search, search->invocation,
++ g_variant_new ("(as)", NULL));
++}
+ }
+ }
+
+@@ -451,7 +466,7 @@ execute_search (NautilusShellSearchProvider *self,
+ NautilusQuery *query;
+ PendingSearch *pending_search;
+
+-cancel_current_search (self);
++cancel_current_search (self, FALSE);
+
+ /* don't attempt searches for a single character */
+ if (g_strv_length (terms) == 1 &&
+@@ -524,6 +539,7 @@ typedef struct
+ NautilusShellSearchProvider *self;
+
+ gint64 start_time;
++
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
The proposal to merge ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/354321 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
Review: Approve Same code than in cosmic, +1 -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/354321 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-xubuntu-cancel-search into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1756826 in nautilus (Ubuntu): "hangs when remote search provider
performs expensive operation"
https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1756826
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/354321
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-xubuntu-cancel-search into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 3df98cd..610ea63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gnome-shell (3.28.3-0ubuntu0.18.04.3) UNRELEASED; urgency=medium
+
+ * d/p/search-Cancel-search-provider-operations-on-clear.patch,
+d/p/search-Ignore-search-provider-results-metas-if-search-is-.patch,
+d/p/viewSelector-Cancel-search-on-overview-hidden.patch,
+d/p/ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch:
+- Add support for cancelling remote search providers when the overlay
+ is closed (and actually stop searches when requested from UI, LP: #1756826)
+
+ -- Marco Trevisan (Treviño) Wed, 05 Sep 2018 14:31:58 +0200
+
gnome-shell (3.28.3-0ubuntu0.18.04.2) bionic; urgency=medium
* New upstream release (LP: #1718931, LP: #1782614)
diff --git a/debian/patches/search-Cancel-search-provider-operations-on-clear.patch b/debian/patches/search-Cancel-search-provider-operations-on-clear.patch
new file mode 100644
index 000..052ee8a
--- /dev/null
+++ b/debian/patches/search-Cancel-search-provider-operations-on-clear.patch
@@ -0,0 +1,29 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Thu, 23 Aug 2018 18:14:38 +0200
+Subject: search: Cancel search provider operations on clear
+
+Ensure that the search provider operations (just getResultMetas requests in the
+current implementation) in progress are properly cancelled when we clear the UI,
+otherwise returned results might still be added when not needed.
+
+This is triggered for each provider by the SearchResults reset.
+
+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/183
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/bionic/+source/gnome-shell/+bug/1756826
+Forwarded: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/205
+---
+ js/ui/search.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/js/ui/search.js b/js/ui/search.js
+index 1fb54b4..804be95 100644
+--- a/js/ui/search.js
b/js/ui/search.js
+@@ -192,6 +192,7 @@ var SearchResultsBase = new Lang.Class({
+ },
+
+ clear() {
++this._cancellable.cancel();
+ for (let resultId in this._resultDisplays)
+ this._resultDisplays[resultId].actor.destroy();
+ this._resultDisplays = {};
diff --git a/debian/patches/search-Ignore-search-provider-results-metas-if-search-is-.patch b/debian/patches/search-Ignore-search-provider-results-metas-if-search-is-.patch
new file mode 100644
index 000..27645a5
--- /dev/null
+++ b/debian/patches/search-Ignore-search-provider-results-metas-if-search-is-.patch
@@ -0,0 +1,30 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Thu, 30 Aug 2018 07:11:24 +0200
+Subject: search: Ignore search provider results metas if search is cancelled
+
+Call updateSearch callback with no results when the search provider has been
+cancelled, without doing any logging.
+
+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/183
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/bionic/+source/gnome-shell/+bug/1756826
+Forwarded: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/205
+---
+ js/ui/search.js | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/js/ui/search.js b/js/ui/search.js
+index 804be95..dd4bfad 100644
+--- a/js/ui/search.js
b/js/ui/search.js
+@@ -227,8 +227,9 @@ var SearchResultsBase = new Lang.Class({
+
+ this.provider.getResultMetas(metasNeeded, metas => {
+ if (metas.length != metasNeeded.length) {
+-log('Wrong number of result metas returned by search provider ' + this.provider.id +
+-': expected ' + metasNeeded.length + ' but got ' + metas.length);
++if (!this._cancellable.is_cancelled())
++log(`Wrong number of result metas returned by search provider ${this.provider.id}` +
++`: expected ${metasNeeded.length} but got ${metas.length}`);
+ callback(false);
+ return;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 3e0fd79..ad2c4be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master
Review: Approve LGTM -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-calculator/+git/gnome-calculator/+merge/354328 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
