Hello community, here is the log from the commit of package x11-tools checked in at Thu Mar 1 20:58:06 CET 2007. -------- --- x11-tools/x11-tools.changes 2007-01-10 19:23:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/x11-tools/x11-tools.changes 2007-03-01 12:35:12.000000000 +0100 @@ -1,0 +2,8 @@ +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! + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x11-tools.spec ++++++ --- /var/tmp/diff_new_pack.U26927/_old 2007-03-01 20:57:21.000000000 +0100 +++ /var/tmp/diff_new_pack.U26927/_new 2007-03-01 20:57:21.000000000 +0100 @@ -18,7 +18,7 @@ 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 @@ /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 ++++++ xim ++++++ --- x11-tools/xim 2006-02-13 12:38:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/x11-tools/xim 2007-03-01 12:26:17.000000000 +0100 @@ -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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org