[arch-commits] Commit in cinnamon-settings-daemon/trunk (4 files)
Balló György
bgyorgy at nymeria.archlinux.org
Fri Apr 11 16:14:07 UTC 2014
Date: Friday, April 11, 2014 @ 18:14:07
Author: bgyorgy
Revision: 109206
Fix regressions in previous patches (FS#39609)
Added:
cinnamon-settings-daemon/trunk/fix-lock-on-suspend.patch
cinnamon-settings-daemon/trunk/upower_deprecated.patch
Modified:
cinnamon-settings-daemon/trunk/PKGBUILD
Deleted:
cinnamon-settings-daemon/trunk/cinnamon-settings-daemon-2.0.6-upower_deprecated.patch
--------------------------------------------------------+
PKGBUILD | 13 +
cinnamon-settings-daemon-2.0.6-upower_deprecated.patch | 91 ------------
fix-lock-on-suspend.patch | 109 +++++++++++++++
upower_deprecated.patch | 81 +++++++++++
4 files changed, 199 insertions(+), 95 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-04-11 12:38:36 UTC (rev 109205)
+++ PKGBUILD 2014-04-11 16:14:07 UTC (rev 109206)
@@ -4,7 +4,7 @@
pkgname=cinnamon-settings-daemon
pkgver=2.0.8
-pkgrel=5
+pkgrel=6
pkgdesc="The Cinnamon Settings daemon"
arch=('i686' 'x86_64')
license=('GPL')
@@ -16,15 +16,17 @@
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
+ upower_deprecated.patch
remove_obsolete_battery_recall_code.patch
+ fix-lock-on-suspend.patch
automount-plugin.patch
dpms.patch)
sha256sums=('6889f021acab93d146c78fe8aa540a83a12260232e1ea5f697037a7c94c877fd'
'3c05b978cb414c8fc1530f211bab58627a64ac9c156630c9d486f5926a85109c'
'28c002628bc97e8b4a2aa7e8a8141bcc8388b250a6c3ebc09a640e110ae815a9'
- '291855ec208974a0a59ce24707820dcb9ff04868421f185b42d86d1dc52eb0d6'
+ 'cde7cdfe5222796d651df542526fcad2cbf0bb3a6001b31084586d1232ee6771'
'4c1d917a7a70e16a5307f767c1494fa59cbc5168d9293ad66b56e17a74e8baf1'
+ '1292c5c6a5fbf7f3db462bb8b71a75e651ea165cbd6adfd334776ccb76bdcdba'
'4fc2b3a354b53d41d92d7f95d175a6a18382330353a0579d29c2d33b9400a837'
'194cc704320a2d6be636191e96f62514f2b5f97655c200991b5690fbf3006026')
@@ -38,9 +40,12 @@
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 ../upower_deprecated.patch
patch -Np1 -i ../remove_obsolete_battery_recall_code.patch
+ # Fix regressions in the previous patches
+ patch -Np1 -i ../fix-lock-on-suspend.patch
+
# Turn automount helper into a plugin
patch -Np1 -i ../automount-plugin.patch
Deleted: cinnamon-settings-daemon-2.0.6-upower_deprecated.patch
===================================================================
--- cinnamon-settings-daemon-2.0.6-upower_deprecated.patch 2014-04-11 12:38:36 UTC (rev 109205)
+++ cinnamon-settings-daemon-2.0.6-upower_deprecated.patch 2014-04-11 16:14:07 UTC (rev 109206)
@@ -1,91 +0,0 @@
-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: fix-lock-on-suspend.patch
===================================================================
--- fix-lock-on-suspend.patch (rev 0)
+++ fix-lock-on-suspend.patch 2014-04-11 16:14:07 UTC (rev 109206)
@@ -0,0 +1,109 @@
+From 45ba88f2798dd66a289953d76cee7ea1c28fa088 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Fri, 11 Apr 2014 16:09:05 +0200
+Subject: [PATCH 1/3] Make lock-on-suspend independent form lock-enabled
+
+This was a regression in my logind support patch.
+---
+ plugins/power/csd-power-manager.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c
+index 8db93b5..ea626a5 100644
+--- a/plugins/power/csd-power-manager.c
++++ b/plugins/power/csd-power-manager.c
+@@ -3678,7 +3678,15 @@ handle_suspend_actions (CsdPowerManager *manager)
+ do_lock = g_settings_get_boolean (manager->priv->settings,
+ "lock-on-suspend");
+ if (do_lock)
+- lock_screensaver (manager);
++ g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
++ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
++ NULL,
++ GS_DBUS_NAME,
++ GS_DBUS_PATH,
++ GS_DBUS_INTERFACE,
++ NULL,
++ sleep_cb_screensaver_proxy_ready_cb,
++ manager);
+
+ /* lift the delay inhibit, so logind can proceed */
+ uninhibit_suspend (manager);
+--
+1.9.1
+
+
+From 898f866fed431f27b2203566b240ea2280260e83 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Fri, 11 Apr 2014 16:29:59 +0200
+Subject: [PATCH 2/3] Lock screen when lid closed
+
+This was a regression in the upower-1.0 patch.
+---
+ plugins/power/csd-power-manager.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c
+index ea626a5..e28faae 100644
+--- a/plugins/power/csd-power-manager.c
++++ b/plugins/power/csd-power-manager.c
+@@ -2146,10 +2146,10 @@ suspend_with_lid_closed (CsdPowerManager *manager)
+ "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) {
++#if ! UP_CHECK_VERSION(0,99,0)
+ if (up_client_get_lid_force_sleep (manager->priv->up_client)) {
+ g_warning ("to prevent damage, now forcing suspend");
+ do_power_action_type (manager, CSD_POWER_ACTION_SUSPEND);
+@@ -2158,8 +2158,10 @@ suspend_with_lid_closed (CsdPowerManager *manager)
+ /* maybe lock the screen if the lid is closed */
+ lock_screensaver (manager);
+ }
+- }
++#else
++ lock_screensaver (manager);
+ #endif
++ }
+
+ /* ensure we turn the panel back on after resume */
+ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
+--
+1.9.1
+
+
+From 5dfc5f50b762c431ed7f9da2d07d08e1fd4f1376 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Fri, 11 Apr 2014 16:46:52 +0200
+Subject: [PATCH 3/3] Really fix the error with merge
+
+---
+ plugins/power/csd-power-manager.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c
+index e28faae..a72f645 100644
+--- a/plugins/power/csd-power-manager.c
++++ b/plugins/power/csd-power-manager.c
+@@ -3730,6 +3730,7 @@ handle_resume_actions (CsdPowerManager *manager)
+ inhibit_suspend (manager);
+ }
+
++#if ! UP_CHECK_VERSION(0,99,0)
+ static void
+ upower_notify_sleep_cb (UpClient *client,
+ UpSleepKind sleep_kind,
+@@ -3745,6 +3746,7 @@ upower_notify_resume_cb (UpClient *client,
+ {
+ handle_resume_actions (manager);
+ }
++#endif
+
+ static void
+ logind_proxy_signal_cb (GDBusProxy *proxy,
+--
+1.9.1
+
Added: upower_deprecated.patch
===================================================================
--- upower_deprecated.patch (rev 0)
+++ upower_deprecated.patch 2014-04-11 16:14:07 UTC (rev 109206)
@@ -0,0 +1,81 @@
+From 44d6bf66141b8cf772d8299106e9fd7fda6a21e3 Mon Sep 17 00:00:00 2001
+From: leigh123linux <leigh123linux at googlemail.com>
+Date: Fri, 8 Nov 2013 09:04:44 +0000
+Subject: [PATCH] upower-1.0 changes
+
+---
+ plugins/power/csd-power-manager.c | 17 +++++++++++++++--
+ 1 file changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c
+index a8efe08..bae3298 100644
+--- a/plugins/power/csd-power-manager.c
++++ b/plugins/power/csd-power-manager.c
+@@ -1157,6 +1157,7 @@ engine_coldplug (CsdPowerManager *manager)
+ 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) {
+@@ -1164,6 +1165,7 @@ engine_coldplug (CsdPowerManager *manager)
+ g_error_free (error);
+ goto out;
+ }
++#endif
+
+ /* connected mobile phones */
+ gpm_phone_coldplug (manager->priv->phone);
+@@ -1306,12 +1308,17 @@ manager_critical_action_get (CsdPowerManager *manager,
+
+ policy = g_settings_get_enum (manager->priv->settings, "critical-battery-action");
+ if (policy == CSD_POWER_ACTION_SUSPEND) {
+- if (is_ups == FALSE &&
+- up_client_get_can_suspend (manager->priv->up_client))
++ if (is_ups == FALSE
++#if ! UP_CHECK_VERSION(0,99,0)
++ && up_client_get_can_suspend (manager->priv->up_client)
++#endif
++ )
+ return policy;
+ return CSD_POWER_ACTION_SHUTDOWN;
+ } else if (policy == CSD_POWER_ACTION_HIBERNATE) {
++#if ! UP_CHECK_VERSION(0,99,0)
+ if (up_client_get_can_hibernate (manager->priv->up_client))
++#endif
+ return policy;
+ return CSD_POWER_ACTION_SHUTDOWN;
+ }
+@@ -2300,6 +2307,7 @@ suspend_with_lid_closed (CsdPowerManager *manager)
+ "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) {
+@@ -2312,6 +2320,7 @@ suspend_with_lid_closed (CsdPowerManager *manager)
+ lock_screensaver (manager);
+ }
+ }
++#endif
+
+ /* ensure we turn the panel back on after resume */
+ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
+@@ -3838,10 +3849,12 @@ csd_power_manager_start (CsdPowerManager *manager,
+ 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);
+--
+1.9.1
+
More information about the arch-commits
mailing list