[arch-commits] Commit in cinnamon-control-center/trunk (2 files)

[Balló György]

    Date: Thursday, July 31, 2014 @ 19:24:57
  Author: bgyorgy
Revision: 116649

upgpkg: cinnamon-control-center 2.2.10-2

Apply compatibility fix for upower-0.99 (from Debian; FS#40193)

Added:
  cinnamon-control-center/trunk/upowerd-0.99-support.patch
Modified:
  cinnamon-control-center/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   15 ++++++++++++---
 upowerd-0.99-support.patch |   21 +++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-31 16:55:55 UTC (rev 116648)
+++ PKGBUILD	2014-07-31 17:24:57 UTC (rev 116649)
@@ -6,7 +6,7 @@
 
 pkgname=cinnamon-control-center
 pkgver=2.2.10
-pkgrel=1
+pkgrel=2
 pkgdesc="The Control Center for Cinnamon"
 arch=('i686' 'x86_64')
 depends=('cinnamon-settings-daemon' 'cinnamon-translations' 'cinnamon-menus'
@@ -17,9 +17,18 @@
 install=cinnamon-control-center.install
 license=('GPL')
 options=('!emptydirs')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz")
-sha256sums=('5bdd6570e5a2ac2bc4760f3cec5fe7240015f7de9e8756b949e301cf3a474cef')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz"
+        "upowerd-0.99-support.patch")
+sha256sums=('5bdd6570e5a2ac2bc4760f3cec5fe7240015f7de9e8756b949e301cf3a474cef'
+            'a1979c57addbdfc1832974f113c837507ab7ca4fec82ec5c9cf00f1db80d79ff')
 
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Compatibility fix for upower-0.99 (from Debian)
+  patch -Np1 -i ../upowerd-0.99-support.patch
+}
+
 build() {
   cd $pkgname-$pkgver
 

Added: upowerd-0.99-support.patch
===================================================================
--- upowerd-0.99-support.patch	                        (rev 0)
+++ upowerd-0.99-support.patch	2014-07-31 17:24:57 UTC (rev 116649)
@@ -0,0 +1,21 @@
+--- a/panels/power/cc-power-panel.c
++++ b/panels/power/cc-power-panel.c
+@@ -934,10 +934,18 @@
+                           -1);
+       switch (value_tmp) {
+       case CSD_POWER_ACTION_SUSPEND:
++#if UP_CHECK_VERSION(0,99,0)
++        enabled = cc_login1("CanSuspend");
++#else
+         enabled = cc_login1("CanSuspend") || up_client_get_can_suspend (self->priv->up_client);
++#endif
+         break;
+       case CSD_POWER_ACTION_HIBERNATE:
++#if UP_CHECK_VERSION(0,99,0)
++        enabled = cc_login1("CanHibernate");
++#else
+         enabled = cc_login1("CanHibernate") || up_client_get_can_hibernate (self->priv->up_client);
++#endif
+         break;
+       default:
+         enabled = TRUE;