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

[Alexandre Filgueira]

    Date: Wednesday, October 1, 2014 @ 03:50:58
  Author: faidoc
Revision: 119903

upgpkg: cinnamon-control-center 2.2.11-1

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

----------------------------+
 PKGBUILD                   |   12 ++++--------
 upowerd-0.99-support.patch |   21 ---------------------
 2 files changed, 4 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2014-09-30 20:45:55 UTC (rev 119902)
+++ PKGBUILD    2014-10-01 01:50:58 UTC (rev 119903)
@@ -5,8 +5,8 @@
 # Jan de Groot <j...@archlinux.org>
 
 pkgname=cinnamon-control-center
-pkgver=2.2.10
-pkgrel=3
+pkgver=2.2.11
+pkgrel=1
 pkgdesc="The Control Center for Cinnamon"
 arch=('i686' 'x86_64')
 depends=('cinnamon-settings-daemon' 'cinnamon-translations' 'cinnamon-menus'
@@ -17,16 +17,12 @@
 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";
-        "upowerd-0.99-support.patch")
-sha256sums=('5bdd6570e5a2ac2bc4760f3cec5fe7240015f7de9e8756b949e301cf3a474cef'
-            'a1979c57addbdfc1832974f113c837507ab7ca4fec82ec5c9cf00f1db80d79ff')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz";)
+sha256sums=('9cd9d9dcad3a6f9a1957f3c92a2be5316dd74a91e9efa62a6e5f9fada110929f')
 
 prepare() {
   cd $pkgname-$pkgver
 
-  # Compatibility fix for upower-0.99 (from Debian)
-  patch -Np1 -i ../upowerd-0.99-support.patch
 }
 
 build() {

Deleted: upowerd-0.99-support.patch
===================================================================
--- upowerd-0.99-support.patch  2014-09-30 20:45:55 UTC (rev 119902)
+++ upowerd-0.99-support.patch  2014-10-01 01:50:58 UTC (rev 119903)
@@ -1,21 +0,0 @@
---- 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;