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

[Balló György]

    Date: Saturday, April 19, 2014 @ 04:38:55
  Author: bgyorgy
Revision: 109806

upgpkg: cinnamon-settings-daemon 2.2.1-2

Fix close lid action with upower 0.99, enable wacom support

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

------------------+
 PKGBUILD         |   19 ++++++++++++++-----
 upower_lid.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-19 02:06:46 UTC (rev 109805)
+++ PKGBUILD	2014-04-19 02:38:55 UTC (rev 109806)
@@ -4,19 +4,28 @@
 
 pkgname=cinnamon-settings-daemon
 pkgver=2.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The Cinnamon Settings daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('cinnamon-desktop' 'libibus' 'libcanberra-pulse' 'librsvg' 'nss'
-         'pulseaudio-alsa' 'upower' 'libnotify' 'libgnomekbd')
-makedepends=('intltool' 'docbook-xsl' 'gnome-common')
+         'pulseaudio-alsa' 'upower' 'libnotify' 'libgnomekbd' 'libwacom')
+makedepends=('intltool' 'docbook-xsl' 'gnome-common' 'xf86-input-wacom')
 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")
-sha256sums=('89798977ad44fa4cfaff26d93e21b29f1a9a6a68a1c57c30e5414ad2159a849e')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz"
+        "upower_lid.patch")
+sha256sums=('89798977ad44fa4cfaff26d93e21b29f1a9a6a68a1c57c30e5414ad2159a849e'
+            '4a94ab880a903c88929ecbfc465cb46aadf30ee14930274fa0eefb7a12f4e3b8')
 
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Fix close lid action with upower 0.99
+  patch -Np1 -i ../upower_lid.patch
+}
+
 build() {
   cd $pkgname-$pkgver
 

Added: upower_lid.patch
===================================================================
--- upower_lid.patch	                        (rev 0)
+++ upower_lid.patch	2014-04-19 02:38:55 UTC (rev 109806)
@@ -0,0 +1,28 @@
+--- 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 */