Gentoo Archives: gentoo-commits

From: "Jeremy Olexa (darkside)" <darkside@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-misc/slim/files: slim-1.3.2-config.diff
Date: Sat, 31 Jul 2010 03:02:17
Message-Id: 20100731025841.C38872CF3A@corvid.gentoo.org
1 darkside 10/07/31 02:58:41
2
3 Added: slim-1.3.2-config.diff
4 Log:
5 Upstream version bump with minor changes, bug 328447. Drop screenshot USE flag and suggest a method with comments in the conf file, bug 252241
6 (Portage version: 2.1.8.3/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 x11-misc/slim/files/slim-1.3.2-config.diff
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/files/slim-1.3.2-config.diff?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/files/slim-1.3.2-config.diff?rev=1.1&content-type=text/plain
13
14 Index: slim-1.3.2-config.diff
15 ===================================================================
16 --- slim.conf.orig 2010-07-08 00:04:10.000000000 -0500
17 +++ slim.conf 2010-07-30 21:46:14.713367279 -0500
18 @@ -2,7 +2,7 @@
19 # Note: -xauth $authfile is automatically appended
20 default_path /bin:/usr/bin:/usr/local/bin
21 default_xserver /usr/bin/X
22 -#xserver_arguments -dpi 75
23 +xserver_arguments -nolisten tcp -br -deferglyphs 16
24
25 # Commands for halt, login, etc.
26 halt_cmd /sbin/shutdown -h now
27 @@ -18,7 +18,7 @@
28
29
30 # Activate numlock when slim starts. Valid values: on|off
31 -# numlock on
32 +numlock on
33
34 # Hide the mouse cursor (note: does not work with some WMs).
35 # Valid values: true|false
36 @@ -33,7 +33,8 @@
37 # to adjust the command according to your preferred shell,
38 # i.e. for freebsd use:
39 # login_cmd exec /bin/sh - ~/.xinitrc %session
40 -login_cmd exec /bin/bash -login ~/.xinitrc %session
41 +# login_cmd exec /bin/bash -login ~/.xinitrc %session
42 +login_cmd exec /bin/bash -login /etc/X11/xinit/xinitrc
43
44 # Commands executed when starting and exiting a session.
45 # They can be used for registering a X11 session with
46 @@ -41,11 +42,13 @@
47 #
48 # sessionstart_cmd some command
49 # sessionstop_cmd some command
50 +sessionstart_cmd /usr/bin/sessreg -a -l :0.0 %user
51 +sessionstop_cmd /usr/bin/sessreg -d -l :0.0 %user
52
53 # Start in daemon mode. Valid values: yes | no
54 # Note that this can be overriden by the command line
55 # options "-d" and "-nodaemon"
56 -# daemon yes
57 +daemon yes
58
59 # Available sessions (first one is the default).
60 # The current chosen session name is replaced in the login_cmd
61 @@ -53,8 +56,10 @@
62 # see the xinitrc.sample file shipped with slim sources
63 sessions xfce4,icewm,wmaker,blackbox
64
65 -# Executed when pressing F11 (requires imagemagick)
66 +# Executed when pressing F11 (requires media-gfx/imagemagick for import)
67 +# Alternative is media-gfx/scrot. See Gentoo bug 252241 for more info.
68 screenshot_cmd import -window root /slim.png
69 +#screenshot_cmd scrot /root/slim.png
70
71 # welcome message. Available variables: %host, %domain
72 welcome_msg Welcome to %host