Update to 3.28.0. Drop upstreamed patch

This commit is contained in:
Yanko Kaneti 2018-03-10 21:48:03 +02:00
parent 203cb1b7b1
commit cda6172bf7
4 changed files with 8 additions and 45 deletions

1
.gitignore vendored
View File

@ -49,3 +49,4 @@
/gnome-clocks-3.26.0.tar.xz /gnome-clocks-3.26.0.tar.xz
/gnome-clocks-3.26.1.tar.xz /gnome-clocks-3.26.1.tar.xz
/gnome-clocks-3.27.1.tar.xz /gnome-clocks-3.27.1.tar.xz
/gnome-clocks-3.28.0.tar.xz

View File

@ -1,37 +0,0 @@
From 0bf556d106758b6cebf1e5afa12f619eeb409556 Mon Sep 17 00:00:00 2001
From: Yanko Kaneti <yaneti@declera.com>
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

View File

@ -1,17 +1,13 @@
%global libgweather_version 3.27.2 %global libgweather_version 3.27.2
Name: gnome-clocks Name: gnome-clocks
Version: 3.27.1 Version: 3.28.0
Release: 4%{?dist} Release: 1%{?dist}
Summary: Clock application designed for GNOME 3 Summary: Clock application designed for GNOME 3
License: GPLv2+ License: GPLv2+
URL: https://wiki.gnome.org/Apps/Clocks URL: https://wiki.gnome.org/Apps/Clocks
Source0: https://download.gnome.org/sources/gnome-clocks/3.27/%{name}-%{version}.tar.xz Source0: https://download.gnome.org/sources/gnome-clocks/3.28/%{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: meson
BuildRequires: desktop-file-utils 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 %{_datadir}/metainfo/org.gnome.clocks.appdata.xml
%changelog %changelog
* Sat Mar 10 2018 Yanko Kaneti <yaneti@declera.com> - 3.28.0-1
- Update to 3.28.0. Drop upstreamed patch
* Wed Feb 21 2018 Yanko Kaneti <yaneti@declera.com> - 3.27.1-4 * Wed Feb 21 2018 Yanko Kaneti <yaneti@declera.com> - 3.27.1-4
- Add workaround for frequent crashes in the shell search provider - Add workaround for frequent crashes in the shell search provider

View File

@ -1 +1 @@
SHA512 (gnome-clocks-3.27.1.tar.xz) = 1cd6736f494722a34261f9b7a466f78d8cca07ef050bf1a33d21bbb68717504d61266fb335bfaea88cb2ccb91ec66d6c63da5511a41e41fd225afbc9deb8e47c SHA512 (gnome-clocks-3.28.0.tar.xz) = dc3a0af7179fb111bd5dee6b99342996e9af9de73935216720e8567510eb9599d863cc6db3e4361c01d5316fdc2a6698e00040bf9dba4242fb7605f6ca268f3a