[arch-commits] Commit in xfce4-power-manager/repos (10 files)
Evangelos Foutras
foutrelis at archlinux.org
Tue Sep 16 04:04:39 UTC 2014
Date: Tuesday, September 16, 2014 @ 06:04:39
Author: foutrelis
Revision: 221799
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
xfce4-power-manager/repos/testing-i686/PKGBUILD
(from rev 221798, xfce4-power-manager/trunk/PKGBUILD)
xfce4-power-manager/repos/testing-i686/fix-handle-lid-switch.patch
(from rev 221798, xfce4-power-manager/trunk/fix-handle-lid-switch.patch)
xfce4-power-manager/repos/testing-i686/xfce4-power-manager.install
(from rev 221798, xfce4-power-manager/trunk/xfce4-power-manager.install)
xfce4-power-manager/repos/testing-x86_64/PKGBUILD
(from rev 221798, xfce4-power-manager/trunk/PKGBUILD)
xfce4-power-manager/repos/testing-x86_64/fix-handle-lid-switch.patch
(from rev 221798, xfce4-power-manager/trunk/fix-handle-lid-switch.patch)
xfce4-power-manager/repos/testing-x86_64/xfce4-power-manager.install
(from rev 221798, xfce4-power-manager/trunk/xfce4-power-manager.install)
Deleted:
xfce4-power-manager/repos/testing-i686/PKGBUILD
xfce4-power-manager/repos/testing-i686/xfce4-power-manager.install
xfce4-power-manager/repos/testing-x86_64/PKGBUILD
xfce4-power-manager/repos/testing-x86_64/xfce4-power-manager.install
--------------------------------------------+
/PKGBUILD | 96 +++++++++++++++++++++++++++
/xfce4-power-manager.install | 36 ++++++++++
testing-i686/PKGBUILD | 39 ----------
testing-i686/fix-handle-lid-switch.patch | 30 ++++++++
testing-i686/xfce4-power-manager.install | 18 -----
testing-x86_64/PKGBUILD | 39 ----------
testing-x86_64/fix-handle-lid-switch.patch | 30 ++++++++
testing-x86_64/xfce4-power-manager.install | 18 -----
8 files changed, 192 insertions(+), 114 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2014-09-16 04:04:16 UTC (rev 221798)
+++ testing-i686/PKGBUILD 2014-09-16 04:04:39 UTC (rev 221799)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
-
-pkgname=xfce4-power-manager
-pkgver=1.4.0
-pkgrel=1
-pkgdesc="Power manager for Xfce desktop"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-groups=('xfce4')
-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')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --sbindir=/usr/bin \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --disable-network-manager \
- --enable-polkit \
- --disable-debug
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: xfce4-power-manager/repos/testing-i686/PKGBUILD (from rev 221798, xfce4-power-manager/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2014-09-16 04:04:39 UTC (rev 221799)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
+
+pkgname=xfce4-power-manager
+pkgver=1.4.0
+pkgrel=2
+pkgdesc="Power manager for Xfce desktop"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+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
+ 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"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --sbindir=/usr/bin \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --disable-network-manager \
+ --enable-polkit \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: xfce4-power-manager/repos/testing-i686/fix-handle-lid-switch.patch (from rev 221798, xfce4-power-manager/trunk/fix-handle-lid-switch.patch)
===================================================================
--- testing-i686/fix-handle-lid-switch.patch (rev 0)
+++ testing-i686/fix-handle-lid-switch.patch 2014-09-16 04:04:39 UTC (rev 221799)
@@ -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
+
Deleted: testing-i686/xfce4-power-manager.install
===================================================================
--- testing-i686/xfce4-power-manager.install 2014-09-16 04:04:16 UTC (rev 221798)
+++ testing-i686/xfce4-power-manager.install 2014-09-16 04:04:39 UTC (rev 221799)
@@ -1,18 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- if (($(vercmp $2 1.4.0-1) < 0)); then
- echo ':: Xfce Power Manager no longer provides a tray icon.'
- echo ' Please add the new Power Manager Plugin to your panel.'
- fi
-
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: xfce4-power-manager/repos/testing-i686/xfce4-power-manager.install (from rev 221798, xfce4-power-manager/trunk/xfce4-power-manager.install)
===================================================================
--- testing-i686/xfce4-power-manager.install (rev 0)
+++ testing-i686/xfce4-power-manager.install 2014-09-16 04:04:39 UTC (rev 221799)
@@ -0,0 +1,18 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ if (($(vercmp $2 1.4.0-1) < 0)); then
+ echo ':: Xfce Power Manager no longer provides a tray icon.'
+ echo ' Please add the new Power Manager Plugin to your panel.'
+ fi
+
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2014-09-16 04:04:16 UTC (rev 221798)
+++ testing-x86_64/PKGBUILD 2014-09-16 04:04:39 UTC (rev 221799)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
-
-pkgname=xfce4-power-manager
-pkgver=1.4.0
-pkgrel=1
-pkgdesc="Power manager for Xfce desktop"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-groups=('xfce4')
-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')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --sbindir=/usr/bin \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --disable-network-manager \
- --enable-polkit \
- --disable-debug
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: xfce4-power-manager/repos/testing-x86_64/PKGBUILD (from rev 221798, xfce4-power-manager/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2014-09-16 04:04:39 UTC (rev 221799)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
+
+pkgname=xfce4-power-manager
+pkgver=1.4.0
+pkgrel=2
+pkgdesc="Power manager for Xfce desktop"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+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
+ 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"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --sbindir=/usr/bin \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --disable-network-manager \
+ --enable-polkit \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: xfce4-power-manager/repos/testing-x86_64/fix-handle-lid-switch.patch (from rev 221798, xfce4-power-manager/trunk/fix-handle-lid-switch.patch)
===================================================================
--- testing-x86_64/fix-handle-lid-switch.patch (rev 0)
+++ testing-x86_64/fix-handle-lid-switch.patch 2014-09-16 04:04:39 UTC (rev 221799)
@@ -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
+
Deleted: testing-x86_64/xfce4-power-manager.install
===================================================================
--- testing-x86_64/xfce4-power-manager.install 2014-09-16 04:04:16 UTC (rev 221798)
+++ testing-x86_64/xfce4-power-manager.install 2014-09-16 04:04:39 UTC (rev 221799)
@@ -1,18 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- if (($(vercmp $2 1.4.0-1) < 0)); then
- echo ':: Xfce Power Manager no longer provides a tray icon.'
- echo ' Please add the new Power Manager Plugin to your panel.'
- fi
-
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: xfce4-power-manager/repos/testing-x86_64/xfce4-power-manager.install (from rev 221798, xfce4-power-manager/trunk/xfce4-power-manager.install)
===================================================================
--- testing-x86_64/xfce4-power-manager.install (rev 0)
+++ testing-x86_64/xfce4-power-manager.install 2014-09-16 04:04:39 UTC (rev 221799)
@@ -0,0 +1,18 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ if (($(vercmp $2 1.4.0-1) < 0)); then
+ echo ':: Xfce Power Manager no longer provides a tray icon.'
+ echo ' Please add the new Power Manager Plugin to your panel.'
+ fi
+
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list