[Pkg-xfce-commits] r8504 - in /goodies/trunk/xfce4-systemload-plugin/debian: changelog control patches/git_upower_0.99.patch patches/series

[Jackson Doak]

Author: noskcaj-guest
Date: Tue Jul 15 21:09:54 2014
New Revision: 8504

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

Added:
    goodies/trunk/xfce4-systemload-plugin/debian/patches/git_upower_0.99.patch
    goodies/trunk/xfce4-systemload-plugin/debian/patches/series
Modified:
    goodies/trunk/xfce4-systemload-plugin/debian/changelog
    goodies/trunk/xfce4-systemload-plugin/debian/control

Modified: goodies/trunk/xfce4-systemload-plugin/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-systemload-plugin/debian/changelog?rev=8504&op=diff
==============================================================================
--- goodies/trunk/xfce4-systemload-plugin/debian/changelog	(original)
+++ goodies/trunk/xfce4-systemload-plugin/debian/changelog	Tue Jul 15 21:09:54 2014
@@ -1,8 +1,14 @@
 xfce4-systemload-plugin (1.1.1-3) 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                                         closes: #752430
+    - Add 01_upower-0.99.patch
+    - Bump upower depend to >= 0.99
+
+ -- Jackson Doak <noskcaj at ubuntu.com>  Wed, 16 Jul 2014 07:06:52 +1000
 
 xfce4-systemload-plugin (1.1.1-2) unstable; urgency=low
 

Modified: goodies/trunk/xfce4-systemload-plugin/debian/control
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-systemload-plugin/debian/control?rev=8504&op=diff
==============================================================================
--- goodies/trunk/xfce4-systemload-plugin/debian/control	(original)
+++ goodies/trunk/xfce4-systemload-plugin/debian/control	Tue Jul 15 21:09:54 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/
@@ -16,7 +16,7 @@
 Section: xfce
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: upower
+Recommends: upower (>= 0.99)
 Description: system load monitor plugin for the Xfce4 panel
  This plugins displays the current CPU load, the memory in use, the swap space
  and the system uptime in the Xfce4 panel.

Added: goodies/trunk/xfce4-systemload-plugin/debian/patches/git_upower_0.99.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-systemload-plugin/debian/patches/git_upower_0.99.patch?rev=8504&op=file
==============================================================================
--- goodies/trunk/xfce4-systemload-plugin/debian/patches/git_upower_0.99.patch	(added)
+++ goodies/trunk/xfce4-systemload-plugin/debian/patches/git_upower_0.99.patch	Tue Jul 15 21:09:54 2014
@@ -0,0 +1,49 @@
+From abdcb383f380bf7a048cf512fa079581321b64fa 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: 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.
+
+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);
+ 
+-- 
+cgit v0.10.1

Added: goodies/trunk/xfce4-systemload-plugin/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-systemload-plugin/debian/patches/series?rev=8504&op=file
==============================================================================
--- goodies/trunk/xfce4-systemload-plugin/debian/patches/series	(added)
+++ goodies/trunk/xfce4-systemload-plugin/debian/patches/series	Tue Jul 15 21:09:54 2014
@@ -0,0 +1 @@
+git_upower_0.99.patch