1 files changed, 24 insertions, 18 deletions
diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD
index 64a60c64c..9cb3a37ff 100755
--- a/community/lightdm/PKGBUILD
+++ b/community/lightdm/PKGBUILD
@@ -1,52 +1,56 @@
-# $Id: PKGBUILD 96356 2013-08-26 09:25:31Z alucryd $
+# $Id: PKGBUILD 98119 2013-10-06 08:35:43Z 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=7
+pkgver=1.6.2
+pkgrel=2
 epoch=1
 pkgdesc="A lightweight display manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/lightdm"
 license=('GPL3' 'LGPL3')
-makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'polkit' 'qt4' 'qt5-base' 'yelp-tools')
-options=('!emptydirs' '!libtool')
+makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'polkit' 'qt4' 'qt5-base')
+options=('!libtool')
 source=("https://launchpad.net/lightdm/1.6/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz"
         'lightdm.service'
         'lightdm.tmpfiles'
         'lightdm.pam'
         'lightdm-autologin.pam'
         'lightdm.rules'
+        'lightdm-corrupt-x-authority.patch'
         'lightdm-default-config.patch'
         'lightdm-lock-screen-before-switch.patch'
         'lightdm-use-login1.patch'
-        'xsession')
-sha256sums=('882ece568df0d81c0b6e399ff00b3f89eee6d50efc09ad1c52c61d8753efb419'
-            '3daf2f7e1b751415eab9b2aa92d78d8e00c3447a77fa31f7e75863136286a86f'
+        'Xsession')
+sha256sums=('b0de1dc81bb5ce81800feafb9fbc7806ef4dfc83733f0df058568e55b8a045f3'
+            '0d2adba25cdbe59e97ffd302083db9d5e23920780f41e04f64512cd6b633289a'
             'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f'
             'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0'
             '33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a'
             'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
-            '6d5a754f41e9c7e52c51d2ff018b926ddaabb807e9a0b88c4a7bde1acffa3b1c'
+            '420aac58151bc441696db0bf234123b934ca8a8798e90db8a59252258e82b5d5'
+            '15f75ffe122fa86c0c4b3558b9d73e151ba89355093036ffc64110c5e306216b'
             '4793eaee5915f5c519f569a4cd9158822d4c57c8b6e405895d2eddf82fa00822'
-            '3247aa1e5e7c2c2f8653cfbb22e1f74252c556b6159ff4ec47c1c7d5ea6883ac'
+            'a760c7b4d8c0b54bb204b5d6e574c82360a90464ac06042409a17f950d2c1194'
             '7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4')
 
 prepare() {
   cd ${pkgbase}-${pkgver}
 
+  patch -Np0 -i ../lightdm-corrupt-x-authority.patch
   patch -Np1 -i ../lightdm-default-config.patch
   patch -Np1 -i ../lightdm-lock-screen-before-switch.patch
   patch -Np0 -i ../lightdm-use-login1.patch
-  sed -i 's/MOC5 --qt=qt5/MOC5/' configure
 }
 
 build() {
   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}
+  export MOC4='moc-qt4'
+  export MOC5='moc-qt5'
+  ./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
 }
 
@@ -58,26 +62,26 @@ backup=('etc/apparmor.d/lightdm-guest-session'
         'etc/lightdm/keys.conf'
         'etc/lightdm/lightdm.conf'
         'etc/lightdm/users.conf'
-        'etc/lightdm/xsession'
+        'etc/lightdm/Xsession'
         'etc/pam.d/lightdm'
         'etc/pam.d/lightdm-autologin'
         'etc/pam.d/lightdm-greeter')
-install=${pkgbase}.install
+install="${pkgbase}.install"
 
   cd ${pkgbase}-${pkgver}
 
   make DESTDIR="${pkgdir}" install
   make DESTDIR="${pkgdir}" -C liblightdm-qt uninstall
+  install -m 755 ../Xsession "${pkgdir}"/etc/lightdm/Xsession
   rm -rf "${pkgdir}"/etc/init
+  rm -rf "${pkgdir}"/usr/include/lightdm-qt{,5}-2
 
-# Persistent home
   install -dm 770 "${pkgdir}"/var/lib/lightdm
+  install -dm 711 "${pkgdir}"/var/log/lightdm
   chmod +t "${pkgdir}"/var/lib/lightdm
   echo 'GDK_CORE_DEVICE_EVENTS=true' > "${pkgdir}"/var/lib/lightdm/.pam_environment
   chmod 644 "${pkgdir}"/var/lib/lightdm/.pam_environment
-
-# Session wrapper
-  install -m 755 ../xsession "${pkgdir}"/etc/lightdm/xsession
+  chown 620:620 -R "${pkgdir}"/var/{lib,log}/lightdm
 
 # PAM
   install -m 644 ../lightdm.pam "${pkgdir}"/etc/pam.d/lightdm
@@ -96,6 +100,7 @@ install=${pkgbase}.install
 package_liblightdm-qt4() {
 pkgdesc=('LightDM Qt client library')
 depends=('lightdm' 'qt4')
+options+=('!emptydirs')
 
   cd ${pkgbase}-${pkgver}
 
@@ -110,6 +115,7 @@ depends=('lightdm' 'qt4')
 package_liblightdm-qt5() {
 pkgdesc=('LightDM Qt client library')
 depends=('lightdm' 'qt5-base')
+options+=('!emptydirs')
 
   cd ${pkgbase}-${pkgver}