pool/x11-tools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/x11-tools?expand=0&rev=14

Browse Source
This commit is contained in:
OBS User unknown 2009-04-02 16:55:24 +00:00 committed by Git OBS Bridge
parent eb98c224fa
commit cbb2852a38
3 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11-tools.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Mar 27 16:35:44 CET 2009 - werner@suse.de
- Speed up adding user environment for the case of having a bash
as login shell, requested by Michael Meeks <meeks@suse.de>
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 6 20:17:41 CET 2009 - sndirsch@suse.de Fri Mar 6 20:17:41 CET 2009 - sndirsch@suse.de

5
x11-tools.spec
View File

@ -26,7 +26,7 @@ Provides: xf86tools 3ddiag
Obsoletes: xf86tools 3ddiag Obsoletes: xf86tools 3ddiag
AutoReqProv: on AutoReqProv: on
Version: 0.1 Version: 0.1
Release: 169 Release: 170
Summary: Tools for the X Window System Summary: Tools for the X Window System
Source2: xf86debug Source2: xf86debug
Source3: switch2nv Source3: switch2nv
@ -86,6 +86,9 @@ install -m 755 $RPM_SOURCE_DIR/switch2nvidia $RPM_BUILD_ROOT/usr/bin
/var/adm/fillup-templates/sysconfig.language-%{name} /var/adm/fillup-templates/sysconfig.language-%{name}
%changelog %changelog
* Fri Mar 27 2009 werner@suse.de
- Speed up adding user environment for the case of having a bash
as login shell, requested by Michael Meeks <meeks@suse.de>
* Fri Mar 06 2009 sndirsch@suse.de * Fri Mar 06 2009 sndirsch@suse.de
- wmlist: icewm --> icewm-session (bnc #473511) - wmlist: icewm --> icewm-session (bnc #473511)
* Tue Feb 24 2009 sndirsch@suse.de * Tue Feb 24 2009 sndirsch@suse.de

36
xim
View File

@ -59,24 +59,30 @@ echo "/etc/X11/xim: Checking whether an input method should be started."
# Get variables from the user environment which might influence the start # Get variables from the user environment which might influence the start
# of an input method (see bug #235044, written by Werner Fink <werner@suse.de>): # of an input method (see bug #235044, written by Werner Fink <werner@suse.de>):
# #
if shopt -q extglob ; then
extglob=1
else
extglob=0
shopt -s extglob
fi
adduserenv () { adduserenv () {
local cur var=${1+"$@"} local cur var=${1+"$@"}
case "$SHELL" in
var=${var// /|} */sh|*/ash|*/bash|*/ksh|*/pdksh|*/zsh)
while read cur; do if test -s "$HOME/.profile" ; then
case "$cur" in eval $((echo . "'$HOME/.profile'"
@($var)=*) echo "set +u +e"
echo "/etc/X11/xim: user environment variable $cur" for cur in $var; do
eval $cur echo echo \${$cur+"export $cur=\$$cur;"}
done) | $SHELL)
fi
;;
*/csh|*/tcsh)
if test -s "$HOME/.login" ; then
eval $((echo onintr -
echo source "'$HOME/.login'"
echo unset verbose
for cur in $var; do
echo if \( \${?$cur} \) echo export $cur=\`printenv $cur\`
done) | $SHELL)
fi
;;
esac esac
done < <(exec -l -a ${SHELL##*/} $SHELL -c printenv)
} }
# if gdm passes the language to Xsession, we should not override this # if gdm passes the language to Xsession, we should not override this
@ -90,8 +96,6 @@ else
adduserenv LANG LC_CTYPE LC_ALL INPUT_METHOD adduserenv LANG LC_CTYPE LC_ALL INPUT_METHOD
fi fi
test $extglob -eq 0 && shopt -u extglob
# if INPUT_METHOD is already set to something non-empty here, # if INPUT_METHOD is already set to something non-empty here,
# the user must have set it in ~/.profile or ~/.login or on the # the user must have set it in ~/.profile or ~/.login or on the
# command line before using startx. In that case, don't # command line before using startx. In that case, don't