diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-27 12:44:19 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-27 12:44:19 +0200 |
| commit | 830afd54d0d990fdb982292bed4c97f577dc195d (patch) | |
| tree | 5c081214c4d28eae5e46c33094131ecc555b4a8f /community/lightdm | |
| parent | 06dc337f60287526f4db95ce79a2ea506023bffa (diff) | |
| parent | 5ea071a53492ec9512f8d08a8b8ff8e08499209d (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/collectd/PKGBUILD
community/erlang/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/libgexiv2/PKGBUILD
community/monica/PKGBUILD
community/neatx/PKGBUILD
community/qstardict/PKGBUILD
community/shell-fm/PKGBUILD
core/isl/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdesdk/PKGBUILD
extra/kdetoys/PKGBUILD
extra/pkgfile/PKGBUILD
extra/pyqt4/PKGBUILD
extra/sip/PKGBUILD
extra/sqlite/PKGBUILD
Diffstat (limited to 'community/lightdm')
| -rwxr-xr-x | community/lightdm/PKGBUILD | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD index 1496dd78d..64a60c64c 100755 --- a/community/lightdm/PKGBUILD +++ b/community/lightdm/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 92709 2013-06-13 08:52:31Z alucryd $ +# $Id: PKGBUILD 96356 2013-08-26 09:25:31Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Morfeo <morfeo89@hotmail.it> pkgbase=lightdm pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5') pkgver=1.6.0 -pkgrel=5 +pkgrel=7 epoch=1 pkgdesc="A lightweight display manager" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/lightdm" license=('GPL3' 'LGPL3') -groups=('lightdm') -makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'qt4' 'qt5-base' 'yelp-tools') +makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'polkit' 'qt4' 'qt5-base' 'yelp-tools') options=('!emptydirs' '!libtool') source=("https://launchpad.net/lightdm/1.6/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz" 'lightdm.service' @@ -36,7 +35,7 @@ sha256sums=('882ece568df0d81c0b6e399ff00b3f89eee6d50efc09ad1c52c61d8753efb419' '7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4') prepare() { - cd "${srcdir}"/${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver} patch -Np1 -i ../lightdm-default-config.patch patch -Np1 -i ../lightdm-lock-screen-before-switch.patch @@ -45,23 +44,27 @@ prepare() { } build() { - cd "${srcdir}"/${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver} - ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${pkgbase} --with-greeter-user=lightdm --with-greeter-session=lightdm-gtk-greeter --disable-{static,tests} + ./configure --prefix='/usr' --sbindir='/usr/bin' --sysconfdir='/etc' --localstatedir='/var' --libexecdir="/usr/lib/${pkgbase}" --with-greeter-user='lightdm' --with-greeter-session='lightdm-gtk-greeter' --disable-{static,tests} make } package_lightdm() { -depends=('libxklavier' 'systemd') +depends=('libxklavier' 'polkit' 'systemd') optdepends=('xorg-server-xephyr: LightDM test mode' 'accountsservice: limit visible accounts') backup=('etc/apparmor.d/lightdm-guest-session' 'etc/lightdm/keys.conf' 'etc/lightdm/lightdm.conf' - 'etc/lightdm/users.conf') + 'etc/lightdm/users.conf' + 'etc/lightdm/xsession' + 'etc/pam.d/lightdm' + 'etc/pam.d/lightdm-autologin' + 'etc/pam.d/lightdm-greeter') install=${pkgbase}.install - cd "${srcdir}"/${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" -C liblightdm-qt uninstall @@ -81,7 +84,7 @@ install=${pkgbase}.install install -m 644 ../lightdm-autologin.pam "${pkgdir}"/etc/pam.d/lightdm-autologin # PolicyKit - install -dm 700 "${pkgdir}"/usr/share/polkit-1/rules.d + install -dm 700 -o polkitd "${pkgdir}"/usr/share/polkit-1/rules.d install -m 644 ../lightdm.rules "${pkgdir}"/usr/share/polkit-1/rules.d/lightdm.rules # Systemd @@ -94,7 +97,7 @@ package_liblightdm-qt4() { pkgdesc=('LightDM Qt client library') depends=('lightdm' 'qt4') - cd "${srcdir}"/${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" -C liblightdm-gobject install make DESTDIR="${pkgdir}" -C liblightdm-qt install @@ -108,7 +111,7 @@ package_liblightdm-qt5() { pkgdesc=('LightDM Qt client library') depends=('lightdm' 'qt5-base') - cd "${srcdir}"/${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" -C liblightdm-gobject install make DESTDIR="${pkgdir}" -C liblightdm-qt install |