[arch-commits] Commit in cinnamon-settings-daemon/trunk (3 files)
Balló György
bgyorgy at nymeria.archlinux.org
Fri Apr 11 05:02:43 UTC 2014
Date: Friday, April 11, 2014 @ 07:02:42
Author: bgyorgy
Revision: 109178
upgpkg: cinnamon-settings-daemon 2.0.8-5
Rebuild for upower 0.99
Added:
cinnamon-settings-daemon/trunk/cinnamon-settings-daemon-2.0.6-upower_deprecated.patch
cinnamon-settings-daemon/trunk/remove_obsolete_battery_recall_code.patch
Modified:
cinnamon-settings-daemon/trunk/PKGBUILD
--------------------------------------------------------+
PKGBUILD | 10
cinnamon-settings-daemon-2.0.6-upower_deprecated.patch | 91 +++++
remove_obsolete_battery_recall_code.patch | 242 +++++++++++++++
3 files changed, 342 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-04-11 03:52:27 UTC (rev 109177)
+++ PKGBUILD 2014-04-11 05:02:42 UTC (rev 109178)
@@ -4,7 +4,7 @@
pkgname=cinnamon-settings-daemon
pkgver=2.0.8
-pkgrel=4
+pkgrel=5
pkgdesc="The Cinnamon Settings daemon"
arch=('i686' 'x86_64')
license=('GPL')
@@ -16,11 +16,15 @@
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz"
keyboard.patch
systemd-support.patch
+ cinnamon-settings-daemon-2.0.6-upower_deprecated.patch
+ remove_obsolete_battery_recall_code.patch
automount-plugin.patch
dpms.patch)
sha256sums=('6889f021acab93d146c78fe8aa540a83a12260232e1ea5f697037a7c94c877fd'
'3c05b978cb414c8fc1530f211bab58627a64ac9c156630c9d486f5926a85109c'
'28c002628bc97e8b4a2aa7e8a8141bcc8388b250a6c3ebc09a640e110ae815a9'
+ '291855ec208974a0a59ce24707820dcb9ff04868421f185b42d86d1dc52eb0d6'
+ '4c1d917a7a70e16a5307f767c1494fa59cbc5168d9293ad66b56e17a74e8baf1'
'4fc2b3a354b53d41d92d7f95d175a6a18382330353a0579d29c2d33b9400a837'
'194cc704320a2d6be636191e96f62514f2b5f97655c200991b5690fbf3006026')
@@ -33,6 +37,10 @@
# Add systemd support for power and media-keys plugins
patch -Np1 -i ../systemd-support.patch
+ # Port to upower 0.99
+ patch -Np1 -i ../cinnamon-settings-daemon-2.0.6-upower_deprecated.patch
+ patch -Np1 -i ../remove_obsolete_battery_recall_code.patch
+
# Turn automount helper into a plugin
patch -Np1 -i ../automount-plugin.patch
Added: cinnamon-settings-daemon-2.0.6-upower_deprecated.patch
===================================================================
--- cinnamon-settings-daemon-2.0.6-upower_deprecated.patch (rev 0)
+++ cinnamon-settings-daemon-2.0.6-upower_deprecated.patch 2014-04-11 05:02:42 UTC (rev 109178)
@@ -0,0 +1,91 @@
+diff -Naur cinnamon-settings-daemon-2.0.8.orig/plugins/power/csd-power-manager.c cinnamon-settings-daemon-2.0.8/plugins/power/csd-power-manager.c
+--- cinnamon-settings-daemon-2.0.8.orig/plugins/power/csd-power-manager.c 2014-04-11 06:00:33.852563000 +0200
++++ cinnamon-settings-daemon-2.0.8/plugins/power/csd-power-manager.c 2014-04-11 06:52:24.516345019 +0200
+@@ -1171,6 +1171,7 @@
+ gboolean ret;
+ GError *error = NULL;
+
++#if ! UP_CHECK_VERSION(0,99,0)
+ /* get devices from UPower */
+ ret = up_client_enumerate_devices_sync (manager->priv->up_client, NULL, &error);
+ if (!ret) {
+@@ -1178,6 +1179,7 @@
+ g_error_free (error);
+ goto out;
+ }
++#endif
+
+ /* connected mobile phones */
+ gpm_phone_coldplug (manager->priv->phone);
+@@ -1317,7 +1319,7 @@
+ gboolean is_ups)
+ {
+ CsdPowerActionType policy;
+-
++#if ! UP_CHECK_VERSION(0,99,0)
+ policy = g_settings_get_enum (manager->priv->settings, "critical-battery-action");
+ if (policy == CSD_POWER_ACTION_SUSPEND) {
+ if (is_ups == FALSE &&
+@@ -1329,7 +1331,17 @@
+ return policy;
+ return CSD_POWER_ACTION_SHUTDOWN;
+ }
++#else
++ char *action;
+
++ action = up_client_get_critical_action (manager->priv->up_client);
++ /* We don't make the difference between HybridSleep and Hibernate */
++ if (g_strcmp0 (action, "PowerOff") == 0)
++ policy = GSD_POWER_ACTION_SHUTDOWN;
++ else
++ policy = GSD_POWER_ACTION_HIBERNATE;
++ g_free (action);
++#endif
+ return policy;
+ }
+
+@@ -2314,6 +2326,7 @@
+ "lid-close-ac-action");
+ }
+
++#if ! UP_CHECK_VERSION(0,99,0)
+ /* check we won't melt when the lid is closed */
+ if (action_type != CSD_POWER_ACTION_SUSPEND &&
+ action_type != CSD_POWER_ACTION_HIBERNATE) {
+@@ -2326,6 +2339,7 @@
+ lock_screensaver (manager);
+ }
+ }
++#endif
+
+ /* ensure we turn the panel back on after resume */
+ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
+@@ -3886,6 +3900,7 @@
+ inhibit_suspend (manager);
+ }
+
++#if ! UP_CHECK_VERSION(0,99,0)
+ static void
+ upower_notify_sleep_cb (UpClient *client,
+ UpSleepKind sleep_kind,
+@@ -3901,6 +3916,7 @@
+ {
+ handle_resume_actions (manager);
+ }
++#endif
+
+ static void
+ logind_proxy_signal_cb (GDBusProxy *proxy,
+@@ -4021,10 +4037,12 @@
+ G_CALLBACK (engine_settings_key_changed_cb), manager);
+ manager->priv->settings_screensaver = g_settings_new ("org.cinnamon.desktop.screensaver");
+ manager->priv->up_client = up_client_new ();
++#if ! UP_CHECK_VERSION(0,99,0)
+ g_signal_connect (manager->priv->up_client, "notify-sleep",
+ G_CALLBACK (upower_notify_sleep_cb), manager);
+ g_signal_connect (manager->priv->up_client, "notify-resume",
+ G_CALLBACK (upower_notify_resume_cb), manager);
++#endif
+ manager->priv->lid_is_closed = up_client_get_lid_is_closed (manager->priv->up_client);
+ g_signal_connect (manager->priv->up_client, "device-added",
+ G_CALLBACK (engine_device_added_cb), manager);
Added: remove_obsolete_battery_recall_code.patch
===================================================================
--- remove_obsolete_battery_recall_code.patch (rev 0)
+++ remove_obsolete_battery_recall_code.patch 2014-04-11 05:02:42 UTC (rev 109178)
@@ -0,0 +1,242 @@
+diff -uNrp a/data/org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in b/data/org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in
+--- a/data/org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in 2013-11-03 15:50:04.000000000 +0000
++++ b/data/org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in 2013-11-09 12:39:50.907354689 +0000
+@@ -141,11 +141,6 @@
+ <_summary>Whether to use time-based notifications</_summary>
+ <_description>If time based notifications should be used. If set to false, then the percentage change is used instead, which may fix a broken ACPI BIOS.</_description>
+ </key>
+- <key name="notify-perhaps-recall" type="b">
+- <default>true</default>
+- <_summary>If we should show the recalled battery warning for a broken battery</_summary>
+- <_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>
+- </key>
+ <key name="lock-on-suspend" type="b">
+ <default>false</default>
+ <_summary>If the computer should lock when entering suspend mode</_summary>
+diff -uNrp a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c
+--- a/plugins/power/csd-power-manager.c 2013-11-03 15:50:04.000000000 +0000
++++ b/plugins/power/csd-power-manager.c 2013-11-09 12:38:55.358363329 +0000
+@@ -75,7 +75,6 @@
+ #define CSD_POWER_MANAGER_NOTIFY_TIMEOUT_LONG 30 * 1000 /* ms */
+
+ #define CSD_POWER_MANAGER_CRITICAL_ALERT_TIMEOUT 5 /* seconds */
+-#define CSD_POWER_MANAGER_RECALL_DELAY 30 /* seconds */
+ #define CSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT 30 /* seconds */
+
+ /* Keep this in sync with gnome-shell */
+@@ -930,146 +929,9 @@ out:
+ return device;
+ }
+
+-typedef struct {
+- CsdPowerManager *manager;
+- UpDevice *device;
+-} CsdPowerManagerRecallData;
+-
+-static void
+-device_perhaps_recall_response_cb (GtkDialog *dialog,
+- gint response_id,
+- CsdPowerManagerRecallData *recall_data)
+-{
+- GdkScreen *screen;
+- GtkWidget *dialog_error;
+- GError *error = NULL;
+- gboolean ret;
+- gchar *website = NULL;
+-
+- /* don't show this again */
+- if (response_id == GTK_RESPONSE_CANCEL) {
+- g_settings_set_boolean (recall_data->manager->priv->settings,
+- "notify-perhaps-recall",
+- FALSE);
+- goto out;
+- }
+-
+- /* visit recall website */
+- if (response_id == GTK_RESPONSE_OK) {
+-
+- g_object_get (recall_data->device,
+- "recall-url", &website,
+- NULL);
+-
+- screen = gdk_screen_get_default();
+- ret = gtk_show_uri (screen,
+- website,
+- gtk_get_current_event_time (),
+- &error);
+- if (!ret) {
+- dialog_error = gtk_message_dialog_new (NULL,
+- GTK_DIALOG_MODAL,
+- GTK_MESSAGE_INFO,
+- GTK_BUTTONS_OK,
+- "Failed to show url %s",
+- error->message);
+- gtk_dialog_run (GTK_DIALOG (dialog_error));
+- g_error_free (error);
+- }
+- }
+-out:
+- gtk_widget_destroy (GTK_WIDGET (dialog));
+- g_object_unref (recall_data->device);
+- g_object_unref (recall_data->manager);
+- g_free (recall_data);
+- g_free (website);
+- return;
+-}
+-
+-static gboolean
+-device_perhaps_recall_delay_cb (gpointer user_data)
+-{
+- gchar *vendor;
+- const gchar *title = NULL;
+- GString *message = NULL;
+- GtkWidget *dialog;
+- CsdPowerManagerRecallData *recall_data = (CsdPowerManagerRecallData *) user_data;
+-
+- g_object_get (recall_data->device,
+- "recall-vendor", &vendor,
+- NULL);
+-
+- /* TRANSLATORS: the battery may be recalled by its vendor */
+- title = _("Battery may be recalled");
+- message = g_string_new ("");
+- g_string_append_printf (message,
+- _("A battery in your computer may have been "
+- "recalled by %s and you may be at risk."), vendor);
+- g_string_append (message, "\n\n");
+- g_string_append (message, _("For more information visit the battery recall website."));
+- dialog = gtk_message_dialog_new_with_markup (NULL,
+- GTK_DIALOG_DESTROY_WITH_PARENT,
+- GTK_MESSAGE_INFO,
+- GTK_BUTTONS_CLOSE,
+- "<span size='larger'><b>%s</b></span>",
+- title);
+- gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog),
+- "%s", message->str);
+-
+- /* TRANSLATORS: button text, visit the manufacturers recall website */
+- gtk_dialog_add_button (GTK_DIALOG (dialog), _("Visit recall website"),
+- GTK_RESPONSE_OK);
+-
+- /* TRANSLATORS: button text, do not show this bubble again */
+- gtk_dialog_add_button (GTK_DIALOG (dialog), _("Do not show me this again"),
+- GTK_RESPONSE_CANCEL);
+-
+- gtk_widget_show (dialog);
+- g_signal_connect (dialog, "response",
+- G_CALLBACK (device_perhaps_recall_response_cb),
+- recall_data);
+-
+- g_string_free (message, TRUE);
+- g_free (vendor);
+- return FALSE;
+-}
+-
+-static void
+-device_perhaps_recall (CsdPowerManager *manager, UpDevice *device)
+-{
+- gboolean ret;
+- guint timer_id;
+- CsdPowerManagerRecallData *recall_data;
+-
+- /* don't show when running under GDM */
+- if (g_getenv ("RUNNING_UNDER_GDM") != NULL) {
+- g_debug ("running under gdm, so no notification");
+- return;
+- }
+-
+- /* already shown, and dismissed */
+- ret = g_settings_get_boolean (manager->priv->settings,
+- "notify-perhaps-recall");
+- if (!ret) {
+- g_debug ("settings prevents recall notification");
+- return;
+- }
+-
+- recall_data = g_new0 (CsdPowerManagerRecallData, 1);
+- recall_data->manager = g_object_ref (manager);
+- recall_data->device = g_object_ref (device);
+-
+- /* delay by a few seconds so the session can load */
+- timer_id = g_timeout_add_seconds (CSD_POWER_MANAGER_RECALL_DELAY,
+- device_perhaps_recall_delay_cb,
+- recall_data);
+- g_source_set_name_by_id (timer_id, "[CsdPowerManager] perhaps-recall");
+-}
+-
+ static void
+ engine_device_add (CsdPowerManager *manager, UpDevice *device)
+ {
+- gboolean recall_notice;
+ CsdPowerManagerWarning warning;
+ UpDeviceState state;
+ UpDeviceKind kind;
+@@ -1085,7 +947,6 @@ engine_device_add (CsdPowerManager *mana
+ g_object_get (device,
+ "kind", &kind,
+ "state", &state,
+- "recall-notice", &recall_notice,
+ NULL);
+
+ /* add old state for transitions */
+@@ -1109,43 +970,6 @@ engine_device_add (CsdPowerManager *mana
+ "engine-state-old",
+ GUINT_TO_POINTER(state));
+ }
+-
+- /* the device is recalled */
+- if (recall_notice)
+- device_perhaps_recall (manager, device);
+-}
+-
+-static gboolean
+-engine_check_recall (CsdPowerManager *manager, UpDevice *device)
+-{
+- UpDeviceKind kind;
+- gboolean recall_notice = FALSE;
+- gchar *recall_vendor = NULL;
+- gchar *recall_url = NULL;
+-
+- /* get device properties */
+- g_object_get (device,
+- "kind", &kind,
+- "recall-notice", &recall_notice,
+- "recall-vendor", &recall_vendor,
+- "recall-url", &recall_url,
+- NULL);
+-
+- /* not battery */
+- if (kind != UP_DEVICE_KIND_BATTERY)
+- goto out;
+-
+- /* no recall data */
+- if (!recall_notice)
+- goto out;
+-
+- /* emit signal for manager */
+- g_debug ("** EMIT: perhaps-recall");
+- g_debug ("%s-%s", recall_vendor, recall_url);
+-out:
+- g_free (recall_vendor);
+- g_free (recall_url);
+- return recall_notice;
+ }
+
+ static gboolean
+@@ -1177,7 +1001,6 @@ engine_coldplug (CsdPowerManager *manage
+ for (i = 0; array != NULL && i < array->len; i++) {
+ device = g_ptr_array_index (array, i);
+ engine_device_add (manager, device);
+- engine_check_recall (manager, device);
+ }
+ out:
+ if (array != NULL)
+@@ -1191,8 +1014,6 @@ engine_device_added_cb (UpClient *client
+ {
+ /* add to list */
+ g_ptr_array_add (manager->priv->devices_array, g_object_ref (device));
+- engine_check_recall (manager, device);
+-
+ engine_recalculate_state (manager);
+ }
+
More information about the arch-commits
mailing list