summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-01-11 12:02:41 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-01-11 12:02:41 +0000
commit85890394299f53d6d858db61a25f65851ccd0c4d (patch)
treeab2dd3181e83ed475a0c98b4696543fc9423e6b2 /x11-misc/slim/files
parentMasking net-mail/cyrus-imspd for QA removal. (diff)
downloadgentoo-2-85890394299f53d6d858db61a25f65851ccd0c4d.tar.gz
gentoo-2-85890394299f53d6d858db61a25f65851ccd0c4d.tar.bz2
gentoo-2-85890394299f53d6d858db61a25f65851ccd0c4d.zip
punt old, broken versions with PAM and ConsoleKit. leave only latest, and the only working one in tree.
(Portage version: 2.2.0_alpha14/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/slim/files')
-rw-r--r--x11-misc/slim/files/slim-1.3.2-r1-config.diff68
1 files changed, 0 insertions, 68 deletions
diff --git a/x11-misc/slim/files/slim-1.3.2-r1-config.diff b/x11-misc/slim/files/slim-1.3.2-r1-config.diff
deleted file mode 100644
index dd5a21cbc2a3..000000000000
--- a/x11-misc/slim/files/slim-1.3.2-r1-config.diff
+++ /dev/null
@@ -1,68 +0,0 @@
---- slim.conf.orig 2010-08-24 10:18:52.344180981 -0500
-+++ slim.conf 2010-08-24 10:22:20.311234197 -0500
-@@ -2,7 +2,7 @@
- # Note: -xauth $authfile is automatically appended
- default_path /bin:/usr/bin:/usr/local/bin
- default_xserver /usr/bin/X
--#xserver_arguments -dpi 75
-+xserver_arguments -nolisten tcp -br -deferglyphs 16
-
- # Commands for halt, login, etc.
- halt_cmd /sbin/shutdown -h now
-@@ -18,7 +18,7 @@
-
-
- # Activate numlock when slim starts. Valid values: on|off
--# numlock on
-+numlock on
-
- # Hide the mouse cursor (note: does not work with some WMs).
- # Valid values: true|false
-@@ -33,7 +33,8 @@
- # to adjust the command according to your preferred shell,
- # i.e. for freebsd use:
- # login_cmd exec /bin/sh - ~/.xinitrc %session
--login_cmd exec /bin/bash -login ~/.xinitrc %session
-+# login_cmd exec /bin/bash -login ~/.xinitrc %session
-+login_cmd exec /bin/bash -login /etc/X11/xinit/xinitrc
-
- # Commands executed when starting and exiting a session.
- # They can be used for registering a X11 session with
-@@ -41,11 +42,13 @@
- #
- # sessionstart_cmd some command
- # sessionstop_cmd some command
-+sessionstart_cmd /usr/bin/sessreg -a -l :0.0 %user
-+sessionstop_cmd /usr/bin/sessreg -d -l :0.0 %user
-
- # Start in daemon mode. Valid values: yes | no
- # Note that this can be overriden by the command line
- # options "-d" and "-nodaemon"
--# daemon yes
-+daemon yes
-
- # Available sessions (first one is the default).
- # The current chosen session name is replaced in the login_cmd
-@@ -53,8 +56,10 @@
- # see the xinitrc.sample file shipped with slim sources
- sessions xfce4,icewm,wmaker,blackbox
-
--# Executed when pressing F11 (requires imagemagick)
-+# Executed when pressing F11 (requires media-gfx/imagemagick for import)
-+# Alternative is media-gfx/scrot. See Gentoo bug 252241 for more info.
- screenshot_cmd import -window root /slim.png
-+#screenshot_cmd scrot /root/slim.png
-
- # welcome message. Available variables: %host, %domain
- welcome_msg Welcome to %host
-@@ -83,8 +88,8 @@
- # randomly choose from
- current_theme default
-
--# Lock file
--lockfile /var/run/slim.lock
-+# Lock file, /etc/init.d/xdm expects slim.pid
-+lockfile /var/run/slim.pid
-
- # Log file
- logfile /var/log/slim.log