Attachment 1270 Details for Bug 3739 – ime add/remove patch for lang.pm

[patch] ime add/remove patch for lang.pm

lang.pm.patch (text/plain), 2.59 KB, created by You-Cheng Hsieh on 2011-12-19 03:21:58 CET

(hide)

Description:

Filename:

MIME Type:

Creator: You-Cheng Hsieh

Created: 2011-12-19 03:21:58 CET

Size: 2.59 KB

patch

obsolete

>diff -up /home/user/lang.pm.orig /home/user/lang.pm
>--- /home/user/lang.pm.orig	2011-12-19 18:12:08.000000000 +0800
>+++ /home/user/lang.pm	2011-12-19 18:14:04.000000000 +0800
>@@ -585,19 +585,6 @@ my ($is_kde4);
> # keep the 'packages' field in sync with share/rpmsrate:
> my %IM_config =
>   (
>-   chinput => {
>-               GTK_IM_MODULE => 'xim',
>-               XIM => 'chinput',
>-               XMODIFIERS => '@im=Chinput',
>-	       XIM_PROGRAM => {
>-		   'zh_CN' => 'chinput -gb',
>-		   'en_SG' => 'chinput -gb',
>-		   'zh_HK' => 'chinput -big5',
>-		   'zh_TW' => 'chinput -big5',
>-	       },	       
>-	       langs => 'zh',
>-	       packages => { generic => sub { 'miniChinput' } },
>-              },
>    fcitx => {
>              GTK_IM_MODULE => 'xim',
>              XIM => 'fcitx',
>@@ -616,6 +603,17 @@ my %IM_config =
> 		     generic => sub { qw(gcin) },
> 	     },
>             },
>+   hime => {
>+             GTK_IM_MODULE => 'hime',
>+             XIM => 'hime',
>+             XIM_PROGRAM => 'hime',
>+             XMODIFIERS => '@im=hime',
>+	     langs => 'zh',
>+	     packages => {
>+		     common => sub { if_($is_kde4, 'hime-qt4') },
>+		     generic => sub { qw(hime) },
>+	     },
>+            },
>    'im-ja' => {
>                GTK_IM_MODULE => 'im-ja',
>                QT_IM_MODULE => 'xim',
>@@ -624,15 +622,6 @@ my %IM_config =
>                XMODIFIERS => '@im=im-ja-xim-server',
> 	       langs => 'ja',
>               },
>-
>-   kinput2 => {   
>-               GTK_IM_MODULE => 'xim',
>-               XIM => 'kinput2',
>-               XIM_PROGRAM => 'kinput2',
>-               XMODIFIERS => '@im=kinput2',
>-	       langs => 'ja',
>-	       packages => { generic => sub { 'kinput2-wnn' } },
>-              },
>    nabi => {
>             GTK_IM_MODULE => 'xim',
>             XIM => 'nabi',
>@@ -640,15 +629,6 @@ my %IM_config =
>             XMODIFIERS => '@im=nabi',
> 	    langs => 'ko',
>            },
>-
>-   oxim => {
>-       GTK_IM_MODULE => 'oxim',
>-       XIM => 'oxim',
>-       XIM_PROGRAM => 'oxim',
>-       XMODIFIERS => '@im=oxim', # '@im=SCIM' is broken for now
>-       langs => 'zh_TW',
>-       packages => { generic => sub { 'oxim' } },
>-   },
>    'scim' => {
>             GTK_IM_MODULE => 'scim',
> 	    QT_IM_MODULE => 'xim',
>@@ -704,13 +684,6 @@ my %IM_config =
> 		  generic => sub { qw(uim-gtk uim) },
> 	  },
>           },
>-   xcin => {
>-            XIM => 'xcin',
>-            XIM_PROGRAM => 'xcin',
>-            XMODIFIERS => '@im=xcin-zh_TW',
>-            GTK_IM_MODULE => 'xim',
>-	    langs => 'zh',
>-           },
>    'x-unikey' => {
>                   GTK_IM_MODULE => 'xim',
>                   XMODIFIERS => '@im=unikey',

diff -up /home/user/lang.pm.orig /home/user/lang.pm
--- /home/user/lang.pm.orig	2011-12-19 18:12:08.000000000 +0800
+++ /home/user/lang.pm	2011-12-19 18:14:04.000000000 +0800
@@ -585,19 +585,6 @@ my ($is_kde4);
 # keep the 'packages' field in sync with share/rpmsrate:
 my %IM_config =
   (
-   chinput => {
-               GTK_IM_MODULE => 'xim',
-               XIM => 'chinput',
-               XMODIFIERS => '@im=Chinput',
-	       XIM_PROGRAM => {
-		   'zh_CN' => 'chinput -gb',
-		   'en_SG' => 'chinput -gb',
-		   'zh_HK' => 'chinput -big5',
-		   'zh_TW' => 'chinput -big5',
-	       },	       
-	       langs => 'zh',
-	       packages => { generic => sub { 'miniChinput' } },
-              },
    fcitx => {
              GTK_IM_MODULE => 'xim',
              XIM => 'fcitx',
@@ -616,6 +603,17 @@ my %IM_config =
 		     generic => sub { qw(gcin) },
 	     },
             },
+   hime => {
+             GTK_IM_MODULE => 'hime',
+             XIM => 'hime',
+             XIM_PROGRAM => 'hime',
+             XMODIFIERS => '@im=hime',
+	     langs => 'zh',
+	     packages => {
+		     common => sub { if_($is_kde4, 'hime-qt4') },
+		     generic => sub { qw(hime) },
+	     },
+            },
    'im-ja' => {
                GTK_IM_MODULE => 'im-ja',
                QT_IM_MODULE => 'xim',
@@ -624,15 +622,6 @@ my %IM_config =
                XMODIFIERS => '@im=im-ja-xim-server',
 	       langs => 'ja',
               },
-
-   kinput2 => {   
-               GTK_IM_MODULE => 'xim',
-               XIM => 'kinput2',
-               XIM_PROGRAM => 'kinput2',
-               XMODIFIERS => '@im=kinput2',
-	       langs => 'ja',
-	       packages => { generic => sub { 'kinput2-wnn' } },
-              },
    nabi => {
             GTK_IM_MODULE => 'xim',
             XIM => 'nabi',
@@ -640,15 +629,6 @@ my %IM_config =
             XMODIFIERS => '@im=nabi',
 	    langs => 'ko',
            },
-
-   oxim => {
-       GTK_IM_MODULE => 'oxim',
-       XIM => 'oxim',
-       XIM_PROGRAM => 'oxim',
-       XMODIFIERS => '@im=oxim', # '@im=SCIM' is broken for now
-       langs => 'zh_TW',
-       packages => { generic => sub { 'oxim' } },
-   },
    'scim' => {
             GTK_IM_MODULE => 'scim',
 	    QT_IM_MODULE => 'xim',
@@ -704,13 +684,6 @@ my %IM_config =
 		  generic => sub { qw(uim-gtk uim) },
 	  },
           },
-   xcin => {
-            XIM => 'xcin',
-            XIM_PROGRAM => 'xcin',
-            XMODIFIERS => '@im=xcin-zh_TW',
-            GTK_IM_MODULE => 'xim',
-	    langs => 'zh',
-           },
    'x-unikey' => {
                   GTK_IM_MODULE => 'xim',
                   XMODIFIERS => '@im=unikey',

Actions: View | Diff

Attachments on bug 3739: 1234 | 1270