1 |
commit: 05fb4525cdb22c4f8ad2c48fa08b380a6ba627ed |
2 |
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 26 02:02:39 2016 +0000 |
4 |
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 6 02:12:07 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05fb4525 |
7 |
|
8 |
mate-extra/mate-power-manager: Drop 1.8.x |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
|
12 |
mate-extra/mate-power-manager/Manifest | 1 - |
13 |
...anager-1.8.0-r1-avoid-levels-is-0-warning.patch | 15 - |
14 |
...bus_interface_keyboard_backlight_controls.patch | 160 --------- |
15 |
...-manager-1.8.0-r1-improve-UPower1-support.patch | 102 ------ |
16 |
...ound-of-fixes-for-UPower-0.99-API-changes.patch | 217 ------------ |
17 |
...-manager-1.8.0-r1-port-to-upower-0.99-API.patch | 390 --------------------- |
18 |
...ager-1.8.0-r1-remove-battery-recall-logic.patch | 263 -------------- |
19 |
.../mate-power-manager-1.8.1.ebuild | 92 ----- |
20 |
8 files changed, 1240 deletions(-) |
21 |
|
22 |
diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest |
23 |
index 339d420..16bf560 100644 |
24 |
--- a/mate-extra/mate-power-manager/Manifest |
25 |
+++ b/mate-extra/mate-power-manager/Manifest |
26 |
@@ -1,2 +1 @@ |
27 |
DIST mate-power-manager-1.10.2.tar.xz 3350616 SHA256 49eed514cb8507d3ae7699e701afb33a90002aa833bdc507f9ac0dd031ce04de SHA512 133745446536d21102ed318d2809209e46dcef7dd312219d9b716f7785cbcd5a47d477643e1c15dd6672d088640a583a63819b394dc96e4a3437affdbc389ae7 WHIRLPOOL c250220933ba0d13e7b7377072f5e503b33af5d2245812b6c562885310737039dbed34f23918be0f82332e2eb75533285d736c46a787be26403b6fac22039791 |
28 |
-DIST mate-power-manager-1.8.1.tar.xz 3341892 SHA256 6fa72d4e6a018a44144d06b68c8f67e067e3847ad83b4b8a8aaa0e2a8c9b6147 SHA512 1715d4f5515245d1fb4543dcce60b1f391ddf78bca50b28fd9097330ea42080873b0bf956a7510adc153679da239092035c62969e2f2afc4a635335ffcb714b7 WHIRLPOOL a6ef0581e13d0414b52f4efd3d9e60ca97a885639d3288ff00d1382d5b1bb6d9b04590ad92912a0123ea248f7d6f138dc680bc9d83087f99d4361d2ede10ec20 |
29 |
|
30 |
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-avoid-levels-is-0-warning.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-avoid-levels-is-0-warning.patch |
31 |
deleted file mode 100644 |
32 |
index 9bccb5c..0000000 |
33 |
--- a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-avoid-levels-is-0-warning.patch |
34 |
+++ /dev/null |
35 |
@@ -1,15 +0,0 @@ |
36 |
-diff --git a/src/gpm-kbd-backlight.c b/src/gpm-kbd-backlight.c |
37 |
-index 0ac6801..a439e94 100644 |
38 |
---- a/src/gpm-kbd-backlight.c |
39 |
-+++ b/src/gpm-kbd-backlight.c |
40 |
-@@ -113,6 +113,9 @@ gpm_kbd_backlight_set (GpmKbdBacklight *backlight, |
41 |
- guint goal; |
42 |
- |
43 |
- g_return_val_if_fail (GPM_IS_KBD_BACKLIGHT (backlight), FALSE); |
44 |
-+ /* avoid warnings if no keyboard brightness is available */ |
45 |
-+ if (backlight->priv->max_brightness < 1) |
46 |
-+ return FALSE; |
47 |
- /* if we're setting the same we are, don't bother */ |
48 |
- //g_return_val_if_fail (backlight->priv->brightness_percent != percentage, FALSE); |
49 |
- |
50 |
- |
51 |
|
52 |
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-dbus_interface_keyboard_backlight_controls.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-dbus_interface_keyboard_backlight_controls.patch |
53 |
deleted file mode 100644 |
54 |
index 689192f..0000000 |
55 |
--- a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-dbus_interface_keyboard_backlight_controls.patch |
56 |
+++ /dev/null |
57 |
@@ -1,160 +0,0 @@ |
58 |
-diff -uprN mate-power-manager-orig/src/gpm-common.h mate-power-manager/src/gpm-common.h |
59 |
---- mate-power-manager-orig/src/gpm-common.h 2013-10-03 13:56:55.000000000 +0200 |
60 |
-+++ mate-power-manager/src/gpm-common.h 2013-10-13 19:54:10.649901214 +0200 |
61 |
-@@ -33,6 +33,7 @@ G_BEGIN_DECLS |
62 |
- #define GPM_DBUS_SERVICE "org.mate.PowerManager" |
63 |
- #define GPM_DBUS_INTERFACE "org.mate.PowerManager" |
64 |
- #define GPM_DBUS_INTERFACE_BACKLIGHT "org.mate.PowerManager.Backlight" |
65 |
-+#define GPM_DBUS_INTERFACE_KBD_BACKLIGHT "org.mate.PowerManager.KbdBacklight" |
66 |
- #define GPM_DBUS_PATH "/org/mate/PowerManager" |
67 |
- #define GPM_DBUS_PATH_BACKLIGHT "/org/mate/PowerManager/Backlight" |
68 |
- #define GPM_DBUS_PATH_KBD_BACKLIGHT "/org/mate/PowerManager/KbdBacklight" |
69 |
-diff -uprN mate-power-manager-orig/src/gpm-kbd-backlight.c mate-power-manager/src/gpm-kbd-backlight.c |
70 |
---- mate-power-manager-orig/src/gpm-kbd-backlight.c 2013-10-03 13:56:55.000000000 +0200 |
71 |
-+++ mate-power-manager/src/gpm-kbd-backlight.c 2013-10-13 19:58:07.154258855 +0200 |
72 |
-@@ -31,21 +31,6 @@ |
73 |
- #include "gpm-kbd-backlight.h" |
74 |
- #include "gsd-media-keys-window.h" |
75 |
- |
76 |
--static const gchar *kbd_backlight_introspection = "" |
77 |
--"<?xml version=\"1.0\" encoding=\"UTF-8\"?>""<node name=\"/\">" |
78 |
-- "<interface name=\"org.mate.PowerManager.Backlight\">" |
79 |
-- "<method name=\"GetBrightness\">" |
80 |
-- "<arg type=\"u\" name=\"percentage_brightness\" direction=\"out\"/>" |
81 |
-- "</method>" |
82 |
-- "<method name=\"SetBrightness\">" |
83 |
-- "<arg type=\"u\" name=\"percentage_brightness\" direction=\"in\"/>" |
84 |
-- "</method>" |
85 |
-- "<signal name=\"BrightnessChanged\">" |
86 |
-- "<arg type=\"u\" name=\"percentage_brightness\" direction=\"out\"/>" |
87 |
-- "</signal>" |
88 |
-- "</interface>" |
89 |
--"</node>"; |
90 |
-- |
91 |
- #define GPM_KBD_BACKLIGHT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_KBD_BACKLIGHT, GpmKbdBacklightPrivate)) |
92 |
- |
93 |
- struct GpmKbdBacklightPrivate |
94 |
-@@ -430,40 +415,6 @@ gpm_kbd_backlight_dbus_property_set (GDB |
95 |
- return FALSE; |
96 |
- } |
97 |
- |
98 |
--/** |
99 |
-- * gpm_kbd_backlight_register_dbus: |
100 |
-- * @backlight: |
101 |
-- * @connection: |
102 |
-- * @error: |
103 |
-- **/ |
104 |
--void |
105 |
--gpm_kbd_backlight_register_dbus (GpmKbdBacklight *backlight, |
106 |
-- GDBusConnection *connection, |
107 |
-- GError **error) |
108 |
--{ |
109 |
-- GDBusNodeInfo *node_info; |
110 |
-- GDBusInterfaceInfo *interface_info; |
111 |
-- GDBusInterfaceVTable interface_vtable = { |
112 |
-- gpm_kbd_backlight_dbus_method_call, |
113 |
-- gpm_kbd_backlight_dbus_property_get, |
114 |
-- gpm_kbd_backlight_dbus_property_set |
115 |
-- }; |
116 |
-- |
117 |
-- node_info = g_dbus_node_info_new_for_xml (kbd_backlight_introspection, NULL); |
118 |
-- interface_info = g_dbus_node_info_lookup_interface (node_info, GPM_DBUS_INTERFACE_BACKLIGHT); |
119 |
-- |
120 |
-- backlight->priv->bus_connection = g_object_ref (connection); |
121 |
-- backlight->priv->bus_object_id = |
122 |
-- g_dbus_connection_register_object (connection, |
123 |
-- GPM_DBUS_PATH_KBD_BACKLIGHT, |
124 |
-- interface_info, |
125 |
-- &interface_vtable, |
126 |
-- backlight, |
127 |
-- NULL, |
128 |
-- error); |
129 |
-- g_dbus_node_info_unref (node_info); |
130 |
--} |
131 |
-- |
132 |
- static gboolean |
133 |
- gpm_kbd_backlight_evaluate_power_source_and_set (GpmKbdBacklight *backlight) |
134 |
- { |
135 |
-diff -uprN mate-power-manager-orig/src/gpm-manager.c mate-power-manager/src/gpm-manager.c |
136 |
---- mate-power-manager-orig/src/gpm-manager.c 2013-10-03 13:56:55.000000000 +0200 |
137 |
-+++ mate-power-manager/src/gpm-manager.c 2013-10-13 20:05:11.449488592 +0200 |
138 |
-@@ -63,6 +63,7 @@ |
139 |
- #include "gpm-disks.h" |
140 |
- |
141 |
- #include "org.mate.PowerManager.Backlight.h" |
142 |
-+#include "org.mate.PowerManager.KbdBacklight.h" |
143 |
- |
144 |
- static void gpm_manager_finalize (GObject *object); |
145 |
- |
146 |
-@@ -1986,12 +1987,13 @@ gpm_manager_init (GpmManager *manager) |
147 |
- G_OBJECT (manager->priv->backlight)); |
148 |
- } |
149 |
- |
150 |
-- manager->priv->kbd_backlight = gpm_kbd_backlight_new (); |
151 |
-- if (manager->priv->kbd_backlight != NULL) { |
152 |
-- gpm_kbd_backlight_register_dbus (manager->priv->kbd_backlight, |
153 |
-- g_connection, |
154 |
-- NULL); |
155 |
-- } |
156 |
-+ manager->priv->kbd_backlight = gpm_kbd_backlight_new (); |
157 |
-+ if (manager->priv->kbd_backlight != NULL) { |
158 |
-+ dbus_g_object_type_install_info (GPM_TYPE_KBD_BACKLIGHT, |
159 |
-+ &dbus_glib_gpm_kbd_backlight_object_info); |
160 |
-+ dbus_g_connection_register_g_object (connection, GPM_DBUS_PATH_KBD_BACKLIGHT, |
161 |
-+ G_OBJECT (manager->priv->kbd_backlight)); |
162 |
-+ } |
163 |
- |
164 |
- manager->priv->idle = gpm_idle_new (); |
165 |
- g_signal_connect (manager->priv->idle, "idle-changed", |
166 |
-diff -uprN mate-power-manager-orig/src/Makefile.am mate-power-manager/src/Makefile.am |
167 |
---- mate-power-manager-orig/src/Makefile.am 2013-10-03 13:56:55.000000000 +0200 |
168 |
-+++ mate-power-manager/src/Makefile.am 2013-10-13 20:10:17.374533688 +0200 |
169 |
-@@ -6,6 +6,7 @@ NULL = |
170 |
- EXTRA_DIST = \ |
171 |
- org.mate.PowerManager.xml \ |
172 |
- org.mate.PowerManager.Backlight.xml \ |
173 |
-+ org.mate.PowerManager.KbdBacklight.xml \ |
174 |
- gpm-marshal.list \ |
175 |
- $(NULL) |
176 |
- |
177 |
-@@ -270,6 +271,7 @@ endif |
178 |
- BUILT_SOURCES = \ |
179 |
- org.mate.PowerManager.h \ |
180 |
- org.mate.PowerManager.Backlight.h \ |
181 |
-+ org.mate.PowerManager.KbdBacklight.h \ |
182 |
- gpm-marshal.c \ |
183 |
- gpm-marshal.h \ |
184 |
- $(NULL) |
185 |
-@@ -295,6 +297,13 @@ org.mate.PowerManager.Backlight.h: org.m |
186 |
- --output=org.mate.PowerManager.Backlight.h \ |
187 |
- $(srcdir)/org.mate.PowerManager.Backlight.xml |
188 |
- |
189 |
-+org.mate.PowerManager.KbdBacklight.h: org.mate.PowerManager.KbdBacklight.xml |
190 |
-+ libtool --mode=execute dbus-binding-tool \ |
191 |
-+ --prefix=gpm_kbd_backlight \ |
192 |
-+ --mode=glib-server \ |
193 |
-+ --output=org.mate.PowerManager.KbdBacklight.h \ |
194 |
-+ $(srcdir)/org.mate.PowerManager.KbdBacklight.xml |
195 |
-+ |
196 |
- clean-local: |
197 |
- rm -f *~ |
198 |
- rm -f gpm-marshal.c gpm-marshal.h |
199 |
-diff -uprN mate-power-manager-orig/src/org.mate.PowerManager.KbdBacklight.xml mate-power-manager/src/org.mate.PowerManager.KbdBacklight.xml |
200 |
---- mate-power-manager-orig/src/org.mate.PowerManager.KbdBacklight.xml 2013-10-13 20:12:11.556667787 +0200 |
201 |
-+++ mate-power-manager/src/org.mate.PowerManager.KbdBacklight.xml 2013-10-13 20:11:45.972413654 +0200 |
202 |
-@@ -0,0 +1,15 @@ |
203 |
-+<?xml version="1.0" encoding="UTF-8"?> |
204 |
-+<node name="/"> |
205 |
-+ <interface name="org.mate.PowerManager.KbdBacklight"> |
206 |
-+ <method name="GetBrightness"> |
207 |
-+ <arg type="u" name="percentage_brightness" direction="out"/> |
208 |
-+ </method> |
209 |
-+ <method name="SetBrightness"> |
210 |
-+ <arg type="u" name="percentage_brightness" direction="in"/> |
211 |
-+ </method> |
212 |
-+ <signal name="BrightnessChanged"> |
213 |
-+ <arg type="u" name="percentage_brightness" direction="out"/> |
214 |
-+ </signal> |
215 |
-+ </interface> |
216 |
-+</node> |
217 |
-+ |
218 |
|
219 |
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-improve-UPower1-support.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-improve-UPower1-support.patch |
220 |
deleted file mode 100644 |
221 |
index d3e9d85..0000000 |
222 |
--- a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-improve-UPower1-support.patch |
223 |
+++ /dev/null |
224 |
@@ -1,102 +0,0 @@ |
225 |
-diff --git a/src/gpm-engine.c b/src/gpm-engine.c |
226 |
-index e6c6bf2..fe458e3 100644 |
227 |
---- a/src/gpm-engine.c |
228 |
-+++ b/src/gpm-engine.c |
229 |
-@@ -82,6 +82,9 @@ G_DEFINE_TYPE (GpmEngine, gpm_engine, G_TYPE_OBJECT) |
230 |
- |
231 |
- static UpDevice *gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device); |
232 |
- static UpDevice *gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device); |
233 |
-+#if UP_CHECK_VERSION (0, 99, 0) |
234 |
-+static void gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine *engine); |
235 |
-+#endif |
236 |
- |
237 |
- typedef enum { |
238 |
- GPM_ENGINE_WARNING_NONE = 0, |
239 |
-@@ -757,6 +760,13 @@ gpm_engine_device_add (GpmEngine *engine, UpDevice *device) |
240 |
- g_object_get (composite, "state", &state, NULL); |
241 |
- g_object_set_data (G_OBJECT(composite), "engine-state-old", GUINT_TO_POINTER(state)); |
242 |
- } |
243 |
-+ |
244 |
-+#if UP_CHECK_VERSION (0, 99, 0) |
245 |
-+ if (kind == UP_DEVICE_KIND_BATTERY || kind == UP_DEVICE_KIND_UPS || kind == UP_DEVICE_KIND_LINE_POWER) |
246 |
-+ return; |
247 |
-+ g_signal_connect (device, "notify", G_CALLBACK (gpm_engine_device_changed_cb), engine); |
248 |
-+#endif |
249 |
-+ |
250 |
- } |
251 |
- |
252 |
- /** |
253 |
-@@ -851,19 +861,20 @@ gpm_engine_device_removed_cb (UpClient *client, UpDevice *device, GpmEngine *eng |
254 |
- **/ |
255 |
- static void |
256 |
- #if UP_CHECK_VERSION(0, 99, 0) |
257 |
--gpm_engine_device_changed_cb (UpClient *client, GParamSpec *pspec, GpmEngine *engine) |
258 |
--{ |
259 |
-- gpm_engine_recalculate_state (engine); |
260 |
--} |
261 |
-+gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine *engine) |
262 |
- #else |
263 |
- gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *engine) |
264 |
-+#endif |
265 |
- { |
266 |
-+#if !UP_CHECK_VERSION(0, 99, 0) |
267 |
- UpDeviceKind kind; |
268 |
-+#endif |
269 |
- UpDeviceState state; |
270 |
- UpDeviceState state_old; |
271 |
- GpmEngineWarning warning_old; |
272 |
- GpmEngineWarning warning; |
273 |
- |
274 |
-+#if !UP_CHECK_VERSION(0, 99, 0) |
275 |
- /* get device properties */ |
276 |
- g_object_get (device, |
277 |
- "kind", &kind, |
278 |
-@@ -874,6 +885,7 @@ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *eng |
279 |
- egg_debug ("updating because %s changed", up_device_get_object_path (device)); |
280 |
- device = gpm_engine_update_composite_device (engine, device); |
281 |
- } |
282 |
-+#endif |
283 |
- |
284 |
- /* get device properties (may be composite) */ |
285 |
- g_object_get (device, |
286 |
-@@ -917,7 +929,6 @@ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *eng |
287 |
- |
288 |
- gpm_engine_recalculate_state (engine); |
289 |
- } |
290 |
--#endif |
291 |
- |
292 |
- /** |
293 |
- * gpm_engine_get_devices: |
294 |
-@@ -1042,10 +1053,7 @@ gpm_engine_init (GpmEngine *engine) |
295 |
- G_CALLBACK (gpm_engine_device_added_cb), engine); |
296 |
- g_signal_connect (engine->priv->client, "device-removed", |
297 |
- G_CALLBACK (gpm_engine_device_removed_cb), engine); |
298 |
--#if UP_CHECK_VERSION(0, 99, 0) |
299 |
-- g_signal_connect (engine->priv->client, "notify", |
300 |
-- G_CALLBACK (gpm_engine_device_changed_cb), engine); |
301 |
--#else |
302 |
-+#if !UP_CHECK_VERSION(0, 99, 0) |
303 |
- g_signal_connect (engine->priv->client, "device-changed", |
304 |
- G_CALLBACK (gpm_engine_device_changed_cb), engine); |
305 |
- #endif |
306 |
-@@ -1075,6 +1083,11 @@ gpm_engine_init (GpmEngine *engine) |
307 |
- #endif |
308 |
- |
309 |
- /* create a fake virtual composite battery */ |
310 |
-+#if UP_CHECK_VERSION(0, 99, 0) |
311 |
-+ engine->priv->battery_composite = up_client_get_display_device (engine->priv->client); |
312 |
-+ g_signal_connect (engine->priv->client, "notify", |
313 |
-+ G_CALLBACK (gpm_engine_device_changed_cb), engine); |
314 |
-+#else |
315 |
- engine->priv->battery_composite = up_device_new (); |
316 |
- g_object_set (engine->priv->battery_composite, |
317 |
- "kind", UP_DEVICE_KIND_BATTERY, |
318 |
-@@ -1083,6 +1096,7 @@ gpm_engine_init (GpmEngine *engine) |
319 |
- "power-supply", TRUE, |
320 |
- "is-present", TRUE, |
321 |
- NULL); |
322 |
-+#endif |
323 |
- |
324 |
- engine->priv->previous_icon = NULL; |
325 |
- engine->priv->previous_summary = NULL; |
326 |
- |
327 |
|
328 |
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-other-round-of-fixes-for-UPower-0.99-API-changes.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-other-round-of-fixes-for-UPower-0.99-API-changes.patch |
329 |
deleted file mode 100644 |
330 |
index 8344729..0000000 |
331 |
--- a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-other-round-of-fixes-for-UPower-0.99-API-changes.patch |
332 |
+++ /dev/null |
333 |
@@ -1,217 +0,0 @@ |
334 |
-diff --git a/src/gpm-engine.c b/src/gpm-engine.c |
335 |
-index fe458e3..56d19e2 100644 |
336 |
---- a/src/gpm-engine.c |
337 |
-+++ b/src/gpm-engine.c |
338 |
-@@ -84,7 +84,29 @@ static UpDevice *gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *o |
339 |
- static UpDevice *gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device); |
340 |
- #if UP_CHECK_VERSION (0, 99, 0) |
341 |
- static void gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine *engine); |
342 |
--#endif |
343 |
-+ |
344 |
-+#define GPM_ENGINE_WARNING_NONE UP_DEVICE_LEVEL_NONE |
345 |
-+#define GPM_ENGINE_WARNING_DISCHARGING UP_DEVICE_LEVEL_DISCHARGING |
346 |
-+#define GPM_ENGINE_WARNING_LOW UP_DEVICE_LEVEL_LOW |
347 |
-+#define GPM_ENGINE_WARNING_CRITICAL UP_DEVICE_LEVEL_CRITICAL |
348 |
-+#define GPM_ENGINE_WARNING_ACTION UP_DEVICE_LEVEL_ACTION |
349 |
-+ |
350 |
-+/** |
351 |
-+ * gpm_engine_get_warning: |
352 |
-+ * |
353 |
-+ * This gets the possible engine state for the device according to the |
354 |
-+ * policy, which could be per-percent, or per-time. |
355 |
-+ * |
356 |
-+ * Return value: A GpmEngine state, e.g. GPM_ENGINE_WARNING_DISCHARGING |
357 |
-+ **/ |
358 |
-+static UpDeviceLevel |
359 |
-+gpm_engine_get_warning (GpmEngine *engine, UpDevice *device) |
360 |
-+{ |
361 |
-+ UpDeviceLevel warning; |
362 |
-+ g_object_get (device, "warning-level", &warning, NULL); |
363 |
-+ return warning; |
364 |
-+} |
365 |
-+#else |
366 |
- |
367 |
- typedef enum { |
368 |
- GPM_ENGINE_WARNING_NONE = 0, |
369 |
-@@ -226,6 +248,7 @@ gpm_engine_get_warning (GpmEngine *engine, UpDevice *device) |
370 |
- out: |
371 |
- return warning_type; |
372 |
- } |
373 |
-+#endif |
374 |
- |
375 |
- /** |
376 |
- * gpm_engine_get_summary: |
377 |
-@@ -282,12 +305,20 @@ gpm_engine_get_summary (GpmEngine *engine) |
378 |
- * Returns the icon |
379 |
- **/ |
380 |
- static gchar * |
381 |
-+#if UP_CHECK_VERSION (0, 99, 0) |
382 |
-+gpm_engine_get_icon_priv (GpmEngine *engine, UpDeviceKind device_kind, UpDeviceLevel warning, gboolean use_state) |
383 |
-+#else |
384 |
- gpm_engine_get_icon_priv (GpmEngine *engine, UpDeviceKind device_kind, GpmEngineWarning warning, gboolean use_state) |
385 |
-+#endif |
386 |
- { |
387 |
- guint i; |
388 |
- GPtrArray *array; |
389 |
- UpDevice *device; |
390 |
-+#if UP_CHECK_VERSION (0, 99, 0) |
391 |
-+ UpDeviceLevel warning_temp; |
392 |
-+#else |
393 |
- GpmEngineWarning warning_temp; |
394 |
-+#endif |
395 |
- UpDeviceKind kind; |
396 |
- UpDeviceState state; |
397 |
- gboolean is_present; |
398 |
-@@ -572,6 +603,9 @@ gpm_engine_device_check_capacity (GpmEngine *engine, UpDevice *device) |
399 |
- static UpDevice * |
400 |
- gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device) |
401 |
- { |
402 |
-+#if UP_CHECK_VERSION (0, 99, 0) |
403 |
-+ return engine->priv->battery_composite; |
404 |
-+#else |
405 |
- guint battery_devices = 0; |
406 |
- GPtrArray *array; |
407 |
- UpDevice *device; |
408 |
-@@ -601,6 +635,7 @@ gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device) |
409 |
- out: |
410 |
- /* return composite device or original device */ |
411 |
- return device; |
412 |
-+#endif |
413 |
- } |
414 |
- |
415 |
- /** |
416 |
-@@ -609,6 +644,18 @@ gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device) |
417 |
- static UpDevice * |
418 |
- gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device) |
419 |
- { |
420 |
-+#if UP_CHECK_VERSION (0, 99, 0) |
421 |
-+ gchar *text; |
422 |
-+ |
423 |
-+ text = up_device_to_text (engine->priv->battery_composite); |
424 |
-+ egg_debug ("composite:\n%s", text); |
425 |
-+ g_free (text); |
426 |
-+ |
427 |
-+ /* force update of icon */ |
428 |
-+ gpm_engine_recalculate_state_icon (engine); |
429 |
-+ |
430 |
-+ return engine->priv->battery_composite; |
431 |
-+#else |
432 |
- guint i; |
433 |
- gdouble percentage = 0.0; |
434 |
- gdouble energy = 0.0; |
435 |
-@@ -720,6 +767,7 @@ gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device |
436 |
- out: |
437 |
- /* return composite device or original device */ |
438 |
- return device; |
439 |
-+#endif |
440 |
- } |
441 |
- |
442 |
- /** |
443 |
-@@ -728,7 +776,11 @@ gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device |
444 |
- static void |
445 |
- gpm_engine_device_add (GpmEngine *engine, UpDevice *device) |
446 |
- { |
447 |
-+#if UP_CHECK_VERSION (0, 99, 0) |
448 |
-+ UpDeviceLevel warning; |
449 |
-+#else |
450 |
- GpmEngineWarning warning; |
451 |
-+#endif |
452 |
- UpDeviceState state; |
453 |
- UpDeviceKind kind; |
454 |
- UpDevice *composite; |
455 |
-@@ -762,9 +814,9 @@ gpm_engine_device_add (GpmEngine *engine, UpDevice *device) |
456 |
- } |
457 |
- |
458 |
- #if UP_CHECK_VERSION (0, 99, 0) |
459 |
-- if (kind == UP_DEVICE_KIND_BATTERY || kind == UP_DEVICE_KIND_UPS || kind == UP_DEVICE_KIND_LINE_POWER) |
460 |
-- return; |
461 |
- g_signal_connect (device, "notify", G_CALLBACK (gpm_engine_device_changed_cb), engine); |
462 |
-+ g_ptr_array_add (engine->priv->array, g_object_ref (device)); |
463 |
-+ gpm_engine_recalculate_state (engine); |
464 |
- #endif |
465 |
- |
466 |
- } |
467 |
-@@ -820,10 +872,14 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine) |
468 |
- static void |
469 |
- gpm_engine_device_added_cb (UpClient *client, UpDevice *device, GpmEngine *engine) |
470 |
- { |
471 |
-+#if UP_CHECK_VERSION (0, 99, 0) |
472 |
-+ gpm_engine_device_add (engine, device); |
473 |
-+#else |
474 |
- /* add to list */ |
475 |
- g_ptr_array_add (engine->priv->array, g_object_ref (device)); |
476 |
- |
477 |
- gpm_engine_recalculate_state (engine); |
478 |
-+#endif |
479 |
- } |
480 |
- |
481 |
- /** |
482 |
-@@ -866,15 +922,17 @@ gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine *en |
483 |
- gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *engine) |
484 |
- #endif |
485 |
- { |
486 |
--#if !UP_CHECK_VERSION(0, 99, 0) |
487 |
- UpDeviceKind kind; |
488 |
--#endif |
489 |
- UpDeviceState state; |
490 |
- UpDeviceState state_old; |
491 |
-+#if UP_CHECK_VERSION(0, 99, 0) |
492 |
-+ UpDeviceLevel warning_old; |
493 |
-+ UpDeviceLevel warning; |
494 |
-+#else |
495 |
- GpmEngineWarning warning_old; |
496 |
- GpmEngineWarning warning; |
497 |
-+#endif |
498 |
- |
499 |
--#if !UP_CHECK_VERSION(0, 99, 0) |
500 |
- /* get device properties */ |
501 |
- g_object_get (device, |
502 |
- "kind", &kind, |
503 |
-@@ -885,7 +943,6 @@ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *eng |
504 |
- egg_debug ("updating because %s changed", up_device_get_object_path (device)); |
505 |
- device = gpm_engine_update_composite_device (engine, device); |
506 |
- } |
507 |
--#endif |
508 |
- |
509 |
- /* get device properties (may be composite) */ |
510 |
- g_object_get (device, |
511 |
-@@ -1070,22 +1127,10 @@ gpm_engine_init (GpmEngine *engine) |
512 |
- g_signal_connect (engine->priv->phone, "device-refresh", |
513 |
- G_CALLBACK (phone_device_refresh_cb), engine); |
514 |
- |
515 |
--#if UP_CHECK_VERSION(0, 99, 0) |
516 |
-- /* coldplug */ |
517 |
-- array = up_client_get_devices(engine->priv->client); |
518 |
-- if (array) { |
519 |
-- for (i = 0; i < array->len; i++) { |
520 |
-- UpDevice *device = g_ptr_array_index (array, i); |
521 |
-- gpm_engine_device_added_cb(engine->priv->client, device, engine); |
522 |
-- } |
523 |
-- g_ptr_array_free (array, TRUE); |
524 |
-- } |
525 |
--#endif |
526 |
-- |
527 |
- /* create a fake virtual composite battery */ |
528 |
- #if UP_CHECK_VERSION(0, 99, 0) |
529 |
- engine->priv->battery_composite = up_client_get_display_device (engine->priv->client); |
530 |
-- g_signal_connect (engine->priv->client, "notify", |
531 |
-+ g_signal_connect (engine->priv->battery_composite, "notify", |
532 |
- G_CALLBACK (gpm_engine_device_changed_cb), engine); |
533 |
- #else |
534 |
- engine->priv->battery_composite = up_device_new (); |
535 |
-diff --git a/src/gpm-manager.c b/src/gpm-manager.c |
536 |
-index df84cac..09bd0c0 100644 |
537 |
---- a/src/gpm-manager.c |
538 |
-+++ b/src/gpm-manager.c |
539 |
-@@ -1858,7 +1858,9 @@ gpm_manager_init (GpmManager *manager) |
540 |
- G_CALLBACK (gpm_manager_settings_changed_cb), manager); |
541 |
- manager->priv->client = up_client_new (); |
542 |
- #if UP_CHECK_VERSION(0, 99, 0) |
543 |
-- g_signal_connect (manager->priv->client, "notify", |
544 |
-+ g_signal_connect (manager->priv->client, "notify::lid-is-closed", |
545 |
-+ G_CALLBACK (gpm_manager_client_changed_cb), manager); |
546 |
-+ g_signal_connect (manager->priv->client, "notify::on-battery", |
547 |
- G_CALLBACK (gpm_manager_client_changed_cb), manager); |
548 |
- #else |
549 |
- g_signal_connect (manager->priv->client, "changed", |
550 |
- |
551 |
|
552 |
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-port-to-upower-0.99-API.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-port-to-upower-0.99-API.patch |
553 |
deleted file mode 100644 |
554 |
index 7202575..0000000 |
555 |
--- a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-port-to-upower-0.99-API.patch |
556 |
+++ /dev/null |
557 |
@@ -1,390 +0,0 @@ |
558 |
-diff --git a/src/gpm-backlight.c b/src/gpm-backlight.c |
559 |
-index 1f1d834..d2938a4 100644 |
560 |
---- a/src/gpm-backlight.c |
561 |
-+++ b/src/gpm-backlight.c |
562 |
-@@ -410,7 +410,11 @@ gpm_settings_key_changed_cb (GSettings *settings, const gchar *key, GpmBacklight |
563 |
- * Does the actions when the ac power source is inserted/removed. |
564 |
- **/ |
565 |
- static void |
566 |
-+#if UP_CHECK_VERSION(0, 99, 0) |
567 |
-+gpm_backlight_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmBacklight *backlight) |
568 |
-+#else |
569 |
- gpm_backlight_client_changed_cb (UpClient *client, GpmBacklight *backlight) |
570 |
-+#endif |
571 |
- { |
572 |
- gpm_backlight_brightness_evaluate_and_set (backlight, FALSE, TRUE); |
573 |
- } |
574 |
-@@ -727,8 +731,13 @@ gpm_backlight_init (GpmBacklight *backlight) |
575 |
- |
576 |
- /* we use up_client for the ac-adapter-changed signal */ |
577 |
- backlight->priv->client = up_client_new (); |
578 |
-+#if UP_CHECK_VERSION(0, 99, 0) |
579 |
-+ g_signal_connect (backlight->priv->client, "notify", |
580 |
-+ G_CALLBACK (gpm_backlight_client_changed_cb), backlight); |
581 |
-+#else |
582 |
- g_signal_connect (backlight->priv->client, "changed", |
583 |
- G_CALLBACK (gpm_backlight_client_changed_cb), backlight); |
584 |
-+#endif |
585 |
- |
586 |
- /* gets caps */ |
587 |
- backlight->priv->can_dim = gpm_brightness_has_hw (backlight->priv->brightness); |
588 |
-diff --git a/src/gpm-button.c b/src/gpm-button.c |
589 |
-index 1e38173..b331cf6 100644 |
590 |
---- a/src/gpm-button.c |
591 |
-+++ b/src/gpm-button.c |
592 |
-@@ -324,7 +324,11 @@ gpm_button_reset_time (GpmButton *button) |
593 |
- * gpm_button_client_changed_cb |
594 |
- **/ |
595 |
- static void |
596 |
-+#if UP_CHECK_VERSION(0, 99, 0) |
597 |
-+gpm_button_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmButton *button) |
598 |
-+#else |
599 |
- gpm_button_client_changed_cb (UpClient *client, GpmButton *button) |
600 |
-+#endif |
601 |
- { |
602 |
- gboolean lid_is_closed; |
603 |
- |
604 |
-@@ -363,9 +367,13 @@ gpm_button_init (GpmButton *button) |
605 |
- |
606 |
- button->priv->client = up_client_new (); |
607 |
- button->priv->lid_is_closed = up_client_get_lid_is_closed (button->priv->client); |
608 |
-+#if UP_CHECK_VERSION(0, 99, 0) |
609 |
-+ g_signal_connect (button->priv->client, "notify", |
610 |
-+ G_CALLBACK (gpm_button_client_changed_cb), button); |
611 |
-+#else |
612 |
- g_signal_connect (button->priv->client, "changed", |
613 |
- G_CALLBACK (gpm_button_client_changed_cb), button); |
614 |
-- |
615 |
-+#endif |
616 |
- /* register the brightness keys */ |
617 |
- gpm_button_xevent_key (button, XF86XK_PowerOff, GPM_BUTTON_POWER); |
618 |
- #ifdef HAVE_XF86XK_SUSPEND |
619 |
-diff --git a/src/gpm-control.c b/src/gpm-control.c |
620 |
-index ec50136..0562d38 100644 |
621 |
---- a/src/gpm-control.c |
622 |
-+++ b/src/gpm-control.c |
623 |
-@@ -289,10 +289,11 @@ gpm_control_suspend (GpmControl *control, GError **error) |
624 |
- } |
625 |
- g_object_unref(proxy); |
626 |
- } |
627 |
-+#if !UP_CHECK_VERSION(0, 99, 0) |
628 |
- else { |
629 |
- ret = up_client_suspend_sync (control->priv->client, NULL, error); |
630 |
- } |
631 |
-- |
632 |
-+#endif |
633 |
- egg_debug ("emitting resume"); |
634 |
- g_signal_emit (control, signals [RESUME], 0, GPM_CONTROL_ACTION_SUSPEND); |
635 |
- |
636 |
-@@ -399,10 +400,11 @@ gpm_control_hibernate (GpmControl *control, GError **error) |
637 |
- ret = TRUE; |
638 |
- } |
639 |
- } |
640 |
-+#if !UP_CHECK_VERSION(0, 99, 0) |
641 |
- else { |
642 |
- ret = up_client_hibernate_sync (control->priv->client, NULL, error); |
643 |
- } |
644 |
-- |
645 |
-+#endif |
646 |
- egg_debug ("emitting resume"); |
647 |
- g_signal_emit (control, signals [RESUME], 0, GPM_CONTROL_ACTION_HIBERNATE); |
648 |
- |
649 |
-diff --git a/src/gpm-engine.c b/src/gpm-engine.c |
650 |
-index 96a043e..e6c6bf2 100644 |
651 |
---- a/src/gpm-engine.c |
652 |
-+++ b/src/gpm-engine.c |
653 |
-@@ -768,12 +768,14 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine) |
654 |
- guint i; |
655 |
- GPtrArray *array = NULL; |
656 |
- UpDevice *device; |
657 |
-+#if !UP_CHECK_VERSION(0, 99, 0) |
658 |
- gboolean ret; |
659 |
- GError *error = NULL; |
660 |
-+#endif |
661 |
- |
662 |
- g_return_val_if_fail (engine != NULL, FALSE); |
663 |
- g_return_val_if_fail (GPM_IS_ENGINE (engine), FALSE); |
664 |
-- |
665 |
-+#if !UP_CHECK_VERSION(0, 99, 0) |
666 |
- /* get devices from UPower */ |
667 |
- ret = up_client_enumerate_devices_sync (engine->priv->client, NULL, &error); |
668 |
- if (!ret) { |
669 |
-@@ -781,7 +783,7 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine) |
670 |
- g_error_free (error); |
671 |
- goto out; |
672 |
- } |
673 |
-- |
674 |
-+#endif |
675 |
- /* connected mobile phones */ |
676 |
- gpm_phone_coldplug (engine->priv->phone); |
677 |
- |
678 |
-@@ -793,7 +795,9 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine) |
679 |
- device = g_ptr_array_index (array, i); |
680 |
- gpm_engine_device_add (engine, device); |
681 |
- } |
682 |
-+#if !UP_CHECK_VERSION(0, 99, 0) |
683 |
- out: |
684 |
-+#endif |
685 |
- if (array != NULL) |
686 |
- g_ptr_array_unref (array); |
687 |
- /* never repeat */ |
688 |
-@@ -816,6 +820,22 @@ gpm_engine_device_added_cb (UpClient *client, UpDevice *device, GpmEngine *engin |
689 |
- * gpm_engine_device_removed_cb: |
690 |
- **/ |
691 |
- static void |
692 |
-+#if UP_CHECK_VERSION(0, 99, 0) |
693 |
-+gpm_engine_device_removed_cb (UpClient *client, const char *object_path, GpmEngine *engine) |
694 |
-+{ |
695 |
-+ guint i; |
696 |
-+ |
697 |
-+ for (i = 0; i < engine->priv->array->len; i++) { |
698 |
-+ UpDevice *device = g_ptr_array_index (engine->priv->array, i); |
699 |
-+ |
700 |
-+ if (g_strcmp0 (object_path, up_device_get_object_path (device)) == 0) { |
701 |
-+ g_ptr_array_remove_index (engine->priv->array, i); |
702 |
-+ break; |
703 |
-+ } |
704 |
-+ } |
705 |
-+ gpm_engine_recalculate_state (engine); |
706 |
-+} |
707 |
-+#else |
708 |
- gpm_engine_device_removed_cb (UpClient *client, UpDevice *device, GpmEngine *engine) |
709 |
- { |
710 |
- gboolean ret; |
711 |
-@@ -824,12 +844,18 @@ gpm_engine_device_removed_cb (UpClient *client, UpDevice *device, GpmEngine *eng |
712 |
- return; |
713 |
- gpm_engine_recalculate_state (engine); |
714 |
- } |
715 |
-- |
716 |
-+#endif |
717 |
- |
718 |
- /** |
719 |
- * gpm_engine_device_changed_cb: |
720 |
- **/ |
721 |
- static void |
722 |
-+#if UP_CHECK_VERSION(0, 99, 0) |
723 |
-+gpm_engine_device_changed_cb (UpClient *client, GParamSpec *pspec, GpmEngine *engine) |
724 |
-+{ |
725 |
-+ gpm_engine_recalculate_state (engine); |
726 |
-+} |
727 |
-+#else |
728 |
- gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *engine) |
729 |
- { |
730 |
- UpDeviceKind kind; |
731 |
-@@ -891,6 +917,7 @@ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *eng |
732 |
- |
733 |
- gpm_engine_recalculate_state (engine); |
734 |
- } |
735 |
-+#endif |
736 |
- |
737 |
- /** |
738 |
- * gpm_engine_get_devices: |
739 |
-@@ -1003,7 +1030,10 @@ phone_device_refresh_cb (GpmPhone *phone, guint idx, GpmEngine *engine) |
740 |
- static void |
741 |
- gpm_engine_init (GpmEngine *engine) |
742 |
- { |
743 |
-- |
744 |
-+#if UP_CHECK_VERSION(0, 99, 0) |
745 |
-+ GPtrArray *array = NULL; |
746 |
-+ guint i; |
747 |
-+#endif |
748 |
- engine->priv = GPM_ENGINE_GET_PRIVATE (engine); |
749 |
- |
750 |
- engine->priv->array = g_ptr_array_new_with_free_func (g_object_unref); |
751 |
-@@ -1012,8 +1042,13 @@ gpm_engine_init (GpmEngine *engine) |
752 |
- G_CALLBACK (gpm_engine_device_added_cb), engine); |
753 |
- g_signal_connect (engine->priv->client, "device-removed", |
754 |
- G_CALLBACK (gpm_engine_device_removed_cb), engine); |
755 |
-+#if UP_CHECK_VERSION(0, 99, 0) |
756 |
-+ g_signal_connect (engine->priv->client, "notify", |
757 |
-+ G_CALLBACK (gpm_engine_device_changed_cb), engine); |
758 |
-+#else |
759 |
- g_signal_connect (engine->priv->client, "device-changed", |
760 |
- G_CALLBACK (gpm_engine_device_changed_cb), engine); |
761 |
-+#endif |
762 |
- |
763 |
- engine->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA); |
764 |
- g_signal_connect (engine->priv->settings, "changed", |
765 |
-@@ -1027,6 +1062,18 @@ gpm_engine_init (GpmEngine *engine) |
766 |
- g_signal_connect (engine->priv->phone, "device-refresh", |
767 |
- G_CALLBACK (phone_device_refresh_cb), engine); |
768 |
- |
769 |
-+#if UP_CHECK_VERSION(0, 99, 0) |
770 |
-+ /* coldplug */ |
771 |
-+ array = up_client_get_devices(engine->priv->client); |
772 |
-+ if (array) { |
773 |
-+ for (i = 0; i < array->len; i++) { |
774 |
-+ UpDevice *device = g_ptr_array_index (array, i); |
775 |
-+ gpm_engine_device_added_cb(engine->priv->client, device, engine); |
776 |
-+ } |
777 |
-+ g_ptr_array_free (array, TRUE); |
778 |
-+ } |
779 |
-+#endif |
780 |
-+ |
781 |
- /* create a fake virtual composite battery */ |
782 |
- engine->priv->battery_composite = up_device_new (); |
783 |
- g_object_set (engine->priv->battery_composite, |
784 |
-diff --git a/src/gpm-kbd-backlight.c b/src/gpm-kbd-backlight.c |
785 |
-index a439e94..3a0f6e6 100644 |
786 |
---- a/src/gpm-kbd-backlight.c |
787 |
-+++ b/src/gpm-kbd-backlight.c |
788 |
-@@ -486,6 +486,9 @@ gpm_kbd_backlight_control_resume_cb (GpmControl *control, |
789 |
- **/ |
790 |
- static void |
791 |
- gpm_kbd_backlight_client_changed_cb (UpClient *client, |
792 |
-+#if UP_CHECK_VERSION(0, 99, 0) |
793 |
-+ GParamSpec *pspec, |
794 |
-+#endif |
795 |
- GpmKbdBacklight *backlight) |
796 |
- { |
797 |
- gpm_kbd_backlight_evaluate_power_source_and_set (backlight); |
798 |
-@@ -755,8 +758,13 @@ gpm_kbd_backlight_init (GpmKbdBacklight *backlight) |
799 |
- |
800 |
- /* Use upower for ac changed signal */ |
801 |
- backlight->priv->client = up_client_new (); |
802 |
-+#if UP_CHECK_VERSION(0, 99, 0) |
803 |
-+ g_signal_connect (backlight->priv->client, "notify", |
804 |
-+ G_CALLBACK (gpm_kbd_backlight_client_changed_cb), backlight); |
805 |
-+#else |
806 |
- g_signal_connect (backlight->priv->client, "changed", |
807 |
- G_CALLBACK (gpm_kbd_backlight_client_changed_cb), backlight); |
808 |
-+#endif |
809 |
- |
810 |
- backlight->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA); |
811 |
- //g_signal_connect (backlight->priv->settings, "changed", G_CALLBACK (gpm_settings_key_changed_cb), backlight); |
812 |
-diff --git a/src/gpm-manager.c b/src/gpm-manager.c |
813 |
-index c4d0530..df84cac 100644 |
814 |
---- a/src/gpm-manager.c |
815 |
-+++ b/src/gpm-manager.c |
816 |
-@@ -971,7 +971,11 @@ gpm_manager_get_spindown_timeout (GpmManager *manager) |
817 |
- * gpm_manager_client_changed_cb: |
818 |
- **/ |
819 |
- static void |
820 |
-+#if UP_CHECK_VERSION(0, 99, 0) |
821 |
-+gpm_manager_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmManager *manager) |
822 |
-+#else |
823 |
- gpm_manager_client_changed_cb (UpClient *client, GpmManager *manager) |
824 |
-+#endif |
825 |
- { |
826 |
- gboolean event_when_closed; |
827 |
- gint timeout; |
828 |
-@@ -1853,8 +1857,13 @@ gpm_manager_init (GpmManager *manager) |
829 |
- g_signal_connect (manager->priv->settings, "changed", |
830 |
- G_CALLBACK (gpm_manager_settings_changed_cb), manager); |
831 |
- manager->priv->client = up_client_new (); |
832 |
-+#if UP_CHECK_VERSION(0, 99, 0) |
833 |
-+ g_signal_connect (manager->priv->client, "notify", |
834 |
-+ G_CALLBACK (gpm_manager_client_changed_cb), manager); |
835 |
-+#else |
836 |
- g_signal_connect (manager->priv->client, "changed", |
837 |
- G_CALLBACK (gpm_manager_client_changed_cb), manager); |
838 |
-+#endif |
839 |
- |
840 |
- /* use libmatenotify */ |
841 |
- notify_init (GPM_NAME); |
842 |
-diff --git a/src/gpm-prefs-core.c b/src/gpm-prefs-core.c |
843 |
-index 7a2662d..6abb792 100644 |
844 |
---- a/src/gpm-prefs-core.c |
845 |
-+++ b/src/gpm-prefs-core.c |
846 |
-@@ -811,7 +811,9 @@ gpm_prefs_init (GpmPrefs *prefs) |
847 |
- UpDevice *device; |
848 |
- UpDeviceKind kind; |
849 |
- GpmBrightness *brightness; |
850 |
-+#if !UP_CHECK_VERSION(0, 99, 0) |
851 |
- gboolean ret; |
852 |
-+#endif |
853 |
- guint i; |
854 |
- |
855 |
- GDBusProxy *proxy; |
856 |
-@@ -897,9 +899,11 @@ gpm_prefs_init (GpmPrefs *prefs) |
857 |
- else { |
858 |
- /* are we allowed to shutdown? */ |
859 |
- egg_console_kit_can_stop (prefs->priv->console, &prefs->priv->can_shutdown, NULL); |
860 |
-+#if !UP_CHECK_VERSION(0, 99, 0) |
861 |
- /* get values from UpClient */ |
862 |
- prefs->priv->can_suspend = up_client_get_can_suspend (prefs->priv->client); |
863 |
- prefs->priv->can_hibernate = up_client_get_can_hibernate (prefs->priv->client); |
864 |
-+#endif |
865 |
- } |
866 |
- |
867 |
- if (LOGIND_RUNNING()) { |
868 |
-@@ -953,14 +957,14 @@ gpm_prefs_init (GpmPrefs *prefs) |
869 |
- brightness = gpm_brightness_new (); |
870 |
- prefs->priv->has_lcd = gpm_brightness_has_hw (brightness); |
871 |
- g_object_unref (brightness); |
872 |
-- |
873 |
-+#if !UP_CHECK_VERSION(0, 99, 0) |
874 |
- /* get device list */ |
875 |
- ret = up_client_enumerate_devices_sync (prefs->priv->client, NULL, &error); |
876 |
- if (!ret) { |
877 |
- egg_warning ("failed to get device list: %s", error->message); |
878 |
- g_error_free (error); |
879 |
- } |
880 |
-- |
881 |
-+#endif |
882 |
- devices = up_client_get_devices (prefs->priv->client); |
883 |
- for (i=0; i<devices->len; i++) { |
884 |
- device = g_ptr_array_index (devices, i); |
885 |
-diff --git a/src/gpm-statistics.c b/src/gpm-statistics.c |
886 |
-index 98b5632..13489dc 100644 |
887 |
---- a/src/gpm-statistics.c |
888 |
-+++ b/src/gpm-statistics.c |
889 |
-@@ -1236,6 +1236,12 @@ gpm_stats_device_added_cb (UpClient *client, UpDevice *device, gpointer user_dat |
890 |
- * gpm_stats_device_changed_cb: |
891 |
- **/ |
892 |
- static void |
893 |
-+#if UP_CHECK_VERSION(0, 99, 0) |
894 |
-+gpm_stats_device_changed_cb (UpClient *client, GParamSpec *pspec, gpointer user_data) |
895 |
-+{ |
896 |
-+ gpm_stats_button_update_ui(); |
897 |
-+} |
898 |
-+#else |
899 |
- gpm_stats_device_changed_cb (UpClient *client, UpDevice *device, gpointer user_data) |
900 |
- { |
901 |
- const gchar *object_path; |
902 |
-@@ -1246,6 +1252,7 @@ gpm_stats_device_changed_cb (UpClient *client, UpDevice *device, gpointer user_d |
903 |
- if (g_strcmp0 (current_device, object_path) == 0) |
904 |
- gpm_stats_update_info_data (device); |
905 |
- } |
906 |
-+#endif |
907 |
- |
908 |
- /** |
909 |
- * gpm_stats_device_removed_cb: |
910 |
-@@ -1794,11 +1801,12 @@ main (int argc, char *argv[]) |
911 |
- |
912 |
- wakeups = up_wakeups_new (); |
913 |
- g_signal_connect (wakeups, "data-changed", G_CALLBACK (gpm_stats_data_changed_cb), NULL); |
914 |
-- |
915 |
-+#if !UP_CHECK_VERSION(0, 99, 0) |
916 |
- /* coldplug */ |
917 |
- ret = up_client_enumerate_devices_sync (client, NULL, NULL); |
918 |
- if (!ret) |
919 |
- goto out; |
920 |
-+#endif |
921 |
- devices = up_client_get_devices (client); |
922 |
- |
923 |
- /* add devices in visually pleasing order */ |
924 |
-@@ -1814,7 +1822,11 @@ main (int argc, char *argv[]) |
925 |
- /* connect now the coldplug is done */ |
926 |
- g_signal_connect (client, "device-added", G_CALLBACK (gpm_stats_device_added_cb), NULL); |
927 |
- g_signal_connect (client, "device-removed", G_CALLBACK (gpm_stats_device_removed_cb), NULL); |
928 |
-+#if UP_CHECK_VERSION(0, 99, 0) |
929 |
-+ g_signal_connect (client, "notify", G_CALLBACK (gpm_stats_device_changed_cb), NULL); |
930 |
-+#else |
931 |
- g_signal_connect (client, "device-changed", G_CALLBACK (gpm_stats_device_changed_cb), NULL); |
932 |
-+#endif |
933 |
- |
934 |
- /* set current device */ |
935 |
- if (devices->len > 0) { |
936 |
-@@ -1854,8 +1866,9 @@ main (int argc, char *argv[]) |
937 |
- gtk_widget_show (widget); |
938 |
- |
939 |
- gtk_main (); |
940 |
-- |
941 |
-+#if !UP_CHECK_VERSION(0, 99, 0) |
942 |
- out: |
943 |
-+#endif |
944 |
- g_object_unref (settings); |
945 |
- g_object_unref (client); |
946 |
- g_object_unref (wakeups); |
947 |
- |
948 |
|
949 |
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-remove-battery-recall-logic.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-remove-battery-recall-logic.patch |
950 |
deleted file mode 100644 |
951 |
index 6d462b9..0000000 |
952 |
--- a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-remove-battery-recall-logic.patch |
953 |
+++ /dev/null |
954 |
@@ -1,263 +0,0 @@ |
955 |
-diff --git a/data/org.mate.power-manager.gschema.xml.in b/data/org.mate.power-manager.gschema.xml.in |
956 |
-index adecce0..ca009b5 100644 |
957 |
---- a/data/org.mate.power-manager.gschema.xml.in |
958 |
-+++ b/data/org.mate.power-manager.gschema.xml.in |
959 |
-@@ -211,11 +211,6 @@ |
960 |
- <_summary>Seconds of inactivity to spin down when on battery</_summary> |
961 |
- <_description>The number of seconds of inactivity to spin down the disks when on battery power.</_description> |
962 |
- </key> |
963 |
-- <key name="notify-perhaps-recall" type="b"> |
964 |
-- <default>true</default> |
965 |
-- <_summary>If we should show the recalled battery warning for a broken battery</_summary> |
966 |
-- <_description>If we should show the recalled battery warning for a broken battery. Set this to false only if you know your battery is okay.</_description> |
967 |
-- </key> |
968 |
- <key name="notify-low-capacity" type="b"> |
969 |
- <default>true</default> |
970 |
- <_summary>If we should show the low capacity warning for a broken battery</_summary> |
971 |
-diff --git a/src/gpm-common.h b/src/gpm-common.h |
972 |
-index ef20f88..303bdd1 100644 |
973 |
---- a/src/gpm-common.h |
974 |
-+++ b/src/gpm-common.h |
975 |
-@@ -98,7 +98,6 @@ G_BEGIN_DECLS |
976 |
- #define GPM_SETTINGS_SPINDOWN_TIMEOUT_BATT "spindown-timeout-battery" |
977 |
- |
978 |
- /* notify */ |
979 |
--#define GPM_SETTINGS_NOTIFY_PERHAPS_RECALL "notify-perhaps-recall" |
980 |
- #define GPM_SETTINGS_NOTIFY_LOW_CAPACITY "notify-low-capacity" |
981 |
- #define GPM_SETTINGS_NOTIFY_DISCHARGING "notify-discharging" |
982 |
- #define GPM_SETTINGS_NOTIFY_FULLY_CHARGED "notify-fully-charged" |
983 |
-diff --git a/src/gpm-engine.c b/src/gpm-engine.c |
984 |
-index 0f9d0c1..96a043e 100644 |
985 |
---- a/src/gpm-engine.c |
986 |
-+++ b/src/gpm-engine.c |
987 |
-@@ -72,7 +72,6 @@ enum { |
988 |
- CHARGE_ACTION, |
989 |
- DISCHARGING, |
990 |
- LOW_CAPACITY, |
991 |
-- PERHAPS_RECALL, |
992 |
- LAST_SIGNAL |
993 |
- }; |
994 |
- |
995 |
-@@ -761,42 +760,6 @@ gpm_engine_device_add (GpmEngine *engine, UpDevice *device) |
996 |
- } |
997 |
- |
998 |
- /** |
999 |
-- * gpm_engine_check_recall: |
1000 |
-- **/ |
1001 |
--static gboolean |
1002 |
--gpm_engine_check_recall (GpmEngine *engine, UpDevice *device) |
1003 |
--{ |
1004 |
-- UpDeviceKind kind; |
1005 |
-- gboolean recall_notice = FALSE; |
1006 |
-- gchar *recall_vendor = NULL; |
1007 |
-- gchar *recall_url = NULL; |
1008 |
-- |
1009 |
-- /* get device properties */ |
1010 |
-- g_object_get (device, |
1011 |
-- "kind", &kind, |
1012 |
-- "recall-notice", &recall_notice, |
1013 |
-- "recall-vendor", &recall_vendor, |
1014 |
-- "recall-url", &recall_url, |
1015 |
-- NULL); |
1016 |
-- |
1017 |
-- /* not battery */ |
1018 |
-- if (kind != UP_DEVICE_KIND_BATTERY) |
1019 |
-- goto out; |
1020 |
-- |
1021 |
-- /* no recall data */ |
1022 |
-- if (!recall_notice) |
1023 |
-- goto out; |
1024 |
-- |
1025 |
-- /* emit signal for manager */ |
1026 |
-- egg_debug ("** EMIT: perhaps-recall"); |
1027 |
-- g_signal_emit (engine, signals [PERHAPS_RECALL], 0, device, recall_vendor, recall_url); |
1028 |
--out: |
1029 |
-- g_free (recall_vendor); |
1030 |
-- g_free (recall_url); |
1031 |
-- return recall_notice; |
1032 |
--} |
1033 |
-- |
1034 |
--/** |
1035 |
- * gpm_engine_coldplug_idle_cb: |
1036 |
- **/ |
1037 |
- static gboolean |
1038 |
-@@ -829,7 +792,6 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine) |
1039 |
- for (i=0;i<array->len;i++) { |
1040 |
- device = g_ptr_array_index (array, i); |
1041 |
- gpm_engine_device_add (engine, device); |
1042 |
-- gpm_engine_check_recall (engine, device); |
1043 |
- } |
1044 |
- out: |
1045 |
- if (array != NULL) |
1046 |
-@@ -846,7 +808,6 @@ gpm_engine_device_added_cb (UpClient *client, UpDevice *device, GpmEngine *engin |
1047 |
- { |
1048 |
- /* add to list */ |
1049 |
- g_ptr_array_add (engine->priv->array, g_object_ref (device)); |
1050 |
-- gpm_engine_check_recall (engine, device); |
1051 |
- |
1052 |
- gpm_engine_recalculate_state (engine); |
1053 |
- } |
1054 |
-@@ -1134,14 +1095,6 @@ gpm_engine_class_init (GpmEngineClass *klass) |
1055 |
- G_STRUCT_OFFSET (GpmEngineClass, low_capacity), |
1056 |
- NULL, NULL, g_cclosure_marshal_VOID__POINTER, |
1057 |
- G_TYPE_NONE, 1, G_TYPE_POINTER); |
1058 |
-- signals [PERHAPS_RECALL] = |
1059 |
-- g_signal_new ("perhaps-recall", |
1060 |
-- G_TYPE_FROM_CLASS (object_class), |
1061 |
-- G_SIGNAL_RUN_LAST, |
1062 |
-- G_STRUCT_OFFSET (GpmEngineClass, perhaps_recall), |
1063 |
-- NULL, NULL, gpm_marshal_VOID__POINTER_STRING_STRING, |
1064 |
-- G_TYPE_NONE, |
1065 |
-- 3, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_STRING); |
1066 |
- signals [FULLY_CHARGED] = |
1067 |
- g_signal_new ("fully-charged", |
1068 |
- G_TYPE_FROM_CLASS (object_class), |
1069 |
-diff --git a/src/gpm-engine.h b/src/gpm-engine.h |
1070 |
-index be1ccd6..43f8956 100644 |
1071 |
---- a/src/gpm-engine.h |
1072 |
-+++ b/src/gpm-engine.h |
1073 |
-@@ -49,10 +49,6 @@ typedef struct |
1074 |
- gchar *icon); |
1075 |
- void (* summary_changed) (GpmEngine *engine, |
1076 |
- gchar *status); |
1077 |
-- void (* perhaps_recall) (GpmEngine *engine, |
1078 |
-- UpDevice *device, |
1079 |
-- const gchar *oem_vendor, |
1080 |
-- const gchar *website); |
1081 |
- void (* low_capacity) (GpmEngine *engine, |
1082 |
- UpDevice *device); |
1083 |
- void (* charge_low) (GpmEngine *engine, |
1084 |
-diff --git a/src/gpm-manager.c b/src/gpm-manager.c |
1085 |
-index 6ca9dea..c4d0530 100644 |
1086 |
---- a/src/gpm-manager.c |
1087 |
-+++ b/src/gpm-manager.c |
1088 |
-@@ -68,7 +68,6 @@ |
1089 |
- static void gpm_manager_finalize (GObject *object); |
1090 |
- |
1091 |
- #define GPM_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_MANAGER, GpmManagerPrivate)) |
1092 |
--#define GPM_MANAGER_RECALL_DELAY 30 /* seconds */ |
1093 |
- #define GPM_MANAGER_NOTIFY_TIMEOUT_NEVER 0 /* ms */ |
1094 |
- #define GPM_MANAGER_NOTIFY_TIMEOUT_SHORT 10 * 1000 /* ms */ |
1095 |
- #define GPM_MANAGER_NOTIFY_TIMEOUT_LONG 30 * 1000 /* ms */ |
1096 |
-@@ -1092,111 +1091,6 @@ gpm_manager_settings_changed_cb (GSettings *settings, const gchar *key, GpmManag |
1097 |
- } |
1098 |
- |
1099 |
- /** |
1100 |
-- * gpm_manager_perhaps_recall_response_cb: |
1101 |
-- */ |
1102 |
--static void |
1103 |
--gpm_manager_perhaps_recall_response_cb (GtkDialog *dialog, gint response_id, GpmManager *manager) |
1104 |
--{ |
1105 |
-- GdkScreen *screen; |
1106 |
-- GtkWidget *dialog_error; |
1107 |
-- GError *error = NULL; |
1108 |
-- gboolean ret; |
1109 |
-- const gchar *website; |
1110 |
-- |
1111 |
-- /* don't show this again */ |
1112 |
-- if (response_id == GTK_RESPONSE_CANCEL) { |
1113 |
-- g_settings_set_boolean (manager->priv->settings, GPM_SETTINGS_NOTIFY_PERHAPS_RECALL, FALSE); |
1114 |
-- goto out; |
1115 |
-- } |
1116 |
-- |
1117 |
-- /* visit recall website */ |
1118 |
-- if (response_id == GTK_RESPONSE_OK) { |
1119 |
-- screen = gdk_screen_get_default(); |
1120 |
-- website = (const gchar *) g_object_get_data (G_OBJECT (manager), "recall-oem-website"); |
1121 |
-- ret = gtk_show_uri (screen, website, gtk_get_current_event_time (), &error); |
1122 |
-- if (!ret) { |
1123 |
-- dialog_error = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, |
1124 |
-- "Failed to show url %s", error->message); |
1125 |
-- gtk_dialog_run (GTK_DIALOG (dialog_error)); |
1126 |
-- g_error_free (error); |
1127 |
-- } |
1128 |
-- goto out; |
1129 |
-- } |
1130 |
--out: |
1131 |
-- gtk_widget_destroy (GTK_WIDGET (dialog)); |
1132 |
-- return; |
1133 |
--} |
1134 |
-- |
1135 |
--/** |
1136 |
-- * gpm_manager_perhaps_recall_delay_cb: |
1137 |
-- */ |
1138 |
--static gboolean |
1139 |
--gpm_manager_perhaps_recall_delay_cb (GpmManager *manager) |
1140 |
--{ |
1141 |
-- const gchar *oem_vendor; |
1142 |
-- gchar *title = NULL; |
1143 |
-- gchar *message = NULL; |
1144 |
-- GtkWidget *dialog; |
1145 |
-- |
1146 |
-- oem_vendor = (const gchar *) g_object_get_data (G_OBJECT (manager), "recall-oem-vendor"); |
1147 |
-- |
1148 |
-- /* TRANSLATORS: the battery may be recalled by it's vendor */ |
1149 |
-- title = g_strdup_printf ("%s: %s", GPM_NAME, _("Battery may be recalled")); |
1150 |
-- message = g_strdup_printf (_("A battery in your computer may have been " |
1151 |
-- "recalled by %s and you may be at risk.\n\n" |
1152 |
-- "For more information visit the battery recall website."), oem_vendor); |
1153 |
-- dialog = gtk_message_dialog_new_with_markup (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, |
1154 |
-- GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, |
1155 |
-- "<span size='larger'><b>%s</b></span>", title); |
1156 |
-- |
1157 |
-- gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), "%s", message); |
1158 |
-- |
1159 |
-- /* TRANSLATORS: button text, visit the manufacturers recall website */ |
1160 |
-- gtk_dialog_add_button (GTK_DIALOG (dialog), _("Visit recall website"), GTK_RESPONSE_OK); |
1161 |
-- |
1162 |
-- /* TRANSLATORS: button text, do not show this bubble again */ |
1163 |
-- gtk_dialog_add_button (GTK_DIALOG (dialog), _("Do not show me this again"), GTK_RESPONSE_CANCEL); |
1164 |
-- |
1165 |
-- /* wait async for response */ |
1166 |
-- gtk_widget_show (dialog); |
1167 |
-- g_signal_connect (dialog, "response", G_CALLBACK (gpm_manager_perhaps_recall_response_cb), manager); |
1168 |
-- |
1169 |
-- g_free (title); |
1170 |
-- g_free (message); |
1171 |
-- |
1172 |
-- /* never repeat */ |
1173 |
-- return FALSE; |
1174 |
--} |
1175 |
-- |
1176 |
--/** |
1177 |
-- * gpm_manager_engine_perhaps_recall_cb: |
1178 |
-- */ |
1179 |
--static void |
1180 |
--gpm_manager_engine_perhaps_recall_cb (GpmEngine *engine, UpDevice *device, gchar *oem_vendor, gchar *website, GpmManager *manager) |
1181 |
--{ |
1182 |
-- gboolean ret; |
1183 |
-- |
1184 |
-- /* don't show when running under GDM */ |
1185 |
-- if (g_getenv ("RUNNING_UNDER_GDM") != NULL) { |
1186 |
-- egg_debug ("running under gdm, so no notification"); |
1187 |
-- return; |
1188 |
-- } |
1189 |
-- |
1190 |
-- /* already shown, and dismissed */ |
1191 |
-- ret = g_settings_get_boolean (manager->priv->settings, GPM_SETTINGS_NOTIFY_PERHAPS_RECALL); |
1192 |
-- if (!ret) { |
1193 |
-- egg_debug ("Gsettings prevents notification: %s", GPM_SETTINGS_NOTIFY_PERHAPS_RECALL); |
1194 |
-- return; |
1195 |
-- } |
1196 |
-- |
1197 |
-- g_object_set_data_full (G_OBJECT (manager), "recall-oem-vendor", (gpointer) g_strdup (oem_vendor), (GDestroyNotify) g_free); |
1198 |
-- g_object_set_data_full (G_OBJECT (manager), "recall-oem-website", (gpointer) g_strdup (website), (GDestroyNotify) g_free); |
1199 |
-- |
1200 |
-- /* delay by a few seconds so the panel can load */ |
1201 |
-- g_timeout_add_seconds (GPM_MANAGER_RECALL_DELAY, (GSourceFunc) gpm_manager_perhaps_recall_delay_cb, manager); |
1202 |
--} |
1203 |
-- |
1204 |
--/** |
1205 |
- * gpm_manager_engine_icon_changed_cb: |
1206 |
- */ |
1207 |
- static void |
1208 |
-@@ -2023,8 +1917,6 @@ gpm_manager_init (GpmManager *manager) |
1209 |
- gpm_manager_sync_policy_sleep (manager); |
1210 |
- |
1211 |
- manager->priv->engine = gpm_engine_new (); |
1212 |
-- g_signal_connect (manager->priv->engine, "perhaps-recall", |
1213 |
-- G_CALLBACK (gpm_manager_engine_perhaps_recall_cb), manager); |
1214 |
- g_signal_connect (manager->priv->engine, "low-capacity", |
1215 |
- G_CALLBACK (gpm_manager_engine_low_capacity_cb), manager); |
1216 |
- g_signal_connect (manager->priv->engine, "icon-changed", |
1217 |
- |
1218 |
|
1219 |
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.8.1.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.8.1.ebuild |
1220 |
deleted file mode 100644 |
1221 |
index 966c3d0..0000000 |
1222 |
--- a/mate-extra/mate-power-manager/mate-power-manager-1.8.1.ebuild |
1223 |
+++ /dev/null |
1224 |
@@ -1,92 +0,0 @@ |
1225 |
-# Copyright 1999-2016 Gentoo Foundation |
1226 |
-# Distributed under the terms of the GNU General Public License v2 |
1227 |
-# $Id$ |
1228 |
- |
1229 |
-EAPI="5" |
1230 |
- |
1231 |
-GCONF_DEBUG="no" |
1232 |
- |
1233 |
-inherit autotools gnome2 versionator |
1234 |
- |
1235 |
-MATE_BRANCH="$(get_version_component_range 1-2)" |
1236 |
- |
1237 |
-SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz" |
1238 |
-DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop" |
1239 |
-HOMEPAGE="http://mate-desktop.org" |
1240 |
- |
1241 |
-LICENSE="GPL-2" |
1242 |
-SLOT="0" |
1243 |
-KEYWORDS="amd64 x86" |
1244 |
- |
1245 |
-IUSE="+applet gnome-keyring man policykit test unique" |
1246 |
- |
1247 |
-# Interactive testsuite. |
1248 |
-RESTRICT="test" |
1249 |
- |
1250 |
-COMMON_DEPEND="app-text/rarian:0 |
1251 |
- >=dev-libs/dbus-glib-0.70:0 |
1252 |
- >=dev-libs/glib-2.13:2 |
1253 |
- >=media-libs/libcanberra-0.10:0[gtk] |
1254 |
- >=sys-apps/dbus-1:0 |
1255 |
- || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) |
1256 |
- >=x11-apps/xrandr-1.2:0 |
1257 |
- >=x11-libs/cairo-1:0 |
1258 |
- >=x11-libs/gdk-pixbuf-2.11:2 |
1259 |
- >=x11-libs/gtk+-2.17.7:2 |
1260 |
- x11-libs/libX11:0 |
1261 |
- x11-libs/libXext:0 |
1262 |
- x11-libs/libXrandr:0 |
1263 |
- >=x11-libs/libnotify-0.7:0 |
1264 |
- x11-libs/pango:0 |
1265 |
- applet? ( >=mate-base/mate-panel-1.8:0 ) |
1266 |
- gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 ) |
1267 |
- unique? ( >=dev-libs/libunique-0.9.4:1 )" |
1268 |
- |
1269 |
-RDEPEND="${COMMON_DEPEND} |
1270 |
- policykit? ( >=mate-extra/mate-polkit-1.8:0 )" |
1271 |
- |
1272 |
-DEPEND="${COMMON_DEPEND} |
1273 |
- app-text/docbook-xml-dtd:4.3 |
1274 |
- >=app-text/scrollkeeper-dtd-1:1.0 |
1275 |
- app-text/yelp-tools:0 |
1276 |
- >=dev-util/intltool-0.35:* |
1277 |
- x11-proto/randrproto:0 |
1278 |
- >=x11-proto/xproto-7.0.15:0 |
1279 |
- sys-devel/gettext:* |
1280 |
- virtual/pkgconfig:* |
1281 |
- man? ( app-text/docbook-sgml-utils:0 |
1282 |
- >=app-text/docbook-sgml-dtd-4.3 )" |
1283 |
- |
1284 |
-src_prepare() { |
1285 |
- # Upstreamed patches |
1286 |
- epatch "${FILESDIR}"/${PN}-1.8.0-r1-dbus_interface_keyboard_backlight_controls.patch |
1287 |
- |
1288 |
- eautoreconf |
1289 |
- gnome2_src_prepare |
1290 |
- |
1291 |
- # This needs to be after eautoreconf to prevent problems like bug #356277 |
1292 |
- # Remove the docbook2man rules here since it's not handled by a proper |
1293 |
- # parameter in configure.in. |
1294 |
- if ! use man; then |
1295 |
- sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \ |
1296 |
- || die "docbook sed failed" |
1297 |
- fi |
1298 |
-} |
1299 |
- |
1300 |
-src_configure() { |
1301 |
- gnome2_src_configure \ |
1302 |
- $(use_enable applet applets) \ |
1303 |
- $(use_enable test tests) \ |
1304 |
- $(use_enable unique) \ |
1305 |
- $(use_with gnome-keyring keyring) \ |
1306 |
- --enable-compile-warnings=minimum \ |
1307 |
- --with-gtk=2.0 |
1308 |
-} |
1309 |
- |
1310 |
-DOCS="AUTHORS HACKING NEWS README TODO" |
1311 |
- |
1312 |
-src_test() { |
1313 |
- unset DBUS_SESSION_BUS_ADDRESS |
1314 |
- |
1315 |
- dbus-launch Xemake check || die "Test phase failed" |
1316 |
-} |