[arch-commits] Commit in xfce4-power-manager/trunk (2 files)

[Evangelos Foutras]

    Date: Tuesday, September 16, 2014 @ 06:04:16
  Author: foutrelis
Revision: 221798

upgpkg: xfce4-power-manager 1.4.0-2

Fix handling of lid switch.

Added:
  xfce4-power-manager/trunk/fix-handle-lid-switch.patch
Modified:
  xfce4-power-manager/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   15 ++++++++++++---
 fix-handle-lid-switch.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-16 02:46:19 UTC (rev 221797)
+++ PKGBUILD	2014-09-16 04:04:16 UTC (rev 221798)
@@ -4,7 +4,7 @@
 
 pkgname=xfce4-power-manager
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Power manager for Xfce desktop"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
@@ -13,9 +13,18 @@
 depends=('xfce4-panel' 'upower' 'libnotify' 'hicolor-icon-theme')
 makedepends=('intltool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/apps/$pkgname/1.4/$pkgname-$pkgver.tar.bz2)
-sha256sums=('3fba9d1bdb2f535e5a5c2a832503368d26629d6fe496c547fa93a3278d2cf6e7')
+source=(http://archive.xfce.org/src/apps/$pkgname/1.4/$pkgname-$pkgver.tar.bz2
+        fix-handle-lid-switch.patch)
+sha256sums=('3fba9d1bdb2f535e5a5c2a832503368d26629d6fe496c547fa93a3278d2cf6e7'
+            '18ff68052e7a3ab3df920bed1b3add4e8f22dd99a05cdf3b50e5cac45e4c719c')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # https://bugzilla.xfce.org/show_bug.cgi?id=11160
+  patch -Np1 -i ../fix-handle-lid-switch.patch
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 

Added: fix-handle-lid-switch.patch
===================================================================
--- fix-handle-lid-switch.patch	                        (rev 0)
+++ fix-handle-lid-switch.patch	2014-09-16 04:04:16 UTC (rev 221798)
@@ -0,0 +1,30 @@
+From d61db320d8a893a292812256470a873c7ce1b35d Mon Sep 17 00:00:00 2001
+From: Eric Koegel <eric.koegel at gmail.com>
+Date: Mon, 15 Sep 2014 14:35:00 +0300
+Subject: [PATCH] Fix handle lid switch with loginD (Bug 11160)
+
+The xfconf settings logic for logind interactions were inverted
+in commit: 03193df6cad651841e8d9960335b4a3bf13afdad
+However the handle lid switch in the xfpm_manager_lid_changed_cb
+also needs to be inverted. This patch fixes it. Patch submitted
+by Simon P.
+---
+ src/xfpm-manager.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/xfpm-manager.c b/src/xfpm-manager.c
+index d6c533c..9549b66 100644
+--- a/src/xfpm-manager.c
++++ b/src/xfpm-manager.c
+@@ -335,7 +335,7 @@ xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManag
+               LOGIND_HANDLE_LID_SWITCH, &logind_handle_lid_switch,
+               NULL);
+ 
+-        if (!logind_handle_lid_switch)
++        if (logind_handle_lid_switch)
+             return;
+     }
+ 
+-- 
+2.1.0
+