From 203cb1b7b132238672295c15b3f37e010b16a566 Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Feb 21 2018 16:54:10 +0000 Subject: Add workaround for frequent crashes in the shell search provider --- diff --git a/0001-search-provider-Workaround-for-crashes-in-gweather_l.patch b/0001-search-provider-Workaround-for-crashes-in-gweather_l.patch new file mode 100644 index 0000000..4fcd563 --- /dev/null +++ b/0001-search-provider-Workaround-for-crashes-in-gweather_l.patch @@ -0,0 +1,37 @@ +From 0bf556d106758b6cebf1e5afa12f619eeb409556 Mon Sep 17 00:00:00 2001 +From: Yanko Kaneti +Date: Wed, 21 Feb 2018 18:30:48 +0200 +Subject: [PATCH] search-provider: Workaround for crashes in + gweather_location_serialize + +gweather_location_serialize is currenty not ready to serialize cities +without children weather stations eg: Warangal + +Skip those until we either get better serialization handling of those +in libgweather or we change how we produce the data for the search +provider interface + +https://bugzilla.redhat.com/show_bug.cgi?id=1546666 +--- + src/search-provider.vala | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/search-provider.vala b/src/search-provider.vala +index a6c44d3..f9d3d83 100644 +--- a/src/search-provider.vala ++++ b/src/search-provider.vala +@@ -94,6 +94,11 @@ public class SearchProvider : Object { + + string[] result = {}; + matches.foreach ((location) => { ++ // FIXME: Avoid cities without children locations ++ if (location.get_level () == GWeather.LocationLevel.CITY && ++ location.get_children().length == 0) { ++ return; ++ } + // HACK: the search provider interface does not currently allow variants as result IDs + result += serialize_location (location); + }); +-- +2.16.2 + diff --git a/gnome-clocks.spec b/gnome-clocks.spec index 45bdb57..9754236 100644 --- a/gnome-clocks.spec +++ b/gnome-clocks.spec @@ -2,13 +2,17 @@ Name: gnome-clocks Version: 3.27.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Clock application designed for GNOME 3 License: GPLv2+ URL: https://wiki.gnome.org/Apps/Clocks Source0: https://download.gnome.org/sources/gnome-clocks/3.27/%{name}-%{version}.tar.xz +# https://bugzilla.gnome.org/show_bug.cgi?id=793312 +# https://bugzilla.redhat.com/show_bug.cgi?id=1546666 +Patch0: 0001-search-provider-Workaround-for-crashes-in-gweather_l.patch + BuildRequires: meson BuildRequires: desktop-file-utils BuildRequires: gettext @@ -60,6 +64,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.clocks.d %{_datadir}/metainfo/org.gnome.clocks.appdata.xml %changelog +* Wed Feb 21 2018 Yanko Kaneti - 3.27.1-4 +- Add workaround for frequent crashes in the shell search provider + * Mon Feb 12 2018 Yanko Kaneti - 3.27.1-3 - Rebuild for gnome-desktop3 soname bump