Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 185918 Details for
Bug 263192
x11-apps/xinit supplies scripts require xterm (and twm)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
remove non-existant binaries from scripts
gentoo-minimal-xinit.patch (text/plain), 4.45 KB, created by
Olliver Schinagl
on 2009-03-22 23:46:26 UTC
(
hide
)
Description:
remove non-existant binaries from scripts
Filename:
MIME Type:
Creator:
Olliver Schinagl
Created:
2009-03-22 23:46:26 UTC
Size:
4.45 KB
patch
obsolete
>--- xinit-1.0.8/xinitrc.cpp.orig 2009-03-22 18:39:47.000000000 +0100 >+++ xinit-1.0.8/xinitrc.cpp 2009-03-23 00:15:51.000000000 +0100 >@@ -8,96 +8,6 @@ > > XCOMM merge in defaults and keymaps > >-if [ -f $sysresources ]; then >-#ifdef __APPLE__ >- if [ -x /usr/bin/cpp ] ; then >- XRDB -merge $sysresources >- else >- XRDB -nocpp -merge $sysresources >- fi >-#else >- XRDB -merge $sysresources >-#endif >-fi >- >-if [ -f $sysmodmap ]; then >- XMODMAP $sysmodmap >-fi >- >-if [ -f $userresources ]; then >-#ifdef __APPLE__ >- if [ -x /usr/bin/cpp ] ; then >- XRDB -merge $userresources >- else >- XRDB -nocpp -merge $userresources >- fi >-#else >- XRDB -merge $userresources >-#endif >-fi >- >-if [ -f $usermodmap ]; then >- XMODMAP $usermodmap >-fi >- > XCOMM start some nice programs > >-#if defined(__SCO__) || defined(__UNIXWARE__) >-if [ -r /etc/default/xdesktops ]; then >- . /etc/default/xdesktops >-fi >- >-if [ -r $HOME/.x11rc ]; then >- . $HOME/.x11rc >-else >- if [ -r /etc/default/X11 ]; then >- . /etc/default/X11 >- fi >-fi >- >-#if defined(__SCO__) >-if [ -n "$XSESSION" ]; then >- case "$XSESSION" in >- [Yy][Ee][Ss]) >- [ -x /usr/bin/X11/scosession ] && exec /usr/bin/X11/scosession >- ;; >- esac >-fi >- >-if [ -n "$XDESKTOP" ]; then >- exec `eval echo $"$XDESKTOP"` >-else >- if [ -x /usr/bin/X11/pmwm -a -x /usr/bin/X11/scoterm ]; then >- /usr/bin/X11/scoterm 2> /dev/null & >- exec /usr/bin/X11/pmwm 2> /dev/null >- fi >-fi >-#elif defined(__UNIXWARE__) >-if [ -n "$XDESKTOP" ]; then >- exec `eval echo $"$XDESKTOP"` >-else >- if [ -x /usr/X/bin/pmwm ]; then >- exec /usr/X/bin/pmwm 2> /dev/null >- fi >-fi >-#endif >- >-XCOMM This is the fallback case if nothing else is executed above >-#endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */ >- >-#ifdef __APPLE__ >- >-if [ -d XINITDIR/xinitrc.d ] ; then >- for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do >- [ -x "$f" ] && . "$f" >- done >- unset f >-fi >- >-#endif >- >-TWM & >-XCLOCK -geometry 50x50-1+1 & >-XTERM -geometry 80x50+494+51 & >-XTERM -geometry 80x20+494-0 & >-exec XTERM -geometry 80x66+0+0 -name login >+exec /usr/bin/idle.sh >--- xinit-1.0.8/xinit.c.orig 2009-03-22 18:35:55.000000000 +0100 >+++ xinit-1.0.8/xinit.c 2009-03-23 00:14:46.000000000 +0100 >@@ -174,7 +174,7 @@ > > static char *default_server = "X"; > static char *default_display = ":0"; /* choose most efficient */ >-static char *default_client[] = {"xterm", "-geometry", "+1+1", "-n", "login", NULL}; >+static char *default_client[] = {"idle.sh", NULL}; > static char *serverargv[100]; > static char *clientargv[100]; > static char **server = serverargv + 2; /* make sure room for sh .xserverrc args */ >--- xinit-1.0.8/xinit.man.orig 2008-03-06 23:08:48.000000000 +0100 >+++ xinit-1.0.8/xinit.man 2009-03-22 19:13:17.000000000 +0100 >@@ -53,10 +53,8 @@ > If no specific client program is given on the command line, > \fIxinit\fP will look for a file in the user's home directory > called \fI.xinitrc\fP to run as a shell script to start up client programs. >-If no such file exists, \fIxinit\fP will use the following as a default: >-.sp >- xterm \-geometry +1+1 \-n login \-display :0 >-.sp >+If no such file exists, \fIxinit\fP will use nothing as a default and will >+not exit unless terminated. > .PP > If no specific server program is given on the command line, > \fIxinit\fP will look for a file in the user's home directory >@@ -110,18 +108,13 @@ > .TP 8 > .B "xinit" > This will start up a server named \fIX\fP and run the user's \fI\.xinitrc\fP, >-if it exists, or else start an \fIxterm\fP. >+if it exists. > .TP 8 > .B "xinit \-\^\- /usr/local/bin/Xqdss :1" > This is how one could start a specific type of server on an alternate display. > .TP 8 >-.B "xinit \-geometry =80x65+10+10 \-fn 8x13 \-j \-fg white \-bg navy" >-This will start up a server named \fIX\fP, and will append the given >-arguments to the default \fIxterm\fP command. It will ignore \fI\.xinitrc\fP. >-.TP 8 >-.B "xinit \-e widgets \-\^\- ./Xsun \-l \-c" >-This will use the command \fI\.\/Xsun \-l \-c\fP to start the server and will >-append the arguments \fI\-e widgets\fP to the default \fIxterm\fP command. >+.B "xinit \-\^\- ./Xsun \-l \-c" >+This will use the command \fI\.\/Xsun \-l \-c\fP to start the server. > .TP 8 > .B "xinit /usr/ucb/rsh fasthost cpupig \-display ws:1 \-\^\- :1 \-a 2 \-t 5" > This will start a server named \fIX\fP on display 1 with the arguments >@@ -183,9 +176,6 @@ > .I .xinitrc > default client script > .TP 15 >-.I xterm >-client to run if \fI.xinitrc\fP does not exist >-.TP 15 > .I .xserverrc > default server script > .TP 15
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 263192
: 185918 |
185920
|
185921