commit: dbce85cd66bfde58d1afca30f67457631a4350f6 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Thu Aug 17 08:05:44 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Sep 2 22:51:23 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbce85cd
xfce-extra/xfce4-systemload-plugin: remove unused patch ...xfce4-systemload-plugin-1.1.1-upower-0.99.patch | 55 ---------------------- 1 file changed, 55 deletions(-) diff --git a/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-1.1.1-upower-0.99.patch b/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-1.1.1-upower-0.99.patch deleted file mode 100644 index 0aca3483f84..00000000000 --- a/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-1.1.1-upower-0.99.patch +++ /dev/null @@ -1,55 +0,0 @@ -http://bugzilla.xfce.org/show_bug.cgi?id=10923 - -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 -
