[cinnamon-settings-daemon] upower breakage (#1026036)

[Rex Dieter]

commit 25b5581a2871b2df1c17a26096236af78b90be1e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Nov 7 11:20:12 2013 -0600

    upower breakage (#1026036)
    
    create --disable-upower-deprecated build option
    Future TODO, replace with login1 equivalent apis, where appropriate

 ...n-settings-daemon-2.0.6-upower_deprecated.patch |   56 ++++++++++++++++++++
 cinnamon-settings-daemon.spec                      |    9 +++-
 2 files changed, 63 insertions(+), 2 deletions(-)
---
diff --git a/cinnamon-settings-daemon-2.0.6-upower_deprecated.patch b/cinnamon-settings-daemon-2.0.6-upower_deprecated.patch
new file mode 100644
index 0000000..e4b2b99
--- /dev/null
+++ b/cinnamon-settings-daemon-2.0.6-upower_deprecated.patch
@@ -0,0 +1,56 @@
+diff -up cinnamon-settings-daemon-2.0.6/configure.ac.upower_deprecated cinnamon-settings-daemon-2.0.6/configure.ac
+--- cinnamon-settings-daemon-2.0.6/configure.ac.upower_deprecated	2013-11-07 11:06:41.636497971 -0600
++++ cinnamon-settings-daemon-2.0.6/configure.ac	2013-11-07 11:12:07.937561424 -0600
+@@ -254,6 +254,15 @@ if test x$have_gudev != xno; then
+ 	)
+ fi
+ 
++AC_ARG_ENABLE([upower-deprecated],
++              AS_HELP_STRING([--enable-upower-deprecated], [Enable use of deprecated upower-glib apis]),
++              [with_upower=$enableval],
++              [with_upower=auto])
++if test "$with_upower" = "yes" ; then
++  AC_DEFINE(HAVE_UPOWER_DEPRECATED, 1, [Define if using deprecated upower-glib apis])
++fi
++AM_CONDITIONAL(WITH_UPOWER, [test "$with_upower" = "yes"], [Using deprecated upower-glib apis])
++
+ dnl ---------------------------------------------------------------------------
+ dnl - color
+ dnl ---------------------------------------------------------------------------
+diff -up cinnamon-settings-daemon-2.0.6/plugins/power/Makefile.am.upower_deprecated cinnamon-settings-daemon-2.0.6/plugins/power/Makefile.am
+diff -up cinnamon-settings-daemon-2.0.6/plugins/power/csd-power-manager.c.upower_deprecated cinnamon-settings-daemon-2.0.6/plugins/power/csd-power-manager.c
+--- cinnamon-settings-daemon-2.0.6/plugins/power/csd-power-manager.c.upower_deprecated	2013-11-03 09:50:04.000000000 -0600
++++ cinnamon-settings-daemon-2.0.6/plugins/power/csd-power-manager.c	2013-11-07 11:06:41.658497571 -0600
+@@ -1306,12 +1306,17 @@ manager_critical_action_get (CsdPowerMan
+ 
+         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
++#ifdef HAVE_UPOWER_DEPRECATED
++                    && up_client_get_can_suspend (manager->priv->up_client)
++#endif
++                )
+                         return policy;
+                 return CSD_POWER_ACTION_SHUTDOWN;
+         } else if (policy == CSD_POWER_ACTION_HIBERNATE) {
++#ifdef HAVE_UPOWER_DEPRECATED
+                 if (up_client_get_can_hibernate (manager->priv->up_client))
++#endif
+                         return policy;
+                 return CSD_POWER_ACTION_SHUTDOWN;
+         }
+@@ -3838,10 +3843,12 @@ csd_power_manager_start (CsdPowerManager
+                           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 ();
++#ifdef HAVE_UPOWER_DEPRECATED
+         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);
diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec
index 3b44df8..323356f 100644
--- a/cinnamon-settings-daemon.spec
+++ b/cinnamon-settings-daemon.spec
@@ -2,7 +2,7 @@
 
 Name:           cinnamon-settings-daemon
 Version:        2.0.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The daemon sharing settings from CINNAMON to GTK+/KDE applications
 
 Group:          System Environment/Daemons
@@ -13,6 +13,7 @@ URL:            http://cinnamon.linuxmint.com
 Source0:        http://leigh123linux.fedorapeople.org/pub/cinnamon-settings-daemon/source/cinnamon-settings-daemon-%{version}.tar.gz
 Patch0:         keyboard.patch
 Patch1:         add_mpris_support.patch
+Patch2:         cinnamon-settings-daemon-2.0.6-upower_deprecated.patch
 
 Requires:       cinnamon-control-center-filesystem
 Obsoletes:      cinnamon-settings-daemon-updates
@@ -66,12 +67,13 @@ echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac
 %if 0%{?fedora} > 19
 %patch1 -p1
 %endif
+%patch2 -p1 -b .upower_deprecated
 NOCONFIGURE=1 ./autogen.sh
 
 %build
 %configure --disable-static \
            --enable-profiling \
-           --enable-systemd
+           --enable-systemd --disable-upower-deprecated
 make V=1 %{?_smp_mflags}
 
 
@@ -129,6 +131,9 @@ fi
 
 
 %changelog
+* Thu Nov 07 2013 Rex Dieter <rdieter at fedoraproject.org> - 2.0.6-4
+- upower breakage (#1026036)
+
 * Mon Nov 04 2013 Leigh Scott <leigh123linux at googlemail.com> - 2.0.6-3
 - add conditional as f19 glib is too old