Sun Sep 8 02:16:12 PDT 2013

5 files changed, 59 insertions, 50 deletions

diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD
index 7dd62306c..2bd7f915c 100755
--- a/community/lightdm/PKGBUILD
+++ b/community/lightdm/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 96356 2013-08-26 09:25:31Z alucryd $
+# $Id: PKGBUILD 96900 2013-09-07 14:11:54Z 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.1
+pkgrel=1
 epoch=1
 pkgdesc="A lightweight display manager"
 arch=('i686' 'x86_64')
 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')
+options=('!libtool')
 source=("https://launchpad.net/lightdm/1.6/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz"
         'lightdm.service'
         'lightdm.tmpfiles'
@@ -22,16 +22,16 @@ source=("https://launchpad.net/lightdm/1.6/${pkgver}/+download/${pkgbase}-${pkgv
         'lightdm-default-config.patch'
         'lightdm-lock-screen-before-switch.patch'
         'lightdm-use-login1.patch'
-        'xsession')
-sha256sums=('882ece568df0d81c0b6e399ff00b3f89eee6d50efc09ad1c52c61d8753efb419'
+        'Xsession')
+sha256sums=('43373ed9a48277dd3bf7aa3f042a2674c707bc333c90ce8ffef8bd124116b827'
             '3daf2f7e1b751415eab9b2aa92d78d8e00c3447a77fa31f7e75863136286a86f'
             'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f'
             'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0'
             '33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a'
             'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
-            '6d5a754f41e9c7e52c51d2ff018b926ddaabb807e9a0b88c4a7bde1acffa3b1c'
+            '15f75ffe122fa86c0c4b3558b9d73e151ba89355093036ffc64110c5e306216b'
             '4793eaee5915f5c519f569a4cd9158822d4c57c8b6e405895d2eddf82fa00822'
-            '3247aa1e5e7c2c2f8653cfbb22e1f74252c556b6159ff4ec47c1c7d5ea6883ac'
+            'a760c7b4d8c0b54bb204b5d6e574c82360a90464ac06042409a17f950d2c1194'
             '7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4')
 
 prepare() {
@@ -40,13 +40,14 @@ prepare() {
   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,17 +59,20 @@ 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
+  install -dm 711 "${pkgdir}"/var/log/lightdm
   rm -rf "${pkgdir}"/etc/init
+  rm -rf "${pkgdir}"/usr/include/lightdm-qt{,5}-2
 
 # Persistent home
   install -dm 770 "${pkgdir}"/var/lib/lightdm
@@ -76,9 +80,6 @@ install=${pkgbase}.install
   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
-
 # PAM
   install -m 644 ../lightdm.pam "${pkgdir}"/etc/pam.d/lightdm
   install -m 644 ../lightdm-autologin.pam "${pkgdir}"/etc/pam.d/lightdm-autologin
@@ -96,6 +97,7 @@ install=${pkgbase}.install
 package_liblightdm-qt4() {
 pkgdesc=('LightDM Qt client library')
 depends=('lightdm' 'qt4')
+options+=('!emptydirs')
 
   cd ${pkgbase}-${pkgver}
 
@@ -110,6 +112,7 @@ depends=('lightdm' 'qt4')
 package_liblightdm-qt5() {
 pkgdesc=('LightDM Qt client library')
 depends=('lightdm' 'qt5-base')
+options+=('!emptydirs')
 
   cd ${pkgbase}-${pkgver}
 
diff --git a/community/lightdm/xsession b/community/lightdm/Xsession
index 589205342..589205342 100755..100644
--- a/community/lightdm/xsession
+++ b/community/lightdm/Xsession
diff --git a/community/lightdm/lightdm-default-config.patch b/community/lightdm/lightdm-default-config.patch
index 42d49536d..7c7b421b6 100755
--- a/community/lightdm/lightdm-default-config.patch
+++ b/community/lightdm/lightdm-default-config.patch
@@ -1,42 +1,57 @@
-diff -rupN lightdm-1.5.1.orig/data/lightdm.conf lightdm-1.5.1/data/lightdm.conf
---- lightdm-1.5.1.orig/data/lightdm.conf	2013-03-06 03:40:10.000000000 +0100
-+++ lightdm-1.5.1/data/lightdm.conf	2013-03-12 22:59:22.494743200 +0100
-@@ -24,7 +24,7 @@
+--- a/data/lightdm.conf	2013-09-02 17:17:41.167211771 +0200
++++ b/data/lightdm.conf	2013-09-02 17:20:41.278613565 +0200
+@@ -18,14 +18,14 @@
+ #
+ [LightDM]
+ #start-default-seat=true
+-#greeter-user=lightdm
++greeter-user=lightdm
+ #minimum-display-number=0
+-#minimum-vt=7
++minimum-vt=1
+ #lock-memory=true
  #user-authority-in-system-dir=false
  #guest-account-script=guest-account
- #log-directory=/var/log/lightdm
+-#log-directory=/var/log/lightdm
 -#run-directory=/var/run/lightdm
++log-directory=/var/log/lightdm
 +run-directory=/run/lightdm
  #cache-directory=/var/cache/lightdm
  #xsessions-directory=/usr/share/xsessions
  #remote-sessions-directory=/usr/share/lightdm/remote-sessions
-@@ -77,7 +77,7 @@
+@@ -71,7 +71,7 @@
+ #xdmcp-manager=
+ #xdmcp-port=177
+ #xdmcp-key=
+-#greeter-session=example-gtk-gnome
++greeter-session=lightdm-gtk-greeter
+ #greeter-hide-users=false
+ #greeter-allow-guest=true
+ #greeter-show-manual-login=false
+@@ -79,7 +79,7 @@
  #user-session=default
  #allow-guest=true
  #guest-session=UNIMPLEMENTED
 -#session-wrapper=lightdm-session
-+session-wrapper=/etc/lightdm/xsession
++session-wrapper=/etc/lightdm/Xsession
  #display-setup-script=
  #greeter-setup-script=
  #session-setup-script=
-@@ -86,6 +86,7 @@
+@@ -88,6 +88,7 @@
  #autologin-user=
  #autologin-user-timeout=0
  #autologin-session=UNIMPLEMENTED
 +pam-service=lightdm-autologin
  #exit-on-failure=false
-
+ 
  #
-diff -rupN lightdm-1.5.1.orig/data/users.conf lightdm-1.5.1/data/users.conf
---- lightdm-1.5.1.orig/data/users.conf	2013-03-06 03:40:10.000000000 +0100
-+++ lightdm-1.5.1/data/users.conf	2013-03-12 22:54:29.398854700 +0100
-@@ -8,7 +8,7 @@
- # hidden-users = Users that are not shown to the user
+--- a/data/users.conf	2013-09-02 17:17:41.167211771 +0200
++++ b/data/users.conf	2013-09-02 17:21:27.955545717 +0200
+@@ -9,6 +9,6 @@
  # hidden-shells = Shells that indicate a user cannot login
  #
--[UserAccounts]
+ [UserAccounts]
 -minimum-uid=500
-+[UserList]
 +minimum-uid=1000
  hidden-users=nobody nobody4 noaccess
 -hidden-shells=/bin/false /usr/sbin/nologin
diff --git a/community/lightdm/lightdm-use-login1.patch b/community/lightdm/lightdm-use-login1.patch
index 89adbdbb7..cc3d5a5fd 100755
--- a/community/lightdm/lightdm-use-login1.patch
+++ b/community/lightdm/lightdm-use-login1.patch
@@ -386,7 +386,7 @@
 === modified file 'tests/src/test-runner.c'
 --- tests/src/test-runner.c	2013-03-27 00:48:48 +0000
 +++ tests/src/test-runner.c	2013-04-14 22:54:54 +0000
-@@ -838,6 +838,101 @@
+@@ -1464,6 +1464,101 @@ accounts_user_set_hidden (AccountsUser *
  }
  
  static void
@@ -485,18 +485,9 @@
 +}
 +
 +static void
- load_passwd_file ()
+ load_passwd_file (void)
  {
      gchar *path, *data, **lines;
-@@ -1474,6 +1569,8 @@
-     /* Start D-Bus services */
-     if (!g_key_file_get_boolean (config, "test-runner-config", "disable-console-kit", NULL))
-         start_console_kit_daemon ();
-+    if (!g_key_file_get_boolean (config, "test-runner-config", "disable-login1", NULL))
-+        start_login1_daemon ();
-     if (!g_key_file_get_boolean (config, "test-runner-config", "disable-accounts-service", NULL))
-         start_accounts_service_daemon ();
- 
 
 === added file 'tests/test-no-console-kit-or-login1'
 --- tests/test-no-console-kit-or-login1	1970-01-01 00:00:00 +0000
diff --git a/community/lightdm/lightdm.install b/community/lightdm/lightdm.install
index 7d9d99a26..e560f3e0b 100755
--- a/community/lightdm/lightdm.install
+++ b/community/lightdm/lightdm.install
@@ -1,18 +1,18 @@
 post_install() {
-  getent group lightdm > /dev/null 2>&1 || groupadd -g 620 lightdm
-  getent passwd lightdm > /dev/null 2>&1 || useradd -c 'Light Display Manager' -u 620 -g lightdm -d /var/lib/lightdm -s /sbin/nologin lightdm
-  passwd -l lightdm > /dev/null
-  chown -R lightdm:lightdm /var/lib/lightdm > /dev/null
-  systemd-tmpfiles --create lightdm.conf
+    getent group lightdm > /dev/null 2>&1 || groupadd -g 620 lightdm
+    getent passwd lightdm > /dev/null 2>&1 || useradd -c 'Light Display Manager' -u 620 -g lightdm -d /var/lib/lightdm -s /sbin/nologin lightdm
+    passwd -l lightdm > /dev/null
+    systemd-tmpfiles --create /usr/lib/tmpfiles.d/lightdm.conf
+    chown lightdm:lightdm /var/log/lightdm > /dev/null
 }
 
 post_upgrade() {
-  post_install
+    post_install
 }
 
 post_remove() {
-  getent passwd lightdm > /dev/null 2>&1 && userdel lightdm
-  getent group lightdm > /dev/null 2>&1 && groupdel lightdm
+    getent passwd lightdm > /dev/null 2>&1 && userdel lightdm
+    getent group lightdm > /dev/null 2>&1 && groupdel lightdm
 }
 
 # vim: ts=2 sw=2 et: