diff options
author | root <root@rshg054.dnsready.net> | 2012-06-18 00:01:40 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-06-18 00:01:40 +0000 |
commit | 0838a7ed482f29ddf71cf05e7ec6cf7c2728ce34 (patch) | |
tree | c7eab7aecb6ae497d23cfa7074bffd060d5eb8fe /community-staging | |
parent | 61f450a3578b7e51c337e1a687c0cef2bc07ff35 (diff) |
Mon Jun 18 00:01:40 UTC 2012
Diffstat (limited to 'community-staging')
-rw-r--r-- | community-staging/lxdm/PKGBUILD | 62 | ||||
-rw-r--r-- | community-staging/lxdm/Xsession.patch | 11 | ||||
-rw-r--r-- | community-staging/lxdm/glib2-2.32.0.patch | 21 | ||||
-rw-r--r-- | community-staging/lxdm/greeter-session.patch | 13 | ||||
-rw-r--r-- | community-staging/lxdm/lxdm-pam | 8 | ||||
-rw-r--r-- | community-staging/lxdm/lxdm.conf.patch | 11 | ||||
-rw-r--r-- | community-staging/lxdm/lxdm.install | 24 | ||||
-rw-r--r-- | community-staging/lxdm/lxdm.patch | 26 | ||||
-rw-r--r-- | community-staging/lxdm/rc.d | 36 | ||||
-rw-r--r-- | community-staging/lxdm/service | 9 |
10 files changed, 221 insertions, 0 deletions
diff --git a/community-staging/lxdm/PKGBUILD b/community-staging/lxdm/PKGBUILD new file mode 100644 index 000000000..a35c35f31 --- /dev/null +++ b/community-staging/lxdm/PKGBUILD @@ -0,0 +1,62 @@ +# $Id: PKGBUILD 72524 2012-06-16 08:50:39Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski +# Contributor: AndyRTR <andyrtr@archlinux.org> +# Contributor: kiefer <jorgelmadrid@gmail.com> + +pkgname=lxdm +pkgver=0.4.1 +pkgrel=12 +pkgdesc='Lightweight X11 Display Manager' +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/lxdm/" +license=('GPL') +groups=('lxde') +depends=('gtk2' 'xorg-server' 'consolekit') +makedepends=('intltool') +install=${pkgname}.install +backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession' + 'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin' + '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 rc.d lxdm-pam service) +md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' + 'a1e3c46a8bef691bc544028f5b6cfe22' + 'baed9055e8825a5511712bc095197519' + 'c50dd01b715b0a236407d48066191601' + 'd2e4a4a22ee2aa1a986be154c647b6c6' + '28475239d0c8b4fd778ec49f5ec72962' + '705f394052fdd0dec22e95321d170de0' + 'b20fe3c8487a039050986d60e45233a9' + '4aaa9a7175cf327d9f7651c2586ef922') + +build() { + cd $srcdir/$pkgname-$pkgver + + patch -Np1 -i $srcdir/glib2-2.32.0.patch + patch -Np1 -i $srcdir/greeter-session.patch + + ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm + make + + patch -Np0 -i $srcdir/lxdm.patch + patch -Np0 -i $srcdir/lxdm.conf.patch + patch -Np0 -i $srcdir/Xsession.patch +} + + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + + install -m644 $srcdir/lxdm-pam $pkgdir/etc/pam.d/lxdm + install -Dm755 $srcdir/rc.d $pkgdir/etc/rc.d/lxdm + install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/lxdm.service + install -d $pkgdir/var/{lib,run}/lxdm + + # fix the greeter location + sed -i -e 's/local\/libexec/lib\/lxdm/' $pkgdir/etc/lxdm/lxdm.conf + + # avoid conflict with filesystem>=2012.06 + rm -r $pkgdir/var/run +} diff --git a/community-staging/lxdm/Xsession.patch b/community-staging/lxdm/Xsession.patch new file mode 100644 index 000000000..035ff0383 --- /dev/null +++ b/community-staging/lxdm/Xsession.patch @@ -0,0 +1,11 @@ +--- data/Xsession.orig 2011-07-29 15:42:33.000000000 +0200 ++++ data/Xsession 2011-12-03 09:09:14.592876087 +0100 +@@ -9,6 +9,8 @@ + LXSESSION=/usr/bin/startlxde + fi + ++[ -f /etc/profile ] && . /etc/profile ++[ -f ~/.profile ] && . ~/.profile + [ -f /etc/xprofile ] && . /etc/xprofile + [ -f ~/.xprofile ] && . ~/.xprofile + diff --git a/community-staging/lxdm/glib2-2.32.0.patch b/community-staging/lxdm/glib2-2.32.0.patch new file mode 100644 index 000000000..cebfc6133 --- /dev/null +++ b/community-staging/lxdm/glib2-2.32.0.patch @@ -0,0 +1,21 @@ +From: dgod <dgod.osa@gmail.com> +Date: Sun, 25 Dec 2011 07:23:19 +0000 (+0800) +Subject: fix event check bug caused cpu 100% +X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde%2Flxdm;a=commitdiff_plain;h=d4e41ecb;hp=f0951bdf736026b041001e846d2cb93f7f2852e1 + +fix event check bug caused cpu 100% +--- + +diff --git a/src/lxcom.c b/src/lxcom.c +index 02763eb..18ee12e 100644 +--- a/src/lxcom.c ++++ b/src/lxcom.c +@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout) + + static gboolean lxcom_check(GSource *source) + { +- return TRUE; ++ return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE; + } + + static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data) diff --git a/community-staging/lxdm/greeter-session.patch b/community-staging/lxdm/greeter-session.patch new file mode 100644 index 000000000..f3b94a57a --- /dev/null +++ b/community-staging/lxdm/greeter-session.patch @@ -0,0 +1,13 @@ +diff --git a/src/greeter.c b/src/greeter.c +index c0c150d..1f6b88e 100644 +--- a/src/greeter.c ++++ b/src/greeter.c +@@ -114,7 +114,7 @@ static char *get_session_exec(void) + GtkTreeModel* model; + GtkTreeIter it; + gchar *res; +- if(!lang) ++ if(!sessions) + return g_strdup(""); + + if(!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(sessions), &it)) diff --git a/community-staging/lxdm/lxdm-pam b/community-staging/lxdm/lxdm-pam new file mode 100644 index 000000000..3f5df04a7 --- /dev/null +++ b/community-staging/lxdm/lxdm-pam @@ -0,0 +1,8 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so +auth required pam_unix.so +account required pam_unix.so +session required pam_limits.so +session required pam_unix.so +password required pam_unix.so diff --git a/community-staging/lxdm/lxdm.conf.patch b/community-staging/lxdm/lxdm.conf.patch new file mode 100644 index 000000000..1744e557e --- /dev/null +++ b/community-staging/lxdm/lxdm.conf.patch @@ -0,0 +1,11 @@ +--- data/lxdm.conf.orig 2011-11-01 17:57:59.208757577 +0100 ++++ data/lxdm.conf 2011-11-01 18:03:55.608741945 +0100 +@@ -27,7 +27,7 @@ + gtk_theme=Clearlooks + + ## background of the greeter +-bg=/usr/share/backgrounds/default.png ++# bg=/usr/share/backgrounds/default.png + + ## if show bottom pane + bottom_pane=1 diff --git a/community-staging/lxdm/lxdm.install b/community-staging/lxdm/lxdm.install new file mode 100644 index 000000000..eaf2339cd --- /dev/null +++ b/community-staging/lxdm/lxdm.install @@ -0,0 +1,24 @@ +pkgname=lxdm + +post_install() { + if [ -z "`getent group "lxdm" 2> /dev/null`" ]; then + groupadd lxdm + chown root:lxdm /etc/lxdm/lxdm.conf + fi + chown -R root:lxdm /var/lib/lxdm > /dev/null + chmod +r /etc/lxdm/lxdm.conf +} + +post_upgrade() { + post_install +} + +post_remove() { + getent group "lxdm" &>/dev/null && groupdel lxdm #1>/dev/null + return 0 +} + +op=$1 +shift + +$op "$@" diff --git a/community-staging/lxdm/lxdm.patch b/community-staging/lxdm/lxdm.patch new file mode 100644 index 000000000..a703a386d --- /dev/null +++ b/community-staging/lxdm/lxdm.patch @@ -0,0 +1,26 @@ +--- data/lxdm.orig 2010-01-24 16:58:42.262866825 -0200 ++++ data/lxdm 2010-01-19 11:56:34.308668692 -0200 +@@ -1,21 +1,13 @@ + #!/bin/sh + +-[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n +- +-if [ -z "$LANG" -a -e /etc/sysconfig/language ]; then +- . /etc/sysconfig/language +- if [ -n "$RC_LANG"]; then +- LANG=$RC_LANG +- fi ++if [ -r /etc/profile.d/locale.sh ]; then ++ . /etc/profile.d/locale.sh + fi + + if [ -n "$LANG" ]; then + export LANG + fi + +-[ -f /etc/sysconfig/desktop ] && . /etc/sysconfig/desktop +-[ -f /etc/sysconfig/windowmanager ] && . /etc/sysconfig/windowmanager +- + if [ -n "$DEFAULT_WM" ]; then + PREFERRED=$DEFAULT_WM + fi diff --git a/community-staging/lxdm/rc.d b/community-staging/lxdm/rc.d new file mode 100644 index 000000000..68eb6225d --- /dev/null +++ b/community-staging/lxdm/rc.d @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=$(pidof -o %PPID `which lxdm-binary`) +case "$1" in + start) + stat_busy "Starting LXDM Display Manager" + [ -z "$PID" ] && /usr/sbin/lxdm -d &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon lxdm + stat_done + fi + ;; + stop) + stat_busy "Stopping LXDM Display Manager" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon lxdm + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/lxdm/service b/community-staging/lxdm/service new file mode 100644 index 000000000..b76e1190e --- /dev/null +++ b/community-staging/lxdm/service @@ -0,0 +1,9 @@ +[Unit] +Description=LXDE Display Manager +After=systemd-user-sessions.service + +[Service] +ExecStart=/usr/sbin/lxdm + +[Install] +WantedBy=graphical.target |