Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/dtlogin-integration-01-vte-cjk.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 13548 3983d415d88c
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13548
3983d415d88c 2008-09-11 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
     1
 
--- dtlogin-integration-0.36/config/Xinitrc.in.orig	2008-09-11 23:25:49.125681000 +0900
3983d415d88c 2008-09-11 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
     2
 
+++ dtlogin-integration-0.36/config/Xinitrc.in	2008-09-11 23:26:33.420998000 +0900
3983d415d88c 2008-09-11 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
     3
 
@@ -26,7 +26,12 @@ fi
3983d415d88c 2008-09-11 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
     4
 
 export G_FILENAME_ENCODING=@locale,UTF-8
3983d415d88c 2008-09-11 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
     5
 
 export G_BROKEN_FILENAMES=yes
3983d415d88c 2008-09-11 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
     6
 
 # Fixes 6583891
3983d415d88c 2008-09-11 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
     7
 
-export VTE_CJK_WIDTH=1
3983d415d88c 2008-09-11 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
     8
 
+case $LANG in
3983d415d88c 2008-09-11 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
     9
 
+ja*) export VTE_CJK_WIDTH=1;;
3983d415d88c 2008-09-11 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    10
 
+ko*) export VTE_CJK_WIDTH=1;;
3983d415d88c 2008-09-11 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    11
 
+zh*) export VTE_CJK_WIDTH=1;;
3983d415d88c 2008-09-11 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    12
 
+*) ;;
3983d415d88c 2008-09-11 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    13
 
+esac
3983d415d88c 2008-09-11 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    14
3983d415d88c 2008-09-11 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    15
 
 /usr/openwin/bin/xrdb -merge << EOF
3983d415d88c 2008-09-11 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    16
 
 ! Default CDE resources
upstream/oracle/spec-files