[arch-commits] Commit in lightdm/trunk (PKGBUILD lightdm-default-config.patch)

Maxime Gauduin alucryd at archlinux.org
Wed Oct 1 11:43:49 UTC 2014 

    Date: Wednesday, October 1, 2014 @ 13:43:47
  Author: alucryd
Revision: 119960

upgpkg: lightdm 1:1.12.0-1

Modified:
  lightdm/trunk/PKGBUILD
  lightdm/trunk/lightdm-default-config.patch

------------------------------+
 PKGBUILD                     |   77 +++++++++++++++++++++--------------------
 lightdm-default-config.patch |   27 +++++---------
 2 files changed, 51 insertions(+), 53 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-01 11:20:05 UTC (rev 119959)
+++ PKGBUILD	2014-10-01 11:43:47 UTC (rev 119960)
@@ -1,18 +1,19 @@
 # $Id$
-# Maintainer: Maxime Gauduin <alucryd at gmail.com>
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
 # Contributor: Morfeo <morfeo89 at hotmail.it>
 
 pkgbase=lightdm
 pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
-pkgver=1.10.1
-pkgrel=3
+pkgver=1.12.0
+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')
-source=("https://launchpad.net/lightdm/${pkgver%.*}/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz"
+makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool'
+             'libxklavier' 'polkit' 'qt4' 'qt5-base')
+source=("https://launchpad.net/lightdm/${pkgver%.*}/${pkgver}/+download/lightdm-${pkgver}.tar.xz"
         'lightdm.service'
         'lightdm.tmpfiles'
         'lightdm.pam'
@@ -19,52 +20,54 @@
         'lightdm-autologin.pam'
         'lightdm.rules'
         'lightdm-default-config.patch'
-        'lightdm-userlist.patch'
         'Xsession')
