r40337 - in /desktop/unstable/gnome-panel/debian: changelog patches/git_build_with_gweather_39.patch patches/series

[mitya57-guest at users.alioth.debian.org]

Author: mitya57-guest
Date: Mon Dec  9 18:02:21 2013
New Revision: 40337

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40337
Log:
Backport upstream patch to fix building with gweather 3.9.2 or newer.

Added:
    desktop/unstable/gnome-panel/debian/patches/git_build_with_gweather_39.patch
Modified:
    desktop/unstable/gnome-panel/debian/changelog
    desktop/unstable/gnome-panel/debian/patches/series

Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=40337&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/changelog	[utf-8] Mon Dec  9 18:02:21 2013
@@ -1,6 +1,7 @@
 gnome-panel (3.8.0-2) UNRELEASED; urgency=low
 
   * Add apport hook (taken from Ubuntu).
+  * Backport upstream patch to fix building with gweather 3.9.2 or newer.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Fri, 22 Nov 2013 18:49:05 +0400
 

Added: desktop/unstable/gnome-panel/debian/patches/git_build_with_gweather_39.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/git_build_with_gweather_39.patch?rev=40337&op=file
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/git_build_with_gweather_39.patch	(added)
+++ desktop/unstable/gnome-panel/debian/patches/git_build_with_gweather_39.patch	[utf-8] Mon Dec  9 18:02:21 2013
@@ -0,0 +1,37 @@
+Description: fix building with gweather 3.9.2 or newer
+Origin: upstream, https://git.gnome.org/browse/gnome-panel/commit/?id=f9e8250e8c2368
+Last-Update: 2013-12-09
+
+--- a/applets/clock/clock-location.c
++++ b/applets/clock/clock-location.c
+@@ -541,10 +541,12 @@
+ 		priv->weather_timeout = 0;
+ 	}
+ 
+-	priv->weather_info =
+-		gweather_info_new_for_world (priv->world,
+-					     priv->loc,
+-					     GWEATHER_FORECAST_LIST);
++#ifdef HAVE_GWEATHER_3_9_2_OR_NEWER
++	priv->weather_info = gweather_info_new (priv->loc, GWEATHER_FORECAST_LIST);
++#else
++	priv->weather_info = gweather_info_new_for_world (priv->world, priv->loc, GWEATHER_FORECAST_LIST);
++#endif
++
+ 	g_signal_connect (priv->weather_info, "updated",
+ 			  G_CALLBACK (weather_info_updated), loc);
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -135,6 +135,11 @@
+ AC_SUBST(CLOCK_CFLAGS)
+ AC_SUBST(CLOCK_LIBS)
+ 
++PKG_CHECK_MODULES(GWEATHER, gweather-3.0 >= 3.9.2, HAVE_GWEATHER_3_9_2_OR_NEWER=yes, HAVE_GWEATHER_3_9_2_OR_NEWER=no)
++if test "x$HAVE_GWEATHER_3_9_2_OR_NEWER" = "xyes" ; then
++    AC_DEFINE(HAVE_GWEATHER_3_9_2_OR_NEWER, 1, [Defined if Gweather version is 3.9.2 or newer])
++fi
++
+ # Check whether to enable e-d-s support for clock applet
+ AC_MSG_CHECKING([whether to enable evolution-data-server support])
+ AC_ARG_ENABLE([eds],

Modified: desktop/unstable/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/series?rev=40337&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/series	[utf-8] Mon Dec  9 18:02:21 2013
@@ -1,3 +1,4 @@
+git_build_with_gweather_39.patch
 01_gnome-wm.patch
 01_menus_rename.patch
 03_tasklist_orientation.patch