From a4d21a72c7d0bafc5734755c717899f87be3f708 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 12 Dec 2017 02:54:56 +0000 Subject: [PATCH] Adapt to the libgweather API changes The deprecated GweatherForecastType enumeration was dropped from the API, and gweather_info_new() lost the forecast type parameter. This requires bumping up the minimum version of libgweather we require to build Calendar. Ideally, we could do a version check and an ifdef dance to keep Calendar building with the previous versions of libgweather, but since we were requiring version 3.24 I don't think it's worth it. --- meson.build | 2 +- src/gcal-weather-service.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index b3ed0d7e..4c9e5224 100644 --- a/meson.build +++ b/meson.build @@ -176,7 +176,7 @@ glib_dep = dependency('glib-2.0', version: '>= 2.43.4') gtk_dep = dependency('gtk+-3.0', version: '>= 3.22.20') gio_dep = dependency('gio-2.0', version: '>= 2.43.4') goa_dep = dependency('goa-1.0', version: '>= 3.2.0') -gweather_dep = dependency('gweather-3.0', version: '>= 3.24.0') +gweather_dep = dependency('gweather-3.0', version: '>= 3.27.2') geoclue_dep = dependency('libgeoclue-2.0', version: '>=2.4') geocode_dep = dependency('geocode-glib-1.0', version: '>=3.23') m_dep = cc.find_library('m') diff --git a/src/gcal-weather-service.c b/src/gcal-weather-service.c index 28429f3e..0df55c32 100644 --- a/src/gcal-weather-service.c +++ b/src/gcal-weather-service.c @@ -513,7 +513,7 @@ update_location (GcalWeatherService *self, g_debug ("Got new weather service location: '%s'", (location == NULL)? "" : gweather_location_get_name (location)); - self->gweather_info = gweather_info_new (location, GWEATHER_FORECAST_ZONE | GWEATHER_FORECAST_LIST); + self->gweather_info = gweather_info_new (location); /* NOTE: We do not get detailed infos for GWEATHER_PROVIDER_ALL. * This combination works fine, though. We should open a bug / investigate