[arch-commits] Commit in cinnamon-settings-daemon/trunk (PKGBUILD upower_lid.patch)

[Alexandre Filgueira]

    Date: Saturday, May 3, 2014 @ 19:34:19
  Author: faidoc
Revision: 110556

upgpkg: cinnamon-settings-daemon 2.2.2-1

Modified:
  cinnamon-settings-daemon/trunk/PKGBUILD
Deleted:
  cinnamon-settings-daemon/trunk/upower_lid.patch

------------------+
 PKGBUILD         |   13 ++++---------
 upower_lid.patch |   28 ----------------------------
 2 files changed, 4 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-03 17:27:50 UTC (rev 110555)
+++ PKGBUILD	2014-05-03 17:34:19 UTC (rev 110556)
@@ -3,8 +3,8 @@
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=cinnamon-settings-daemon
-pkgver=2.2.1
-pkgrel=3
+pkgver=2.2.2
+pkgrel=1
 pkgdesc="The Cinnamon Settings daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,16 +14,11 @@
 options=('!emptydirs')
 install=cinnamon-settings-daemon.install
 url="https://github.com/linuxmint/cinnamon-settings-daemon"
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz"
-        "upower_lid.patch")
-sha256sums=('89798977ad44fa4cfaff26d93e21b29f1a9a6a68a1c57c30e5414ad2159a849e'
-            '4a94ab880a903c88929ecbfc465cb46aadf30ee14930274fa0eefb7a12f4e3b8')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz")
+sha256sums=('4a7f7fdb1ce7d889634bf0f5f5a3391b4209400262037dae899fb5071d3fee61')
 
 prepare() {
   cd $pkgname-$pkgver
-
-  # Fix close lid action with upower 0.99
-  patch -Np1 -i ../upower_lid.patch
 }
 
 build() {

Deleted: upower_lid.patch
===================================================================
--- upower_lid.patch	2014-05-03 17:27:50 UTC (rev 110555)
+++ upower_lid.patch	2014-05-03 17:34:19 UTC (rev 110556)
@@ -1,28 +0,0 @@
---- a/plugins/power/csd-power-manager.c
-+++ b/plugins/power/csd-power-manager.c
-@@ -2215,7 +2215,11 @@ do_lid_closed_action (CsdPowerManager *m
- 
- 
- static void
-+#if UP_CHECK_VERSION(0,99,0)
-+lid_state_changed_cb (UpClient *client, GParamSpec *pspec, CsdPowerManager *manager)
-+#else
- up_client_changed_cb (UpClient *client, CsdPowerManager *manager)
-+#endif
- {
-         gboolean tmp;
- 
-@@ -3967,8 +3971,13 @@ csd_power_manager_start (CsdPowerManager
-                           G_CALLBACK (engine_device_removed_cb), manager);
-         g_signal_connect (manager->priv->up_client, "device-changed",
-                           G_CALLBACK (engine_device_changed_cb), manager);
-+#if UP_CHECK_VERSION(0,99,0)
-+        g_signal_connect_after (manager->priv->up_client, "notify::lid-is-closed",
-+                                G_CALLBACK (lid_state_changed_cb), manager);
-+#else
-         g_signal_connect_after (manager->priv->up_client, "changed",
-                                 G_CALLBACK (up_client_changed_cb), manager);
-+#endif
- 
-         /* use the fallback name from gnome-power-manager so the shell
-          * blocks this, and uses the power extension instead */