From 5c5e1e3a998a54db424b8261fac042ab41745d99 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 28 Nov 2012 02:28:30 -0800 Subject: Wed Nov 28 02:22:26 PST 2012 --- extra/enlightenment17/PKGBUILD | 21 +++++++++++++-------- extra/enlightenment17/enlightenment17.install | 5 +++++ extra/enlightenment17/sysactions_systemd.patch | 17 +++++++++++++++++ 3 files changed, 35 insertions(+), 8 deletions(-) create mode 100644 extra/enlightenment17/sysactions_systemd.patch (limited to 'extra/enlightenment17') diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD index c606dfdf9..5d9a31ee1 100644 --- a/extra/enlightenment17/PKGBUILD +++ b/extra/enlightenment17/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 171995 2012-11-25 21:24:57Z ronald $ +# $Id: PKGBUILD 172084 2012-11-27 19:02:07Z ronald $ # Maintainer: Ronald van Haren # Contributor: Gustavo Sverzut Barbieri pkgname=enlightenment17 _pkgname=enlightenment -pkgver=0.17.0alpha5 -_pkgver=0.17.0-alpha5 +pkgver=0.17.0alpha6 +_pkgver=0.17.0-alpha6 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64') @@ -13,16 +13,19 @@ url="http://www.enlightenment.org" license=('BSD') depends=('alsa-lib' 'pm-utils' 'pam' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils' 'e_dbus' 'edje' 'eeze' 'efreet' - 'eio' 'elementary' 'xcb-util-keysyms') + 'eio' 'elementary' 'xcb-util-keysyms' 'udisks' 'systemd') +optdepends=('connman: network module') provides=('notification-daemon' 'e') + backup=('etc/enlightenment/sysactions.conf') options=('!libtool' '!emptydirs') install=enlightenment17.install source=(http://download.enlightenment.org/releases/$_pkgname-$_pkgver.tar.gz - 'e-applications.menu' 'quickstart.patch') -sha1sums=('5d9fce8c1daabbadb5f4db8ea187d7a8340a5e31' + 'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch') +sha1sums=('52d44b95a9fd2f4e9033ac65a4fd9ebcac70b9b0' 'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5' - '3f53931ae86de8fe99e386aeb097521aac0decd8') + '3f53931ae86de8fe99e386aeb097521aac0decd8' + '86f1c5e36dc274c3101362532378be034e89c593') build() { cd "$srcdir/$_pkgname-$_pkgver" @@ -33,6 +36,9 @@ build() { patch -p0 < $srcdir/quickstart.patch + # default to systemd for sysactions + patch -Np0 < $srcdir/sysactions_systemd.patch + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -78,4 +84,3 @@ package() { $pkgdir/etc/xdg/menus/e-applications.menu } - diff --git a/extra/enlightenment17/enlightenment17.install b/extra/enlightenment17/enlightenment17.install index 1182e768f..0e3216ffe 100644 --- a/extra/enlightenment17/enlightenment17.install +++ b/extra/enlightenment17/enlightenment17.install @@ -1,6 +1,11 @@ post_install() { update-mime-database usr/share/mime > /dev/null update-desktop-database -q + +cat << EOF +Enlightenment is configured to use systemd by default for shutdown/sleep purposes. +This can be changed in /etc/enlightenment/sysactions.conf. +EOF } post_upgrade() { diff --git a/extra/enlightenment17/sysactions_systemd.patch b/extra/enlightenment17/sysactions_systemd.patch new file mode 100644 index 000000000..5d535dd60 --- /dev/null +++ b/extra/enlightenment17/sysactions_systemd.patch @@ -0,0 +1,17 @@ +--- data/etc/sysactions.conf.in 2012-10-31 17:28:49.000000000 +0100 ++++ data/etc/sysactions.conf.in.bak 2012-11-27 19:27:15.955334382 +0100 +@@ -43,10 +43,10 @@ + # user and group name can use glob matches (* == all for example) like the + # shell. as can action names allowed or denied. + +-action: halt /sbin/shutdown -h now +-action: reboot /sbin/shutdown -r now +-action: suspend @SUSPEND@ +-action: hibernate @HIBERNATE@ ++action: halt /usr/bin/systemctl poweroff ++action: reboot /usr/bin/systemctl reboot ++action: suspend /usr/bin/systemctl suspend ++action: hibernate /usr/bin/systemctl hibernate + action: /bin/mount /bin/mount + action: /bin/umount /bin/umount + action: /usr/bin/eject /usr/bin/eject -- cgit v1.2.3-54-g00ecf