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=2

Browse Source
This commit is contained in:
OBS User unknown 2007-03-01 19:58:07 +00:00 committed by Git OBS Bridge
parent a2e6f582d8
commit e5f99095c2
3 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11-tools.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 01 12:26:41 CET 2007 - mfabian@suse.de
- Bugzilla #235044: make sure that environment variables from
the user environment which might influence the start of an
input method are read (LANG, LC_CTYPE, LC_ALL, INPUT_METHOD).
Code to fix this by Werner Fink <werner@suse.de>. Thank you!
-------------------------------------------------------------------
Wed Jan 10 19:22:48 CET 2007 - sndirsch@suse.de

9
x11-tools.spec
View File

@ -18,7 +18,7 @@ Provides: xf86tools
Obsoletes: xf86tools
Autoreqprov: on
Version: 0.1
Release: 60
Release: 63
Summary: Tools for the X Window System
Source2: xf86debug
Source6: wmlist
@ -71,7 +71,12 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var
/etc/skel/.xim.template
/var/adm/fillup-templates/sysconfig.language-%{name}
%changelog -n x11-tools
%changelog
* Thu Mar 01 2007 - mfabian@suse.de
- Bugzilla #235044: make sure that environment variables from
the user environment which might influence the start of an
input method are read (LANG, LC_CTYPE, LC_ALL, INPUT_METHOD).
Code to fix this by Werner Fink <werner@suse.de>. Thank you!
* Wed Jan 10 2007 - sndirsch@suse.de
- xf86debug:
* generate core file as well

33
xim
View File

@ -4,7 +4,8 @@
#
# Copyright © 2001 SUSE LINUX GmbH Nuernberg, Germany
#
# Mike Fabian <mfabian@suse.de>, 2000, 2001, 2002, 2004, 2005
# Mike Fabian <mfabian@suse.de>, 2000, 2001, 2002, 2004, 2005, 2006, 2007
# Werner Fink <werner@suse.de>, 2007
#
# This program comes with ABSOLUTELY NO WARRANTY; it may be copied or modified
# under the terms of the GNU General Public License version 2 as published by
@ -52,15 +53,43 @@
# export QT_IM_MODULE=scim
# scim -d
echo "/etc/X11/xim: Checking wether an input method should be started."
#
# 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>):
#
if shopt -q extglob ; then
extglob=1
else
extglob=0
shopt -s extglob
fi
adduserenv () {
local cur var=${1+"$@"}
var=${var// /|}
while read cur; do
case "$cur" in
@($var)=*)
echo "/etc/X11/xim: user environment variable $cur"
eval $cur
esac
done < <(exec -l -a ${SHELL##*/} $SHELL -c printenv)
}
adduserenv LANG LC_CTYPE LC_ALL INPUT_METHOD
test $extglob -eq 0 && shopt -u extglob
# if INPUT_METHOD is already set to something non-empty here,
# the user must have set it in ~/.profile or ~/.login or on the
# command line before using startx. In that case, don't
# read the system wide default from /etc/sysconfig/language,
# use the user supplied value instead:
if [ "$INPUT_METHOD" == "" ] ; then
echo "sourcing /etc/sysconfig/language to get the value of INPUT_METHOD"
source /etc/sysconfig/language
fi