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/SUNWgnome-dtlogin-integration-01-g11n-migration.diff
author fujiwara
Wed, 04 Feb 2009 08:36:25 +0000
changeset 15009 9cd4a1ffe12d
permissions -rw-r--r--
2009-02-04 Takao Fujiwara <[email protected]> * SUNWdbus.spec: Updated to rename 0005.dbus. * SUNWgnome-dtlogin-integration.spec: Updated to add SUNWdesktop-startup * ext-sources/dtstart: Updated to work with xinitrc.d * ext-sources/0010.env: * ext-sources/0020.pre-localization: * ext-sources/0060.sockets: * ext-sources/0110.fonts: * ext-sources/0120.xrdb: * ext-sources/0210.im: Added * ext-sources/0070.dbus: Renamed * patches/SUNWgnome-dtlogin-integration-01-g11n-migration.diff: Added
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
15009
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
     1
 
--- dtlogin-integration-0.37/config/Xinitrc.in.orig	2009-02-04 16:17:23.416565482 +0900
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
     2
 
+++ dtlogin-integration-0.37/config/Xinitrc.in	2009-02-04 16:17:58.467807163 +0900
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
     3
 
@@ -10,53 +10,6 @@
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
     4
 
 ###
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
     5
 
 #####################################################################
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
     6
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
     7
 
-if [ "x$LC_ALL" = x -a "x$LANG" = x -o "x$LANG" = xC ]; then
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
     8
 
-  :
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
     9
 
-# This is needed until fix 6533406
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    10
 
-# European locales have LC_MESSAGES=C in /usr/lib/locale/*/locale_map
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    11
 
-else
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    12
 
-  export LC_MESSAGES=$LANG
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    13
 
-fi
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    14
 
-
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    15
 
-# Fixes 6555226
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    16
 
-if [ "x$LANG" = "xzh" ] ; then
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    17
 
-  export LANGUAGE=zh:zh_CN.EUC
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    18
 
-fi
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    19
 
-
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    20
 
-export G_FILENAME_ENCODING=@locale,UTF-8
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    21
 
-export G_BROKEN_FILENAMES=yes
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    22
 
-# Fixes 6583891
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    23
 
-case $LANG in
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    24
 
-ja*) export VTE_CJK_WIDTH=1;;
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    25
 
-ko*) export VTE_CJK_WIDTH=1;;
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    26
 
-zh*) export VTE_CJK_WIDTH=1;;
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    27
 
-*) ;;
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    28
 
-esac
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    29
 
-
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    30
 
-/usr/openwin/bin/xrdb -merge << EOF
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    31
 
-! Default CDE resources
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    32
 
-*WindowColor:           #8A008A008A00
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    33
 
-!*WindowForeground:      #FF0000000000
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    34
 
-!*DataBackground:        #0000FF000000
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    35
 
-*DataForeground:        #FF0000000000
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    36
 
-*WorkspaceColor:        #8A008A008A00
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    37
 
-*Color.Background:      #FF000000FF00
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    38
 
-!*Color.Foreground:      #0000FF000000
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    39
 
-*foreground:            #000000000000
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    40
 
-! Hack for Dtmail
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    41
 
-*XmText*background: seashell
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    42
 
-*XmTextField*background: seashell
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    43
 
-*Message_List*background: seashell
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    44
 
-*background:    #AE00B200C300
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    45
 
-Dthello*string:		Welcome to the Sun Java Desktop System
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    46
 
-EOF
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    47
 
-
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    48
 
-if [ -f $HOME/.Xdefaults ]; then
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    49
 
-    xrdb -merge $HOME/.Xdefaults        # Load Users X11 resource database
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    50
 
-fi
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    51
 
-
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    52
 
-@EXEC_PREFIX@/bin/linc-cleanup-sockets
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    53
 
-
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    54
 
 command=@EXEC_PREFIX@/bin/gnome-session
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    55
9cd4a1ffe12d 2009-02-04 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset 
    56
 
 echo 'Starting gnome-session'
upstream/oracle/spec-files