Date: Tuesday, August 23, 2011 @ 02:01:55 Author: eric Revision: 136120
archrelease: copy trunk to extra-i686 Added: xfce4-session/repos/extra-i686/PKGBUILD (from rev 136119, xfce4-session/trunk/PKGBUILD) xfce4-session/repos/extra-i686/gdm.patch (from rev 136119, xfce4-session/trunk/gdm.patch) xfce4-session/repos/extra-i686/org.freedesktop.consolekit.pkla (from rev 136119, xfce4-session/trunk/org.freedesktop.consolekit.pkla) xfce4-session/repos/extra-i686/org.freedesktop.upower.pkla (from rev 136119, xfce4-session/trunk/org.freedesktop.upower.pkla) xfce4-session/repos/extra-i686/xfce4-session.install (from rev 136119, xfce4-session/trunk/xfce4-session.install) Deleted: xfce4-session/repos/extra-i686/PKGBUILD xfce4-session/repos/extra-i686/xfce4-session.install ---------------------------------+ PKGBUILD | 126 +++++++++++++++++++------------------- gdm.patch | 21 ++++++ org.freedesktop.consolekit.pkla | 31 +++++++++ org.freedesktop.upower.pkla | 15 ++++ xfce4-session.install | 22 +++--- 5 files changed, 141 insertions(+), 74 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2011-08-23 06:00:59 UTC (rev 136119) +++ PKGBUILD 2011-08-23 06:01:55 UTC (rev 136120) @@ -1,63 +0,0 @@ -# $Id$ -# Maintainer: AndyRTR <andy...@archlinux.org> -# Contributor: tobias <tobias funnychar archlinux.org> - -pkgname=xfce4-session -pkgver=4.8.1 -pkgrel=3 -pkgdesc="A session manager for Xfce" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://www.xfce.org/" -groups=('xfce4') - # keep xorg-server-utils for https://bugs.archlinux.org/task/21096 'xorg-server-utils' - # upower and consolekit for reboot/shutdown/hibernate/suspend -depends=('xfce4-panel' 'gconf' 'libgnome-keyring' 'libwnck' 'libsm' 'xorg-iceauth' 'upower' 'consolekit' 'hicolor-icon-theme' ) -makedepends=('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.8/${pkgname}-${pkgver}.tar.bz2 - org.freedesktop.consolekit.pkla - org.freedesktop.upower.pkla - gdm.patch) -md5sums=('478080ff666fdd36786a243829663efd' - '2e2519950d8c591dc9440ed8957a49ed' - '5fa270637b5e685f033863d8664795a2' - '61423d0e235cad7ffcbbdacc96c9151b') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - # fix usage with gdm and custom langs https://bugs.archlinux.org/task/24327 - patch -Np1 -i ${srcdir}/gdm.patch - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/xfce4 \ - --localstatedir=/var \ - --disable-static \ - --disable-hal \ - --enable-gnome \ - --enable-libgnome-keyring \ - --enable-session-screenshots \ - --enable-upower \ - --enable-consolekit \ - --enable-polkit \ - --enable-panel-plugin \ - --disable-debug - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - 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/ -} - Copied: xfce4-session/repos/extra-i686/PKGBUILD (from rev 136119, xfce4-session/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2011-08-23 06:01:55 UTC (rev 136120) @@ -0,0 +1,63 @@ +# $Id$ +# Maintainer: AndyRTR <andy...@archlinux.org> +# Contributor: tobias <tobias funnychar archlinux.org> + +pkgname=xfce4-session +pkgver=4.8.1 +pkgrel=3 +pkgdesc="A session manager for Xfce" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://www.xfce.org/" +groups=('xfce4') + # keep xorg-server-utils for https://bugs.archlinux.org/task/21096 'xorg-server-utils' + # upower and consolekit for reboot/shutdown/hibernate/suspend +depends=('xfce4-panel' 'gconf' 'libgnome-keyring' 'libwnck' 'libsm' 'xorg-iceauth' 'upower' 'consolekit' 'hicolor-icon-theme' ) +makedepends=('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.8/${pkgname}-${pkgver}.tar.bz2 + org.freedesktop.consolekit.pkla + org.freedesktop.upower.pkla + gdm.patch) +md5sums=('478080ff666fdd36786a243829663efd' + '2e2519950d8c591dc9440ed8957a49ed' + '5fa270637b5e685f033863d8664795a2' + '61423d0e235cad7ffcbbdacc96c9151b') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + # fix usage with gdm and custom langs https://bugs.archlinux.org/task/24327 + patch -Np1 -i ${srcdir}/gdm.patch + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/xfce4 \ + --localstatedir=/var \ + --disable-static \ + --disable-hal \ + --enable-gnome \ + --enable-libgnome-keyring \ + --enable-session-screenshots \ + --enable-upower \ + --enable-consolekit \ + --enable-polkit \ + --enable-panel-plugin \ + --disable-debug + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + 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/ +} + Copied: xfce4-session/repos/extra-i686/gdm.patch (from rev 136119, xfce4-session/trunk/gdm.patch) =================================================================== --- gdm.patch (rev 0) +++ gdm.patch 2011-08-23 06:01:55 UTC (rev 136120) @@ -0,0 +1,21 @@ +From 3bba8eb773a96339fb841c76b04f2d4fd3317814 Mon Sep 17 00:00:00 2001 +From: Panu Matilainen <pmati...@laiskiainen.org> +Date: Wed, 23 Mar 2011 21:13:40 +0000 +Subject: Fix GDM_LANG usage to be compatible with GDM3 (bug #7400). + +--- +diff --git a/xfce4-session/main.c b/xfce4-session/main.c +index ff6e324..fcf69f8 100644 +--- a/xfce4-session/main.c ++++ b/xfce4-session/main.c +@@ -103,7 +103,7 @@ setup_environment (void) + + /* this is for compatibility with the GNOME Display Manager */ + lang = g_getenv ("GDM_LANG"); +- if (lang != NULL) ++ if (lang != NULL && strlen (lang) > 0) + { + xfce_setenv ("LANG", lang, TRUE); + xfce_unsetenv ("GDM_LANG"); +-- +cgit Copied: xfce4-session/repos/extra-i686/org.freedesktop.consolekit.pkla (from rev 136119, xfce4-session/trunk/org.freedesktop.consolekit.pkla) =================================================================== --- org.freedesktop.consolekit.pkla (rev 0) +++ org.freedesktop.consolekit.pkla 2011-08-23 06:01:55 UTC (rev 136120) @@ -0,0 +1,31 @@ +[Local restart] +#Identity=unix-user: your_username +Identity=unix-group:power +Action=org.freedesktop.consolekit.system.restart +ResultAny=yes +ResultInactive=no +ResultActive=yes + +[Local shutdown] +#Identity=unix-user: your_username +Identity=unix-group:power +Action=org.freedesktop.consolekit.system.stop +ResultAny=yes +ResultInactive=no +ResultActive=yes + +[Local restart - multiple] +#Identity=unix-user: your_username +Identity=unix-group:power +Action=org.freedesktop.consolekit.system.restart-multiple-users +ResultAny=yes +ResultInactive=no +ResultActive=yes + +[Local shutdown - multiple] +#Identity=unix-user: your_username +Identity=unix-group:power +Action=org.freedesktop.consolekit.system.stop-multiple-users +ResultAny=yes +ResultInactive=no +ResultActive=yes Copied: xfce4-session/repos/extra-i686/org.freedesktop.upower.pkla (from rev 136119, xfce4-session/trunk/org.freedesktop.upower.pkla) =================================================================== --- org.freedesktop.upower.pkla (rev 0) +++ org.freedesktop.upower.pkla 2011-08-23 06:01:55 UTC (rev 136120) @@ -0,0 +1,15 @@ +[Local hibernate] +#Identity=unix-user: your_username +Identity=unix-group:power +Action=org.freedesktop.upower.hibernate +ResultAny=yes +ResultInactive=no +ResultActive=yes + +[Local suspend] +#Identity=unix-user: your_username +Identity=unix-group:power +Action=org.freedesktop.upower.suspend +ResultAny=yes +ResultInactive=no +ResultActive=yes Deleted: xfce4-session.install =================================================================== --- xfce4-session.install 2011-08-23 06:00:59 UTC (rev 136119) +++ xfce4-session.install 2011-08-23 06:01:55 UTC (rev 136120) @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} Copied: xfce4-session/repos/extra-i686/xfce4-session.install (from rev 136119, xfce4-session/trunk/xfce4-session.install) =================================================================== --- xfce4-session.install (rev 0) +++ xfce4-session.install 2011-08-23 06:01:55 UTC (rev 136120) @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +}