Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/slim/files/
Date: Wed, 28 Jul 2021 21:23:20
Message-Id: 1627507344.1274abdcfa027517c1ca3374373eb5475f326d6d.ionen@gentoo
1 commit: 1274abdcfa027517c1ca3374373eb5475f326d6d
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Wed Jul 28 19:54:48 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 28 21:22:24 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1274abdc
7
8 x11-misc/slim: remove unused patch
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
12 Closes: https://github.com/gentoo/gentoo/pull/21818
13 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
14
15 x11-misc/slim/files/slim-9999-config.diff | 70 -------------------------------
16 1 file changed, 70 deletions(-)
17
18 diff --git a/x11-misc/slim/files/slim-9999-config.diff b/x11-misc/slim/files/slim-9999-config.diff
19 deleted file mode 100644
20 index 81f0feea43f..00000000000
21 --- a/x11-misc/slim/files/slim-9999-config.diff
22 +++ /dev/null
23 @@ -1,70 +0,0 @@
24 -diff --git a/slim.conf b/slim.conf
25 -index 2c72255..7af4adb 100644
26 ---- a/slim.conf
27 -+++ b/slim.conf
28 -@@ -2,7 +2,7 @@
29 - # Note: -xauth $authfile is automatically appended
30 - default_path /bin:/usr/bin:/usr/local/bin
31 - default_xserver /usr/bin/X
32 --#xserver_arguments -dpi 75
33 -+xserver_arguments -nolisten tcp -br -deferglyphs 16 vt07
34 -
35 - # Commands for halt, login, etc.
36 - halt_cmd /sbin/shutdown -h now
37 -@@ -18,7 +18,7 @@ authfile /var/run/slim.auth
38 -
39 -
40 - # Activate numlock when slim starts. Valid values: on|off
41 --# numlock on
42 -+numlock on
43 -
44 - # Hide the mouse cursor (note: does not work with some WMs).
45 - # Valid values: true|false
46 -@@ -33,19 +33,20 @@ authfile /var/run/slim.auth
47 - # to adjust the command according to your preferred shell,
48 - # i.e. for freebsd use:
49 - # login_cmd exec /bin/sh - ~/.xinitrc %session
50 --login_cmd exec /bin/bash -login ~/.xinitrc %session
51 -+# login_cmd exec /bin/bash -login ~/.xinitrc %session
52 -+login_cmd exec /bin/bash -login /usr/share/slim/Xsession %session
53 -
54 - # Commands executed when starting and exiting a session.
55 - # They can be used for registering a X11 session with
56 - # sessreg. You can use the %user variable
57 - #
58 --# sessionstart_cmd some command
59 --# sessionstop_cmd some command
60 -+sessionstart_cmd /usr/bin/sessreg -a -l :0.0 %user
61 -+sessionstop_cmd /usr/bin/sessreg -d -l :0.0 %user
62 -
63 - # Start in daemon mode. Valid values: yes | no
64 - # Note that this can be overriden by the command line
65 - # options "-d" and "-nodaemon"
66 --# daemon yes
67 -+daemon yes
68 -
69 - # Available sessions:
70 - # The current chosen session name replaces %session in the login_cmd
71 -@@ -63,7 +64,10 @@ login_cmd exec /bin/bash -login ~/.xinitrc %session
72 - sessiondir /usr/share/xsessions
73 -
74 - # Executed when pressing F11 (requires imagemagick for 'import')
75 --screenshot_cmd import -window root /slim.png
76 -+# Alternative: media-gfx/scrot. See Gentoo bug 252241 for more info.
77 -+screenshot_cmd import -window root /tmp/slim.png
78 -+#screenshot_cmd scrot /tmp/slim.png
79 -+
80 -
81 - # welcome message. Available variables: %host, %domain
82 - welcome_msg Welcome to %host
83 -@@ -92,8 +96,8 @@ reboot_msg The system is rebooting...
84 - # randomly choose from
85 - current_theme default
86 -
87 --# Lock file
88 --lockfile /var/run/slim.lock
89 -+# Lock file, /etc/init.d/xdm expects slim.pid
90 -+lockfile /run/slim.pid
91 -
92 - # Log file
93 - logfile /var/log/slim.log