r3325 - in /unstable/evolution-data-server/debian: changelog patches/gweather-3-27.patch patches/series

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Sun Mar 11 15:46:46 2018
New Revision: 3325

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=3325
Log:
Cherry-pick gweather-3-27.patch to build against latest libgweather

Added:
    unstable/evolution-data-server/debian/patches/gweather-3-27.patch
Modified:
    unstable/evolution-data-server/debian/changelog
    unstable/evolution-data-server/debian/patches/series

Modified: unstable/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/changelog?rev=3325&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog	(original)
+++ unstable/evolution-data-server/debian/changelog	Sun Mar 11 15:46:46 2018
@@ -1,3 +1,9 @@
+evolution-data-server (3.26.5-2) UNRELEASED; urgency=medium
+
+  * Cherry-pick gweather-3-27.patch to build against latest libgweather
+
+ -- Jeremy Bicha <jbicha at debian.org>  Sun, 11 Mar 2018 11:46:12 -0400
+
 evolution-data-server (3.26.5-1) unstable; urgency=medium
 
   * New upstream release

Added: unstable/evolution-data-server/debian/patches/gweather-3-27.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/gweather-3-27.patch?rev=3325&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/gweather-3-27.patch	(added)
+++ unstable/evolution-data-server/debian/patches/gweather-3-27.patch	Sun Mar 11 15:46:46 2018
@@ -0,0 +1,79 @@
+From d45a5b6261c8ec97b0fbde74d8c5212caff6ef2f Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Mon, 11 Dec 2017 10:33:25 +0100
+Subject: Bug 791327 - Adapt to gweather_info_new() API change
+
+---
+ CMakeLists.txt                                   | 13 +++++++++++++
+ config.h.in                                      |  3 +++
+ src/calendar/backends/weather/e-weather-source.c | 11 ++++++++---
+ 3 files changed, 24 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e6f396c..a9ec83f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -731,6 +731,19 @@ add_printable_option(ENABLE_WEATHER "Build the weather calendar backend" ON)
+ 
+ if(ENABLE_WEATHER)
+ 	pkg_check_modules_for_option(ENABLE_WEATHER "weather calendar backend" LIBGWEATHER gweather-3.0>=${gweather_minimum_version})
++
++	set(CMAKE_REQUIRED_INCLUDES ${LIBGWEATHER_INCLUDE_DIRS})
++	set(CMAKE_REQUIRED_LIBRARIES ${LIBGWEATHER_LDFLAGS})
++	CHECK_C_SOURCE_COMPILES("#define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
++				#include <libgweather/gweather.h>
++				#undef GWEATHER_I_KNOW_THIS_IS_UNSTABLE
++
++				int main(void) {
++					gweather_info_new (NULL);
++					return 0;
++				}" HAVE_ONE_ARG_GWEATHER_INFO_NEW)
++	unset(CMAKE_REQUIRED_INCLUDES)
++	unset(CMAKE_REQUIRED_LIBRARIES)
+ endif(ENABLE_WEATHER)
+ 
+ # ******************************
+diff --git a/config.h.in b/config.h.in
+index 6d4e506..7ebf216 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -190,3 +190,6 @@
+ 
+ /* Have libaccounts-glib */
+ #cmakedefine HAVE_UOA 1
++
++/* gweather_info_new() has only one argument */
++#cmakedefine HAVE_ONE_ARG_GWEATHER_INFO_NEW 1
+diff --git a/src/calendar/backends/weather/e-weather-source.c b/src/calendar/backends/weather/e-weather-source.c
+index 340aa6e..8aada01 100644
+--- a/src/calendar/backends/weather/e-weather-source.c
++++ b/src/calendar/backends/weather/e-weather-source.c
+@@ -17,10 +17,12 @@
+  * Authors: David Trowbridge <trowbrds at cs.colorado.edu>
+  */
+ 
+-#include "e-weather-source.h"
++#include "evolution-data-server-config.h"
+ 
+ #include <string.h>
+ 
++#include "e-weather-source.h"
++
+ #define E_WEATHER_SOURCE_GET_PRIVATE(obj) \
+ 	(G_TYPE_INSTANCE_GET_PRIVATE \
+ 	((obj), E_TYPE_WEATHER_SOURCE, EWeatherSourcePrivate))
+@@ -185,8 +187,11 @@ e_weather_source_parse (EWeatherSource *source,
+ 
+ 	if (source->priv->info == NULL) {
+ 		source->priv->info = gweather_info_new (
+-			source->priv->location,
+-			GWEATHER_FORECAST_LIST);
++			source->priv->location
++		#ifndef HAVE_ONE_ARG_GWEATHER_INFO_NEW
++			, GWEATHER_FORECAST_LIST
++		#endif
++		);
+ 		gweather_info_set_enabled_providers (source->priv->info, GWEATHER_PROVIDER_ALL);
+ 		g_signal_connect (
+ 			source->priv->info, "updated",
+

Modified: unstable/evolution-data-server/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/series?rev=3325&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/series	(original)
+++ unstable/evolution-data-server/debian/patches/series	Sun Mar 11 15:46:46 2018
@@ -1,2 +1,3 @@
 01-noinst-libedbus-private.patch
 ubuntu_gettext_domain.patch
+gweather-3-27.patch