Hello community,
here is the log from the commit of package xfce4-panel-plugin-weather for
openSUSE:Factory checked in at 2014-06-25 21:20:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-panel-plugin-weather (Old)
and /work/SRC/openSUSE:Factory/.xfce4-panel-plugin-weather.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-panel-plugin-weather"
Changes:
--------
---
/work/SRC/openSUSE:Factory/xfce4-panel-plugin-weather/xfce4-panel-plugin-weather.changes
2013-02-19 13:41:24.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.xfce4-panel-plugin-weather.new/xfce4-panel-plugin-weather.changes
2014-06-25 21:20:39.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Jun 10 06:35:29 UTC 2014 - g...@opensuse.org
+
+- Add xfce4-panel-plugin-weather-upower-0.99.patch in order to
+ support upower >= 0.99 (backported from upstream git, bxo#10922)
+
+-------------------------------------------------------------------
New:
----
xfce4-panel-plugin-weather-upower-0.99.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-panel-plugin-weather.spec ++++++
--- /var/tmp/diff_new_pack.cTaDxG/_old 2014-06-25 21:20:40.000000000 +0200
+++ /var/tmp/diff_new_pack.cTaDxG/_new 2014-06-25 21:20:40.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xfce4-panel-plugin-weather
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,6 +29,8 @@
Source0:
http://archive.xfce.org/src/panel-plugins/%{plugin_name}/0.8/%{plugin_name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM
xfce4-panel-plugin-weather-fix-no-return-in-nonvoid-function.patch
g...@opensuse.org -- Return bogus value in case of an unhandled switch case
Patch0:
xfce4-panel-plugin-weather-fix-no-return-in-nonvoid-function.patch
+# PATCH-FIX-UPSTREAM xfce4-panel-plugin-weather-upower-0.99.patch bxo#10922
g...@opensuse.org -- Support upower-0.99 (backported from upstream git)
+Patch1: xfce4-panel-plugin-weather-upower-0.99.patch
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: pkgconfig(gthread-2.0)
@@ -53,6 +55,7 @@
%prep
%setup -q -n %{plugin_name}-%{version}
%patch0 -p1
+%patch1 -p1
%build
%configure --disable-static
++++++ xfce4-panel-plugin-weather-upower-0.99.patch ++++++
>From d51c1ea939ffeecac6f9f5cd136d35628b585e73 Mon Sep 17 00:00:00 2001
From: Eric Koegel <e...@xfce.org>
Date: Tue, 3 Jun 2014 20:44:16 +0200
Subject: Support upower-0.99 (bug #10922).
upower-0.99 changed from the "changed" signal to "notify" as well as
the function signature. This patch adds that while still supporting
the previous versions of upower.
Index: xfce4-weather-plugin-0.8.3/panel-plugin/weather.c
===================================================================
--- xfce4-weather-plugin-0.8.3.orig/panel-plugin/weather.c
+++ xfce4-weather-plugin-0.8.3/panel-plugin/weather.c
@@ -1484,8 +1484,14 @@ mi_click(GtkWidget *widget,
#ifdef HAVE_UPOWER_GLIB
static void
+#if UP_CHECK_VERSION(0, 99, 0)
upower_changed_cb(UpClient *client,
+ GParamSpec *pspec,
plugin_data *data)
+#else /* UP_CHECK_VERSION < 0.99 */
+upower_changed_cb(UpClient *client,
+ plugin_data *data)
+#endif /* UP_CHECK_VERSION */
{
gboolean on_battery, lid_closed;
@@ -1512,7 +1518,7 @@ upower_changed_cb(UpClient *client,
schedule_next_wakeup(data);
}
}
-#endif
+#endif /* HAVE_UPOWER_GLIB */
static void
@@ -2090,10 +2096,16 @@ weather_construct(XfcePanelPlugin *plugi
G_CALLBACK(xfceweather_show_about), data);
#ifdef HAVE_UPOWER_GLIB
- if (data->upower)
- g_signal_connect(data->upower, "changed",
- G_CALLBACK(upower_changed_cb), data);
-#endif
+ if (data->upower) {
+#if UP_CHECK_VERSION(0, 99, 0)
+ g_signal_connect (data->upower, "notify",
+ G_CALLBACK(upower_changed_cb), data);
+#else /* UP_CHECK_VERSION < 0.99 */
+ g_signal_connect (data->upower, "changed",
+ G_CALLBACK(upower_changed_cb), data);
+#endif /* UP_CHECK_VERSION */
+ }
+#endif /* HAVE_UPOWER_GLIB */
/* call update handler updates */
update_handler(data);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
