[Pkg-xfce-commits] r8448 - in /goodies/branches/experimental/xfce4-systemload-plugin/debian: changelog control patches/01_upower-0.99.patch patches/series

[Jackson Doak]

Author: noskcaj-guest
Date: Thu Jun  5 09:33:38 2014
New Revision: 8448

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8448
Log:
* Support upower 0.99
  - Add 01_upower-0.99.patch
  - Bump upower depend to >= 0.99

Added:
    goodies/branches/experimental/xfce4-systemload-plugin/debian/patches/01_upower-0.99.patch
    goodies/branches/experimental/xfce4-systemload-plugin/debian/patches/series
Modified:
    goodies/branches/experimental/xfce4-systemload-plugin/debian/changelog
    goodies/branches/experimental/xfce4-systemload-plugin/debian/control

Modified: goodies/branches/experimental/xfce4-systemload-plugin/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/branches/experimental/xfce4-systemload-plugin/debian/changelog?rev=8448&op=diff
==============================================================================
--- goodies/branches/experimental/xfce4-systemload-plugin/debian/changelog	(original)
+++ goodies/branches/experimental/xfce4-systemload-plugin/debian/changelog	Thu Jun  5 09:33:38 2014
@@ -1,8 +1,14 @@
-xfce4-systemload-plugin (1.1.1-3) UNRELEASED; urgency=low
+xfce4-systemload-plugin (1.1.1-4) UNRELEASED; urgency=low
 
+  [ Evgeni Golov ]
   * Correct Vcs-* URLs to point to anonscm.debian.org
 
- -- Evgeni Golov <evgeni at debian.org>  Mon, 15 Jul 2013 21:57:43 +0200
+  [ Jackson Doak ]
+  * Support upower 0.99
+    - Add 01_upower-0.99.patch
+    - Bump upower depend to >= 0.99
+
+ -- Jackson Doak <noskcaj at ubuntu.com>  Thu, 05 Jun 2014 19:32:27 +1000
 
 xfce4-systemload-plugin (1.1.1-2) unstable; urgency=low
 

Modified: goodies/branches/experimental/xfce4-systemload-plugin/debian/control
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/branches/experimental/xfce4-systemload-plugin/debian/control?rev=8448&op=diff
==============================================================================
--- goodies/branches/experimental/xfce4-systemload-plugin/debian/control	(original)
+++ goodies/branches/experimental/xfce4-systemload-plugin/debian/control	Thu Jun  5 09:33:38 2014
@@ -6,7 +6,7 @@
  Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: autotools-dev, debhelper (>= 9), dpkg-dev (>= 1.16.1),
  xfce4-panel-dev (>= 4.8.0), libxml2-dev, libxml-parser-perl, libxfce4ui-1-dev,
- intltool, libupower-glib-dev
+ intltool, libupower-glib-dev (>= 0.99)
 Standards-Version: 3.9.3
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/xfce4-systemload-plugin/

Added: goodies/branches/experimental/xfce4-systemload-plugin/debian/patches/01_upower-0.99.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/branches/experimental/xfce4-systemload-plugin/debian/patches/01_upower-0.99.patch?rev=8448&op=file
==============================================================================
--- goodies/branches/experimental/xfce4-systemload-plugin/debian/patches/01_upower-0.99.patch	(added)
+++ goodies/branches/experimental/xfce4-systemload-plugin/debian/patches/01_upower-0.99.patch	Thu Jun  5 09:33:38 2014
@@ -0,0 +1,52 @@
+From 1bc7f32ea8244575124420bd34d52913831a1ae1 Mon Sep 17 00:00:00 2001
+From: Eric Koegel <eric.koegel at gmail.com>
+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

Added: goodies/branches/experimental/xfce4-systemload-plugin/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/branches/experimental/xfce4-systemload-plugin/debian/patches/series?rev=8448&op=file
==============================================================================
--- goodies/branches/experimental/xfce4-systemload-plugin/debian/patches/series	(added)
+++ goodies/branches/experimental/xfce4-systemload-plugin/debian/patches/series	Thu Jun  5 09:33:38 2014
@@ -0,0 +1 @@
+01_upower-0.99.patch