rpms/olpc-utils/OLPC-2 load_xim_conditionally.patch, NONE, 1.1 olpc-utils.spec, 1.42, 1.43

[Sayamindu Dasgupta]

Author: sayamind

Update of /cvs/pkgs/rpms/olpc-utils/OLPC-2
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20543

Modified Files:
	olpc-utils.spec 
Added Files:
	load_xim_conditionally.patch 
Log Message:
Backport conditional loading of XIM GTK Input Module (trac #7818)



load_xim_conditionally.patch:

--- NEW FILE load_xim_conditionally.patch ---
From: Sayamindu Dasgupta <sayamindu at gmail.com>
Date: Thu, 14 Aug 2008 18:34:33 +0000 (+0530)
Subject: dlo#7818: Load the XIM GTK Input Module conditionally
X-Git-Tag: v0.84~1
X-Git-Url: https://dev.laptop.org/git?p=projects%2Folpc-utils;a=commitdiff_plain;h=c2f1e45b263240e07a0f9b0e0d2a2cd4276c8204

dlo#7818: Load the XIM GTK Input Module conditionally
---

diff --git a/usr/bin/olpc-session b/usr/bin/olpc-session
index 86277e2..473d75d 100755
--- a/usr/bin/olpc-session
+++ b/usr/bin/olpc-session
@@ -21,13 +21,23 @@
 # provide some defaults
 LANG="en_US.UTF-8"
 XKB_LAYOUT="us"
-# We need to stop loading of certain GTK Input Modules (d.l.o #6945)
-GTK_IM_MODULE="gtk-im-context-simple"
 
 # enable internationalization
 [ -f "$HOME/.i18n" ] && . "$HOME/.i18n"
 export LANG
 
+# We need to stop loading of certain GTK Input Modules (d.l.o #6945)
+# Normally we would load the "gtk-im-context-simple" module, but 
+# some keyboards require to use Compose tables, in which case we need 
+# to use the "xim" module
+# In reality, the Compose tables get loaded if the locale is set 
+# appropriately, so we use the LANG variable below
+if [ "$LANG" = "am_ET.UTF-8" ]; then
+  GTK_IM_MODULE="xim"
+else
+  GTK_IM_MODULE="gtk-im-context-simple"
+fi
+
 # load keyboard settings
 [ -f "/etc/sysconfig/keyboard" ] && . "/etc/sysconfig/keyboard"
 [ -f "$HOME/.kbd" ] && . "$HOME/.kbd"


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-2/olpc-utils.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- olpc-utils.spec	30 Jul 2008 19:16:04 -0000	1.42
+++ olpc-utils.spec	30 Aug 2008 21:05:56 -0000	1.43
@@ -1,6 +1,6 @@
 Name:		olpc-utils
 Version:	0.74
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	OLPC utilities
 URL:		http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
 Group:		System Environment/Base
@@ -15,6 +15,8 @@
 Source0:	olpc-utils-%{version}.tar.bz2
 Source1:        http://dev.laptop.org/~cjb/failsafe.py
 Source100:	dot-xsession-example
+Patch1: load_xim_conditionally.patch 
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # for olpc-dm
@@ -42,6 +44,7 @@
 
 %prep
 %setup -q
+%patch1 -p3 -b .olpc-session
 
 
 %build
@@ -108,6 +111,9 @@
 
 
 %changelog
+* Sun Aug 31 2008 Sayamindu Dasgupta <sayamindu at laptop.org> - 0.74-3
+- Backport conditional loading of XIM GTK Input Module (trac #7818)
+
 * Wed Jul 30 2008 Dennis Gilmore <dennis at laptop.org> - 0.74-2
 - add clean up script for http://dev.laptop.org/ticket/7591