From cda6172bf78b9475159bc644bd3facb38e286399 Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Sat, 10 Mar 2018 21:48:03 +0200 Subject: [PATCH] Update to 3.28.0. Drop upstreamed patch --- .gitignore | 1 + ...Workaround-for-crashes-in-gweather_l.patch | 37 ------------------- gnome-clocks.spec | 13 +++---- sources | 2 +- 4 files changed, 8 insertions(+), 45 deletions(-) delete mode 100644 0001-search-provider-Workaround-for-crashes-in-gweather_l.patch diff --git a/.gitignore b/.gitignore index be59076..ca6ebf0 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ /gnome-clocks-3.26.0.tar.xz /gnome-clocks-3.26.1.tar.xz /gnome-clocks-3.27.1.tar.xz +/gnome-clocks-3.28.0.tar.xz diff --git a/0001-search-provider-Workaround-for-crashes-in-gweather_l.patch b/0001-search-provider-Workaround-for-crashes-in-gweather_l.patch deleted file mode 100644 index 4fcd563..0000000 --- a/0001-search-provider-Workaround-for-crashes-in-gweather_l.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 9754236..3518d2d 100644 --- a/gnome-clocks.spec +++ b/gnome-clocks.spec @@ -1,17 +1,13 @@ %global libgweather_version 3.27.2 Name: gnome-clocks -Version: 3.27.1 -Release: 4%{?dist} +Version: 3.28.0 +Release: 1%{?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 +Source0: https://download.gnome.org/sources/gnome-clocks/3.28/%{name}-%{version}.tar.xz BuildRequires: meson BuildRequires: desktop-file-utils @@ -64,6 +60,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.clocks.d %{_datadir}/metainfo/org.gnome.clocks.appdata.xml %changelog +* Sat Mar 10 2018 Yanko Kaneti - 3.28.0-1 +- Update to 3.28.0. Drop upstreamed patch + * Wed Feb 21 2018 Yanko Kaneti - 3.27.1-4 - Add workaround for frequent crashes in the shell search provider diff --git a/sources b/sources index 02d009e..28718e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-clocks-3.27.1.tar.xz) = 1cd6736f494722a34261f9b7a466f78d8cca07ef050bf1a33d21bbb68717504d61266fb335bfaea88cb2ccb91ec66d6c63da5511a41e41fd225afbc9deb8e47c +SHA512 (gnome-clocks-3.28.0.tar.xz) = dc3a0af7179fb111bd5dee6b99342996e9af9de73935216720e8567510eb9599d863cc6db3e4361c01d5316fdc2a6698e00040bf9dba4242fb7605f6ca268f3a