-sha256sums=('737123001a7ae2ab126c75f61dcebb767d082ec043c012285eab6fa6b0d6a58f'
+sha256sums=('eee3e440c329fddf969b6a76c2717ae1c758972adad5c6ffa1038626de303f5f'
             '0d2adba25cdbe59e97ffd302083db9d5e23920780f41e04f64512cd6b633289a'
             'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f'
             'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0'
             '33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a'
             'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
-            '756437add6021bb10f1e8884dab518ea544f0f04a8201f5b72d6d6e0e8cc2a24'
-            '50bbf183eee1f87b0f10e02c70ff0323f383006c914c4314a48843df547fa0b2'
+            'ed3dca57ef19d32499b72668bc78eaff0d9e772718b76f3816c5ee5f816b1891'
             '4d5674906742200b3c171f978457e943560f2c10a2b9156fcd44da3796d185a2')
 
 prepare() {
-  cd ${pkgbase}-${pkgver}
+  cd lightdm-${pkgver}
 
-  patch -Np0 -i ../lightdm-userlist.patch
   patch -Np1 -i ../lightdm-default-config.patch
 }
 
 build() {
-  cd ${pkgbase}-${pkgver}
+  cd lightdm-${pkgver}
 
   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
+
+  ./configure --prefix='/usr' --sbindir='/usr/bin' --sysconfdir='/etc' \
+              --localstatedir='/var' --libexecdir='/usr/lib/lightdm' \
+              --with-greeter-user='lightdm' \
+              --with-greeter-session='lightdm-gtk-greeter' \
+              --disable-{static,tests}
+  make
 }
 
 package_lightdm() {
-depends=('libxklavier' 'polkit' 'systemd')
-optdepends=('accountsservice: limit visible accounts'
-            'lightdm-gtk2-greeter: GTK2 greeter'
-            'lightdm-gtk3-greeter: GTK3 greeter'
-            'lightdm-kde-greeter: Qt greeter'
-            'xorg-server-xephyr: LightDM test mode')
-backup=('etc/apparmor.d/lightdm-guest-session'
-        'etc/lightdm/keys.conf'
-        'etc/lightdm/lightdm.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"
+  depends=('libxklavier' 'polkit' 'systemd')
+  optdepends=('accountsservice: limit visible accounts'
+              'lightdm-gtk2-greeter: GTK2 greeter'
+              'lightdm-gtk3-greeter: GTK3 greeter'
+              'lightdm-kde-greeter: Qt greeter'
+              'xorg-server-xephyr: LightDM test mode')
+  backup=('etc/apparmor.d/lightdm-guest-session'
+          'etc/lightdm/keys.conf'
+          'etc/lightdm/lightdm.conf'
+          'etc/lightdm/users.conf'
+          'etc/lightdm/Xsession'
+          'etc/pam.d/lightdm'
+          'etc/pam.d/lightdm-autologin'
+          'etc/pam.d/lightdm-greeter')
+  install='lightdm.install'
 
-  cd ${pkgbase}-${pkgver}
+  cd lightdm-${pkgver}
 
   make DESTDIR="${pkgdir}" install
   make DESTDIR="${pkgdir}" -C liblightdm-qt uninstall
@@ -81,15 +84,15 @@
   chown 620:620 -R "${pkgdir}"/var/lib/lightdm{,-data}
   chgrp 620 "${pkgdir}"/var/log/lightdm
 
-# PAM
+  # PAM
   install -m 644 ../lightdm.pam "${pkgdir}"/etc/pam.d/lightdm
   install -m 644 ../lightdm-autologin.pam "${pkgdir}"/etc/pam.d/lightdm-autologin
 
-# PolicyKit
+  # PolicyKit
   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
+  # Systemd
   install -dm 755 "${pkgdir}"/usr/lib/{systemd/system,tmpfiles.d}
   install -m 644 ../lightdm.service "${pkgdir}"/usr/lib/systemd/system/lightdm.service
   install -m 644 ../lightdm.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lightdm.conf
@@ -111,11 +114,11 @@
 }
 
 package_liblightdm-qt5() {
-pkgdesc='LightDM Qt client library'
-depends=('lightdm' 'qt5-base')
-options=('!emptydirs')
+  pkgdesc='LightDM Qt client library'
+  depends=('lightdm' 'qt5-base')
+  options=('!emptydirs')
 
-  cd ${pkgbase}-${pkgver}
+  cd lightdm-${pkgver}
 
   make DESTDIR="${pkgdir}" -C liblightdm-gobject install
   make DESTDIR="${pkgdir}" -C liblightdm-qt install

Modified: lightdm-default-config.patch
===================================================================
--- lightdm-default-config.patch	2014-10-01 11:20:05 UTC (rev 119959)
+++ lightdm-default-config.patch	2014-10-01 11:43:47 UTC (rev 119960)
@@ -1,6 +1,7 @@
---- a/data/lightdm.conf 2014-03-12 20:56:34.000000000 +0100
-+++ b/data/lightdm.conf 2014-03-14 15:48:32.089948842 +0100
-@@ -19,12 +19,12 @@
+diff -rupN lightdm-1.11.9.orig/data/lightdm.conf lightdm-1.11.9/data/lightdm.conf
+--- lightdm-1.11.9.orig/data/lightdm.conf	2014-09-14 12:55:09.591944064 +0200
++++ lightdm-1.11.9/data/lightdm.conf	2014-09-14 12:58:13.396791044 +0200
+@@ -20,13 +20,13 @@
  #start-default-seat=true
  #greeter-user=lightdm
  #minimum-display-number=0
@@ -9,6 +10,7 @@
  #lock-memory=true
  #user-authority-in-system-dir=false
  #guest-account-script=guest-account
+ #logind-check-graphical=false
  #log-directory=/var/log/lightdm
 -#run-directory=/var/run/lightdm
 +run-directory=/run/lightdm
@@ -15,8 +17,8 @@
  #cache-directory=/var/cache/lightdm
  #sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions
  #remote-sessions-directory=/usr/share/lightdm/remote-sessions
-@@ -93,7 +93,7 @@
- #user-session=default
+@@ -101,7 +101,7 @@
+ #allow-user-switching=true
  #allow-guest=true
  #guest-session=
 -#session-wrapper=lightdm-session
@@ -24,16 +26,9 @@
  #greeter-wrapper=
  #guest-wrapper=
  #display-setup-script=
-@@ -107,6 +107,7 @@
- #autologin-in-background=false
- #autologin-session=UNIMPLEMENTED
- #exit-on-failure=false
-+pam-service=lightdm-autologin
-
- #
- # Seat configuration
---- a/data/users.conf 2013-09-02 17:17:41.167211771 +0200
-+++ b/data/users.conf 2013-09-02 17:21:27.955545717 +0200
+diff -rupN lightdm-1.11.9.orig/data/users.conf lightdm-1.11.9/data/users.conf
+--- lightdm-1.11.9.orig/data/users.conf	2014-09-14 12:55:09.591944064 +0200
++++ lightdm-1.11.9/data/users.conf	2014-09-14 12:59:21.426117548 +0200
 @@ -9,6 +9,6 @@
  # hidden-shells = Shells that indicate a user cannot login
  #
@@ -42,4 +37,4 @@
 +minimum-uid=1000
  hidden-users=nobody nobody4 noaccess
 -hidden-shells=/bin/false /usr/sbin/nologin
-+hidden-shells=/bin/false /sbin/nologin
++hidden-shells=/bin/false /usr/bin/nologin

More information about the arch-commits mailing list