diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-31 10:59:28 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-31 10:59:28 -0300 |
| commit | 36f1b1bb12934e4fd9012c0ee5d4e3c885a2d433 (patch) | |
| tree | 397141926cac78871a3e9d53cd8fb824bc1b9cd3 /community/lxdm | |
| parent | 0858e3f6c7deaae69a94818c0d317a767aa3d481 (diff) | |
| parent | 5827948456201df72a1bd73e87977c569129fb27 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/percona-server/PKGBUILD
community/xmlrpc-c/PKGBUILD
core/util-linux/PKGBUILD
extra/colord/PKGBUILD
extra/epiphany/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/evolution/PKGBUILD
extra/gcr/PKGBUILD
extra/gdm/PKGBUILD
extra/gnome-color-manager/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-dictionary/PKGBUILD
extra/gnome-font-viewer/PKGBUILD
extra/gnome-screenshot/PKGBUILD
extra/gnome-search-tool/PKGBUILD
extra/gnome-system-log/PKGBUILD
extra/gobject-introspection/PKGBUILD
extra/grilo/PKGBUILD
extra/gtkmm3/PKGBUILD
extra/gvfs/PKGBUILD
extra/json-glib/PKGBUILD
extra/libgnome-keyring/PKGBUILD
extra/nautilus-open-terminal/PKGBUILD
extra/pidgin/PKGBUILD
extra/pygobject/PKGBUILD
extra/rest/PKGBUILD
extra/rhythmbox/PKGBUILD
extra/seahorse/PKGBUILD
extra/totem/PKGBUILD
extra/xorg-xinit/PKGBUILD
extra/yelp/PKGBUILD
Diffstat (limited to 'community/lxdm')
| -rw-r--r-- | community/lxdm/PKGBUILD | 33 | ||||
| -rw-r--r-- | community/lxdm/industrial-greeterui.patch | 13 | ||||
| -rw-r--r-- | community/lxdm/lxdm-pam | 3 |
3 files changed, 34 insertions, 15 deletions
diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD index 9da1bb987..ac04031fa 100644 --- a/community/lxdm/PKGBUILD +++ b/community/lxdm/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 76688 2012-09-26 21:14:05Z bpiotrowski $ +# $Id: PKGBUILD 79125 2012-10-30 23:07:13Z heftig $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: kiefer <jorgelmadrid@gmail.com> pkgname=lxdm pkgver=0.4.1 -pkgrel=15 +pkgrel=18 pkgdesc='Lightweight X11 Display Manager' arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/lxdm/" license=('GPL') groups=('lxde') -depends=('gtk2' 'xorg-server' 'consolekit') +depends=('gtk2' 'xorg-server') makedepends=('intltool') install=${pkgname}.install backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession' @@ -19,17 +19,8 @@ backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession' 'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown') source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz glib2-2.32.0.patch lxdm.patch lxdm.conf.patch Xsession.patch - greeter-session.patch pam-env-vars.patch rc.d lxdm-pam service) -md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' - 'a1e3c46a8bef691bc544028f5b6cfe22' - 'baed9055e8825a5511712bc095197519' - 'c50dd01b715b0a236407d48066191601' - 'd2e4a4a22ee2aa1a986be154c647b6c6' - '28475239d0c8b4fd778ec49f5ec72962' - '4c1d43e81e9a256e8d1ea7686c24b3d3' - '705f394052fdd0dec22e95321d170de0' - '9a76cae5b3a0fcbb6116fa08c7a587b5' - 'e8cc66eb1a2405d2d9d184a727cbd9d8') + greeter-session.patch pam-env-vars.patch industrial-greeterui.patch + rc.d lxdm-pam service) build() { cd $srcdir/$pkgname-$pkgver @@ -44,6 +35,7 @@ build() { patch -Np0 -i $srcdir/lxdm.patch patch -Np0 -i $srcdir/lxdm.conf.patch patch -Np0 -i $srcdir/Xsession.patch + patch -Np0 -i $srcdir/industrial-greeterui.patch } @@ -62,3 +54,16 @@ package() { # avoid conflict with filesystem>=2012.06 rm -r $pkgdir/var/run } + +md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' + 'a1e3c46a8bef691bc544028f5b6cfe22' + 'baed9055e8825a5511712bc095197519' + 'c50dd01b715b0a236407d48066191601' + 'd2e4a4a22ee2aa1a986be154c647b6c6' + '28475239d0c8b4fd778ec49f5ec72962' + '4c1d43e81e9a256e8d1ea7686c24b3d3' + '2c4afdbe3532be4f90d8f6240d352766' + '705f394052fdd0dec22e95321d170de0' + '9cc734228696a3c6f06d91bba61b03c1' + 'e8cc66eb1a2405d2d9d184a727cbd9d8') + diff --git a/community/lxdm/industrial-greeterui.patch b/community/lxdm/industrial-greeterui.patch new file mode 100644 index 000000000..a2a366809 --- /dev/null +++ b/community/lxdm/industrial-greeterui.patch @@ -0,0 +1,13 @@ +--- data/themes/Industrial/greeter.ui.orig 2012-05-09 23:54:03.743980613 -0300 ++++ data/themes/Industrial/greeter.ui 2012-05-10 00:26:20.340687396 -0300 +@@ -201,7 +201,9 @@ + </packing> + </child> + <child> +- <object class="GtkComboBoxEntry" id="keyboard"/> ++ <object class="GtkComboBoxEntry" id="keyboard"> ++ <property name="text_column">0</property> ++ </object> + <packing> + <property name="expand">False</property> + <property name="position">3</property> diff --git a/community/lxdm/lxdm-pam b/community/lxdm/lxdm-pam index b13b0d528..57f33b221 100644 --- a/community/lxdm/lxdm-pam +++ b/community/lxdm/lxdm-pam @@ -6,4 +6,5 @@ account required pam_unix.so session required pam_limits.so session required pam_unix.so password required pam_unix.so --session optional pam_systemd.so +-session optional pam_loginuid.so +-session optional pam_systemd.so |