Hello community,
here is the log from the commit of package xfce4-panel-plugin-systemload for
openSUSE:Factory checked in at 2014-06-16 21:38:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-panel-plugin-systemload (Old)
and /work/SRC/openSUSE:Factory/.xfce4-panel-plugin-systemload.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-panel-plugin-systemload"
Changes:
--------
---
/work/SRC/openSUSE:Factory/xfce4-panel-plugin-systemload/xfce4-panel-plugin-systemload.changes
2013-06-05 19:39:26.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.xfce4-panel-plugin-systemload.new/xfce4-panel-plugin-systemload.changes
2014-06-16 21:38:40.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Jun 10 08:15:58 UTC 2014 - [email protected]
+
+- Add xfce4-panel-plugin-systemload-upower-0.99.patch in order to
+ support upower >= 0.99 (bxo#10923)
+
+-------------------------------------------------------------------
New:
----
xfce4-panel-plugin-systemload-upower-0.99.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-panel-plugin-systemload.spec ++++++
--- /var/tmp/diff_new_pack.nCpooe/_old 2014-06-16 21:38:41.000000000 +0200
+++ /var/tmp/diff_new_pack.nCpooe/_new 2014-06-16 21:38:41.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xfce4-panel-plugin-systemload
#
-# 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}/1.0/%{plugin_name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM xfce4-systemload-plugin-russian.patch
[email protected] -- fix Russian translation (plural forms and one string)
Patch0: xfce4-systemload-plugin-russian.patch
+# PATCH-FIX-UPSTREAM xfce4-panel-plugin-systemload-upower-0.99.patch bxo#10923
[email protected] -- Add support for upower >= 0.99
+Patch1: xfce4-panel-plugin-systemload-upower-0.99.patch
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: pkgconfig(gtk+-2.0)
@@ -49,6 +51,7 @@
%prep
%setup -q -n %{plugin_name}-%{version}
%patch0 -p1
+%patch1 -p1
%build
%configure --disable-static
++++++ xfce4-panel-plugin-systemload-upower-0.99.patch ++++++
>From 1bc7f32ea8244575124420bd34d52913831a1ae1 Mon Sep 17 00:00:00 2001
From: Eric Koegel <[email protected]>
Date: Fri, 30 May 2014 19:12:02 +0300
Subject: [PATCH] Update for Upower 0.99
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.
---
panel-plugin/systemload.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c
index c0572a3..30636e9 100644
--- a/panel-plugin/systemload.c
+++ b/panel-plugin/systemload.c
@@ -624,11 +624,15 @@ monitor_set_orientation (XfcePanelPlugin *plugin,
GtkOrientation orientation,
#ifdef HAVE_UPOWER_GLIB
static void
+#if UP_CHECK_VERSION(0, 99, 0)
+upower_changed_cb(UpClient *client, GParamSpec *pspec, t_global_monitor
*global)
+#else /* UP_CHECK_VERSION < 0.99 */
upower_changed_cb(UpClient *client, t_global_monitor *global)
+#endif /* UP_CHECK_VERSION */
{
setup_timer(global);
}
-#endif
+#endif /* HAVE_UPOWER_GLIB */
static void
entry_changed_cb(GtkEntry *entry, t_global_monitor *global)
@@ -925,10 +929,15 @@ systemload_construct (XfcePanelPlugin *plugin)
#ifdef HAVE_UPOWER_GLIB
if (global->upower) {
+#if UP_CHECK_VERSION(0, 99, 0)
+ g_signal_connect (global->upower, "notify",
+ G_CALLBACK(upower_changed_cb), global);
+#else /* UP_CHECK_VERSION < 0.99 */
g_signal_connect (global->upower, "changed",
G_CALLBACK(upower_changed_cb), global);
+#endif /* UP_CHECK_VERSION */
}
-#endif
+#endif /* HAVE_UPOWER_GLIB */
g_signal_connect (plugin, "free-data", G_CALLBACK (monitor_free), global);
--
1.9.3
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
