[arch-commits] Commit in xfce4-session/trunk (3 files)

[andyrtr at archlinux.org]

    Date: Tuesday, January 4, 2011 @ 13:49:02
  Author: andyrtr
Revision: 104678

upgpkg: xfce4-session 4.7.3-1
new upstream release - part of Xfce 4.8pre3 release candidate

Added:
  xfce4-session/trunk/org.freedesktop.consolekit.pkla
  xfce4-session/trunk/org.freedesktop.upower.pkla
Modified:
  xfce4-session/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   52 ++++++++++++++++++++++++++++----------
 org.freedesktop.consolekit.pkla |   15 ++++++++++
 org.freedesktop.upower.pkla     |   15 ++++++++++
 3 files changed, 69 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-04 18:43:45 UTC (rev 104677)
+++ PKGBUILD	2011-01-04 18:49:02 UTC (rev 104678)
@@ -3,32 +3,58 @@
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-session
-pkgver=4.6.2
-pkgrel=2
+pkgver=4.7.3
+pkgrel=1
 pkgdesc="A session manager for Xfce"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.xfce.org/"
 groups=('xfce4')
-depends=("libxfcegui4>=4.6.4" 'libwnck' 'xorg-server-utils' 'hicolor-icon-theme' ) # keep xorg-server-utils for https://bugs.archlinux.org/task/21096
-makedepends=('pkgconfig' 'intltool' )
+depends=('xfce4-panel' 'libwnck' 'xorg-iceauth' 'hicolor-icon-theme' ) # keep xorg-server-utils for https://bugs.archlinux.org/task/21096  'xorg-server-utils'
+makedepends=('pkgconfig' 'intltool')
 optdepends=('fortune-mod: for xfce4-tips')
 replaces=('xfce4-toys')
+backup=(etc/polkit-1/localauthority/50-local.d/org.freedesktop.consolekit.pkla
+	etc/polkit-1/localauthority/50-local.d/org.freedesktop.upower.pkla)
 options=('!libtool')
 install=${pkgname}.install
-source=(http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('9d9890130e45e0e9476591ed9ba2c9d5')
+source=(http://archive.xfce.org/src/xfce/${pkgname}/4.7/${pkgname}-${pkgver}.tar.bz2
+	org.freedesktop.consolekit.pkla
+	org.freedesktop.upower.pkla)
+md5sums=('ae6c98b4419cc4b651a7e68c4afdf432'
+         '73e8925488386bbf38129ba3b960fce4'
+         '75ccbdb1271cb7ff21f8a65e548f409f')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 \
-    --localstatedir=/var --disable-static \
-    --enable-legacy-sm --disable-gnome --enable-session-screenshots \
-    --with-shutdown-style=auto || return 1
-  make || return 1
+  # git fixes
+
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib/xfce4 \
+	--localstatedir=/var \
+	--disable-static \
+	--disable-hal \
+	--disable-gnome \
+	--disable-libgnome-keyring \
+	--disable-legacy-sm \
+	--enable-session-screenshots \
+	--enable-upower \
+	--enable-consolekit \
+	--enable-polkit \
+	--enable-panel-plugin \
+	--disable-debug
+  make
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
+  
+  # install polkit/consolekit permission file needed for usage without a display manager
+  install -dm700 ${pkgdir}/etc/polkit-1/localauthority
+  install -dm755 ${pkgdir}/etc/polkit-1/localauthority/50-local.d
+  install -m644 ${srcdir}/org.freedesktop.consolekit.pkla ${pkgdir}/etc/polkit-1/localauthority/50-local.d/
+  install -m644 ${srcdir}/org.freedesktop.upower.pkla ${pkgdir}/etc/polkit-1/localauthority/50-local.d/
 }
+

Added: org.freedesktop.consolekit.pkla
===================================================================
--- org.freedesktop.consolekit.pkla	                        (rev 0)
+++ org.freedesktop.consolekit.pkla	2011-01-04 18:49:02 UTC (rev 104678)
@@ -0,0 +1,15 @@
+[Local restart]
+Identity=unix-user:
+#Identity=unix-group:
+Action=org.freedesktop.consolekit.system.restart
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
+
+[Local shutdown]
+Identity=unix-user:
+#Identity=unix-group:
+Action=org.freedesktop.consolekit.system.stop
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes

Added: org.freedesktop.upower.pkla
===================================================================
--- org.freedesktop.upower.pkla	                        (rev 0)
+++ org.freedesktop.upower.pkla	2011-01-04 18:49:02 UTC (rev 104678)
@@ -0,0 +1,15 @@
+[Local hibernate]
+Identity=unix-user:
+#Identity=unix-group:
+Action=org.freedesktop.upower.hibernate
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
+
+[Local suspend]
+Identity=unix-user:
+#Identity=unix-group:
+Action=org.freedesktop.upower.suspend
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes