diff options
| author | Robby Workman <rw@rlworkman.net> | 2010-10-18 23:05:35 +0100 |
|---|---|---|
| committer | Michiel van Wessem <michiel@slackbuilds.org> | 2010-10-18 23:05:35 +0100 |
| commit | aa8b4727fc2f9b42fb956e8d4bf40ac3845ffa98 (patch) | |
| tree | 68e4586a505cdfa69c438acdfe3fbbd08717222d /system/lxdm/lxdm.SlackBuild | |
| parent | 109932ba36192cd89fc5138c3973eb3ad75c5792 (diff) | |
| download | slackbuilds-aa8b4727fc2f9b42fb956e8d4bf40ac3845ffa98.tar.gz | |
system/lxdm: Updated for version 0.3.0.
Signed-off-by: Michiel van Wessem <michiel@slackbuilds.org>
Diffstat (limited to 'system/lxdm/lxdm.SlackBuild')
| -rw-r--r-- | system/lxdm/lxdm.SlackBuild | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/system/lxdm/lxdm.SlackBuild b/system/lxdm/lxdm.SlackBuild index b64e88cda1..8f9a68c4eb 100644 --- a/system/lxdm/lxdm.SlackBuild +++ b/system/lxdm/lxdm.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=lxdm -VERSION=${VERSION:-0.2.0} +VERSION=${VERSION:-0.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,7 +70,26 @@ find . \ -exec chmod 644 {} \; # Patch the Xsession file to source /etc/profile and xprofile on session start -patch -p1 < $CWD/source_profile_in_Xsession.diff +patch -p1 < $CWD/patches/source_profile_in_Xsession.diff + +# Remove the SuSe section from Xsession file, since it causes Slackware +# to always launch whatever WM/DE that /etc/X11/xinit/xinitrc symlink is +# pointing to, regardless of what the user wants... +patch -p1 < $CWD/patches/remove_suse_from_Xsession.diff + +# No PAM here +patch -p1 < $CWD/patches/lxdm-0.3.0-without_pam.diff + +# Set DESKTOP_SESSION in the environment when starting a session +# I'd normally say this is a bad idea, since upstream disagrees with it +# (they say that this should not be populated except when PAM is used), +# but xfce and consolekit devs give me the impression that it's not always +# wrong to start a new ck session even when one is already open (i.e. the +# XDG_SESSION_COOKIE variable is already populated), and besides, since +# both KDM and GDM set DESKTOP_SESSION regardless of whether PAM is used, +# this seems the path of least resistance. This patch *should* be easy +# to maintain ; let's hope I don't eat those words. --rworkman +patch -p1 < $CWD/patches/lxdm-0.3.0-set_DESKTOP_SESSION_in_env.diff CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -91,12 +110,7 @@ make install DESTDIR=$PKG rm -rf $PKG/etc/pam.d # Install a to-be-customized-if-needed /etc/lxdm/xinitrc -cat << EOF > $PKG/etc/lxdm/xinitrc.new -#!/bin/sh -# This file is referenced from /etc/lxdm/Xsession -# This is for system-specific customization if desired - -EOF +cat $CWD/xinitrc > $PKG/etc/lxdm/xinitrc.new # Don't clobber configs on upgrade # But *do* clobber Xsession |