diff --git a/gnome-weather-40.0.tar.xz b/gnome-weather-40.0.tar.xz deleted file mode 100644 index 2c3b632..0000000 --- a/gnome-weather-40.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a35a73ab2408762181d8650b037205c17ef7bcb8dff3cf0b34af1a2de66aeef -size 938732 diff --git a/gnome-weather-40.1.tar.xz b/gnome-weather-40.1.tar.xz new file mode 100644 index 0000000..84e14c3 --- /dev/null +++ b/gnome-weather-40.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d11144c4797c46d2068c3ddf5ce2bc030fca0f272cf03f218c4f46da3b73c4d +size 941636 diff --git a/gnome-weather-fix-forever-loading.patch b/gnome-weather-fix-forever-loading.patch deleted file mode 100644 index 6a3bfad..0000000 --- a/gnome-weather-fix-forever-loading.patch +++ /dev/null @@ -1,27 +0,0 @@ -From de6fd1a88d3f4004555738f5083d98700b4c3f0d Mon Sep 17 00:00:00 2001 -From: AsciiWolf -Date: Thu, 17 Jun 2021 13:28:16 +0200 -Subject: [PATCH] Workaround serialization without icao libgweather issue - -This workarounds libgweather#84 ---- - src/app/city.js | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/app/city.js b/src/app/city.js -index 7e9fa74..3777103 100644 ---- a/src/app/city.js -+++ b/src/app/city.js -@@ -235,7 +235,8 @@ var WeatherWidget = GObject.registerClass({ - this._apparentLabel.label = _('Feels like %.0f°').format(apparentValue); - - let forecasts = info.get_forecast_list(); -- let tz = GLib.TimeZone.new(info.location.get_timezone().get_tzid()); -+ let coords = info.location.get_coords(); -+ let tz = GLib.TimeZone.new(GWeather.Location.get_world().find_nearest_city(coords[0], coords[1]).get_timezone().get_tzid()); - for (let t of ['hourly', 'daily']) - this._forecasts[t].update(forecasts, tz); - --- -GitLab - diff --git a/gnome-weather-welcome-screen-when-saved-locations.patch b/gnome-weather-welcome-screen-when-saved-locations.patch deleted file mode 100644 index 43dddc2..0000000 --- a/gnome-weather-welcome-screen-when-saved-locations.patch +++ /dev/null @@ -1,90 +0,0 @@ -From b8d6fcd0c9566af9ce60d890670598bccc6d57c6 Mon Sep 17 00:00:00 2001 -From: Jessica Tallon -Date: Sun, 11 Apr 2021 11:14:37 +0200 -Subject: [PATCH] Fix problem where weather never used saved locations - -Everytime you opened the weather application it would always show -the initial welcome/search screen even though it was loading the -previously saved locations. This changes that so they are now used. ---- - src/app/main.js | 3 ++- - src/app/world.js | 13 +++++++------ - src/shared/world.js | 1 + - 3 files changed, 10 insertions(+), 7 deletions(-) - -diff --git a/src/app/main.js b/src/app/main.js -index b413ca9..8292215 100644 ---- a/src/app/main.js -+++ b/src/app/main.js -@@ -96,8 +96,9 @@ const Application = GObject.registerClass( - - this.world = GWeather.Location.get_world(); - this.model = new World.WorldModel(this.world, true); -- this.model.load(); - this.currentLocationController = new CurrentLocationController.CurrentLocationController(this.model); -+ this.model.load(); -+ - - this.model.connect('notify::loading', () => { - if (this.model.loading) -diff --git a/src/app/world.js b/src/app/world.js -index 8e1d5ce..1815629 100644 ---- a/src/app/world.js -+++ b/src/app/world.js -@@ -67,18 +67,18 @@ var WorldContentView = GObject.registerClass( - - let autoLocStack = builder.get_object('auto-location-stack'); - let autoLocSwitch = builder.get_object('auto-location-switch'); -- let currentLocationController = application.currentLocationController; -+ this._currentLocationController = application.currentLocationController; - -- if(currentLocationController.autoLocation == CurrentLocationController.AutoLocation.ENABLED) { -+ if(this._currentLocationController.autoLocation == CurrentLocationController.AutoLocation.ENABLED) { - autoLocStack.visible_child_name = 'locating-label'; - } else { - autoLocStack.visible_child_name = 'auto-location-switch-grid'; - autoLocSwitch.active = false; -- autoLocSwitch.sensitive = (currentLocationController.autoLocation != CurrentLocationController.AutoLocation.NOT_AVAILABLE); -+ autoLocSwitch.sensitive = (this._currentLocationController.autoLocation != CurrentLocationController.AutoLocation.NOT_AVAILABLE); - } - - let handlerId = autoLocSwitch.connect('notify::active', () => { -- currentLocationController.setAutoLocation(autoLocSwitch.active); -+ this._currentLocationController.setAutoLocation(autoLocSwitch.active); - - if (autoLocSwitch.active && !this.model.addedCurrentLocation) - autoLocStack.visible_child_name = 'locating-label'; -@@ -95,8 +95,8 @@ var WorldContentView = GObject.registerClass( - this.model.connect('current-location-changed', (model, info) => { - autoLocStack.visible_child_name = 'auto-location-switch-grid'; - GObject.signal_handler_block(autoLocSwitch, handlerId); -- autoLocSwitch.active = (currentLocationController.autoLocation == CurrentLocationController.AutoLocation.ENABLED); -- autoLocSwitch.sensitive = (currentLocationController.autoLocation != CurrentLocationController.AutoLocation.NOT_AVAILABLE); -+ autoLocSwitch.active = (this._currentLocationController.autoLocation == CurrentLocationController.AutoLocation.ENABLED); -+ autoLocSwitch.sensitive = (this._currentLocationController.autoLocation != CurrentLocationController.AutoLocation.NOT_AVAILABLE); - GObject.signal_handler_unblock(autoLocSwitch, handlerId); - - this._window.showInfo(info, true); -@@ -216,6 +216,7 @@ var WorldContentView = GObject.registerClass( - }); - - this._syncStackPopover(); -+ this._currentLocationController.currentLocation = info - } - - _onLocationRemoved(model, info) { -diff --git a/src/shared/world.js b/src/shared/world.js -index 6bc681d..081edf0 100644 ---- a/src/shared/world.js -+++ b/src/shared/world.js -@@ -107,6 +107,7 @@ var WorldModel = GObject.registerClass({ - - info = this._addLocationInternal(location, false); - } -+ this._currentLocationInfo = info - } - - _updateLoadingCount(delta) { --- -GitLab - diff --git a/gnome-weather-wrong-min-temperature.patch b/gnome-weather-wrong-min-temperature.patch deleted file mode 100644 index c1e9e2a..0000000 --- a/gnome-weather-wrong-min-temperature.patch +++ /dev/null @@ -1,31 +0,0 @@ -From be346ed14d158386f72e97c30ec91b82f6362270 Mon Sep 17 00:00:00 2001 -From: Eric -Date: Fri, 11 Jun 2021 21:00:38 -0400 -Subject: [PATCH] dailyForecast.js: fix low temperature - -As described in #190, an apparent typo currently causes the low temperatures -in the daily forecast view to be incorrect (not actually the lowest temperature for the period). - -This MR corrects the updating of minTemp, fixing the low temperature. - -Closes #190 ---- - src/app/dailyForecast.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/app/dailyForecast.js b/src/app/dailyForecast.js -index 0bd94d5..b5d87e5 100644 ---- a/src/app/dailyForecast.js -+++ b/src/app/dailyForecast.js -@@ -130,7 +130,7 @@ var DailyForecastBox = GObject.registerClass(class DailyForecastBox extends Gtk. - } - if (temp < minTemp) { - minInfo = info; -- minTemp = minTemp; -+ minTemp = temp; - } - - let datetime = Util.getDateTime(info); --- -GitLab - diff --git a/gnome-weather.changes b/gnome-weather.changes index b85041b..2bcecba 100644 --- a/gnome-weather.changes +++ b/gnome-weather.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Aug 18 17:58:49 UTC 2021 - Bjørn Lie + +- Update to version 40.1: + + Add corner radius to forecast chart. + + Increase contrast when using dark themes. + + Bugs fixed: glgo#GNOME/gnome-weather#146, + glgo#GNOME/gnome-weather#168, glgo#GNOME/gnome-weather#190, + glgo#GNOME/gnome-weather!82, glgo#GNOME/gnome-weather#169. + + Updated translations. +- Drop patches fixed upstream: + + gnome-weather-wrong-min-temperature.patch + + gnome-weather-welcome-screen-when-saved-locations.patch + + gnome-weather-fix-forever-loading.patch + ------------------------------------------------------------------- Sat Jul 24 20:54:54 UTC 2021 - Atri Bhattacharya diff --git a/gnome-weather.spec b/gnome-weather.spec index 69284c4..1684c4e 100644 --- a/gnome-weather.spec +++ b/gnome-weather.spec @@ -18,19 +18,14 @@ %define _name org.gnome.Weather Name: gnome-weather -Version: 40.0 +Version: 40.1 Release: 0 Summary: Weather App for GNOME License: GPL-2.0-or-later Group: Productivity/Other URL: https://live.gnome.org/Design/Apps/Weather Source0: https://download.gnome.org/sources/gnome-weather/40/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM gnome-weather-wrong-min-temperature.patch glgo#GNOME/gnome-weather#190 badshah400@gmail.com -- Fix daily forecast showing incorrect daily low temperature -Patch0: gnome-weather-wrong-min-temperature.patch -# PATCH-FIX-UPSTREAM gnome-weather-fix-forever-loading.patch glgo#GNOME/gnome-weather#127 badshah400@gmail.com -- Fix loading forever with error message "TypeError: location.get_timezone(...) is null" when automatic location is turned off -Patch1: gnome-weather-fix-forever-loading.patch -# PATCH-FIX-UPSTREAM gnome-weather-welcome-screen-when-saved-locations.patch glgo#GNOME/gnome-weather#169 badshah400@gmail.com -- Do not show the initial welcome/search screen when loading the previously saved locations -Patch2: gnome-weather-welcome-screen-when-saved-locations.patch + BuildRequires: intltool >= 0.26 BuildRequires: meson BuildRequires: pkgconfig