rpms/im-sdk/FC-3 im-sdk.spec, 1.99, 1.100 leif-canna-fix-missing-start-end-func-r2458-154372.patch, 1.1, 1.2 leif-unit-U+000A-r2484-132936.patch, 1.1, 1.2 xiiimp-fix-default-le-r2435-139811.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: tagoh

Update of /cvs/dist/rpms/im-sdk/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv16132

Modified Files:
	im-sdk.spec 
	leif-canna-fix-missing-start-end-func-r2458-154372.patch 
	leif-unit-U+000A-r2484-132936.patch 
	xiiimp-fix-default-le-r2435-139811.patch 
Log Message:
modified patches to be buildable.


Index: im-sdk.spec
===================================================================
RCS file: /cvs/dist/rpms/im-sdk/FC-3/im-sdk.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- im-sdk.spec	27 Jul 2005 10:03:38 -0000	1.99
+++ im-sdk.spec	27 Jul 2005 11:18:06 -0000	1.100
@@ -412,8 +412,8 @@
 %patch73 -p1 -b .xft-highlight
 %patch74 -p1 -b .x86_64-htt_xbe-crash
 %patch75 -p0 -b .double-encoded-utf8
-%patch76 -p0 -b .default-le
-%patch77 -p0 -b .statusarea
+%patch76 -p1 -b .default-le
+%patch77 -p1 -b .statusarea
 
 ## iiimcf
 %patch80 -p0 -b .iiimcf-deactivate-im
@@ -450,7 +450,7 @@
 %patch355 -p1 -b .bn_IN
 %patch356 -p1 -b .gu_IN
 %patch357 -p0 -b .european
-%patch358 -p0 -b .U+000A
+%patch358 -p1 -b .U+000A
 
 # Sun Chinese LE
 ## always need to be applied to build with/without -le-asia and le-korea

leif-canna-fix-missing-start-end-func-r2458-154372.patch:
 CannaLE.c |   10 ++++++++++
 1 files changed, 10 insertions(+)

Index: leif-canna-fix-missing-start-end-func-r2458-154372.patch
===================================================================
RCS file: /cvs/dist/rpms/im-sdk/FC-3/leif-canna-fix-missing-start-end-func-r2458-154372.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- leif-canna-fix-missing-start-end-func-r2458-154372.patch	27 Jul 2005 10:03:38 -0000	1.1
+++ leif-canna-fix-missing-start-end-func-r2458-154372.patch	27 Jul 2005 11:18:06 -0000	1.2
@@ -1,3 +1,9 @@
+2005-04-11  Akira TAGOH  <tagoh at redhat.com>
+
+	* CannaLE.c (canna_make_conversion_off): call
+	iml_make_end_conversion_inst().
+	(canna_make_conversion_on): call iml_make_start_conversion_inst().
+
 Index: leif/canna/CannaLE.c
 ===================================================================
 --- leif/canna/CannaLE.c	(リビジョン 2457)
@@ -33,17 +39,3 @@
  	pcls->conversion_start = True;
  	if (canna_get_current_mode(s) == CANNA_MODE_AlphaMode) {
  	    canna_change_mode(s, CANNA_MODE_HenkanMode);
-Index: leif/canna/ChangeLog
-===================================================================
---- leif/canna/ChangeLog	(リビジョン 2457)
-+++ leif/canna/ChangeLog	(リビジョン 2458)
-@@ -1,3 +1,9 @@
-+2005-04-11  Akira TAGOH  <tagoh at redhat.com>
-+
-+	* CannaLE.c (canna_make_conversion_off): call
-+	iml_make_end_conversion_inst().
-+	(canna_make_conversion_on): call iml_make_start_conversion_inst().
-+
- 2005-04-05  Akira TAGOH  <tagoh at redhat.com>
- 
- 	* CannaLE.c (canna_status_draw): show a message at the status window

leif-unit-U+000A-r2484-132936.patch:
 codepoint_im/codepoint_filter.c |   12 +++++++++++-
 leif/key_event.c                |    8 +++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

Index: leif-unit-U+000A-r2484-132936.patch
===================================================================
RCS file: /cvs/dist/rpms/im-sdk/FC-3/leif-unit-U+000A-r2484-132936.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- leif-unit-U+000A-r2484-132936.patch	27 Jul 2005 10:03:38 -0000	1.1
+++ leif-unit-U+000A-r2484-132936.patch	27 Jul 2005 11:18:06 -0000	1.2
@@ -1,42 +1,6 @@
-Index: leif/unit/leif/key_event.c
-===================================================================
---- leif/unit/leif/key_event.c	(リビジョン 2483)
-+++ leif/unit/leif/key_event.c	(リビジョン 2484)
-@@ -518,8 +518,14 @@
- 
-     if (ret == IME_NOT_USED_KEY)
- 	iml_sendback_key(s, key_event);
--    else 
-+    else if (ret == RETURN_KEY) {
-+	key_event->keyCode = IM_VK_ENTER;
-+	key_event->keyChar = 0;
-+	key_event->modifier = 0;
- 	le_output_ime_buffer(s, session_data->ime_buffer);
-+	iml_sendback_key(s, key_event);
-+    } else
-+	le_output_ime_buffer(s, session_data->ime_buffer);
- 
-     if ((session_data->ime_buffer->deadkey_flag == IME_HOTKEY_END) && !session_data->ime_buffer->conv_flag) {
- 	proc_key_switch_conversion_event(udp, s, CONVERSION_OFF, (char *)NULL);
-Index: leif/unit/ChangeLog
-===================================================================
---- leif/unit/ChangeLog	(リビジョン 2483)
-+++ leif/unit/ChangeLog	(リビジョン 2484)
-@@ -1,3 +1,10 @@
-+2005-04-14  Sriram Swaminathan  <sriram.swaminathan at sun.com>
-+
-+	* leif/key_event.c
-+	* codepoint_im/codepoint_filter.c
-+
-+	Fix to commit RETURN key when 0x000a is the input in UNICODE-HEX mode.
-+
- 2005-04-13  Jens Petersen  <petersen at redhat.com>
- 
- 	* ctim/Makefile.am (moduledir): Use IM_LEIFDIR instead of IM_LOCALEDIR.
-Index: leif/unit/codepoint_im/codepoint_filter.c
-===================================================================
---- leif/unit/codepoint_im/codepoint_filter.c	(リビジョン 2483)
-+++ leif/unit/codepoint_im/codepoint_filter.c	(リビジョン 2484)
+diff -ruN im-sdk-r12_1-svn2002.orig/leif/unit/codepoint_im/codepoint_filter.c im-sdk-r12_1-svn2002/leif/unit/codepoint_im/codepoint_filter.c
+--- im-sdk-r12_1-svn2002.orig/leif/unit/codepoint_im/codepoint_filter.c	2005-07-27 20:12:03.000000000 +0900
++++ im-sdk-r12_1-svn2002/leif/unit/codepoint_im/codepoint_filter.c	2005-07-27 20:12:34.000000000 +0900
 @@ -126,6 +126,9 @@
      sprintf(tmpstr,"0%s",Preedit_Buf);
    }
@@ -63,3 +27,21 @@
        Preedit_Len = 0;
        Preedit_CaretPos = 0;
        Input_Len = 0;
+diff -ruN im-sdk-r12_1-svn2002.orig/leif/unit/leif/key_event.c im-sdk-r12_1-svn2002/leif/unit/leif/key_event.c
+--- im-sdk-r12_1-svn2002.orig/leif/unit/leif/key_event.c	2005-07-27 20:12:03.000000000 +0900
++++ im-sdk-r12_1-svn2002/leif/unit/leif/key_event.c	2005-07-27 20:14:55.000000000 +0900
+@@ -317,7 +317,13 @@
+ 
+     if (ret == IME_NOT_USED_KEY)
+ 	iml_sendback_key(s, key_event);
+-    else
++    else if (ret == RETURN_KEY) {
++	key_event->keyCode = IM_VK_ENTER;
++	key_event->keyChar = 0;
++	key_event->modifier = 0;
++	le_output_ime_buffer(s, session_data->ime_buffer);
++	iml_sendback_key(s, key_event);
++    } else
+ 	le_output_ime_buffer(s, session_data->ime_buffer);
+ }
+ /* Local Variables: */

xiiimp-fix-default-le-r2435-139811.patch:
 iiimcfFun.c |  141 +++++++++++++++++++-----------------------------------------
 iiimpIM.c   |   25 +++++++++-
 2 files changed, 68 insertions(+), 98 deletions(-)

Index: xiiimp-fix-default-le-r2435-139811.patch
===================================================================
RCS file: /cvs/dist/rpms/im-sdk/FC-3/xiiimp-fix-default-le-r2435-139811.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xiiimp-fix-default-le-r2435-139811.patch	27 Jul 2005 10:03:38 -0000	1.1
+++ xiiimp-fix-default-le-r2435-139811.patch	27 Jul 2005 11:18:06 -0000	1.2
@@ -1,20 +1,19 @@
-Index: iiimxcf/xiiimp.so/iiimp/iiimcfFun.c
-===================================================================
---- iiimxcf/xiiimp.so/iiimp/iiimcfFun.c	(リビジョン 2433)
-+++ iiimxcf/xiiimp.so/iiimp/iiimcfFun.c	(リビジョン 2435)
-@@ -989,8 +989,9 @@
+diff -ruN im-sdk-r12_1-svn2002.orig/iiimxcf/xiiimp.so/iiimp/iiimcfFun.c im-sdk-r12_1-svn2002/iiimxcf/xiiimp.so/iiimp/iiimcfFun.c
+--- im-sdk-r12_1-svn2002.orig/iiimxcf/xiiimp.so/iiimp/iiimcfFun.c	2004-06-05 04:44:15.000000000 +0900
++++ im-sdk-r12_1-svn2002/iiimxcf/xiiimp.so/iiimp/iiimcfFun.c	2005-07-27 20:00:53.000000000 +0900
+@@ -977,8 +977,9 @@
    st = iiimcf_create_attr (&attr);
-   if (st != IIIMF_STATUS_SUCCESS) 
+   if (st != IIIMF_STATUS_SUCCESS)
      return;
 -  iiimcf_attr_put_ptr_value (attr, IIIMCF_ATTR_INPUT_LANGUAGE,
--                             iiim_lang);
+-			     iiim_lang);
 +  if (iiim_lang)
-+      iiimcf_attr_put_ptr_value (attr, IIIMCF_ATTR_INPUT_LANGUAGE,
-+				 iiim_lang);
-   st = iiimcf_context_set_attr(XIC_IIIMP(ic, context), attr);
++	iiimcf_attr_put_ptr_value (attr, IIIMCF_ATTR_INPUT_LANGUAGE,
++				   iiim_lang);
+   st = iiimcf_create_context(XIM_IIIMP(im, handle), attr, &c);
+   XIC_IIIMP(ic, context) = c;
    iiimcf_destroy_attr (attr);
-   if (st != IIIMF_STATUS_SUCCESS)
-@@ -1036,100 +1037,58 @@
+@@ -1024,100 +1025,58 @@
  {
    int i;
    IIIMF_status st;
@@ -150,7 +149,7 @@
        /*
  	still cannot find a match. Just take one for "en" as
  	a default.
-@@ -1141,25 +1100,17 @@
+@@ -1129,25 +1088,17 @@
  	  if (st != IIIMF_STATUS_SUCCESS)
  	    continue;
  	  if (!strncmp (langid, "en", 2))
@@ -159,8 +158,7 @@
 -	      ic->current_language = strdup (langid);
 -	      return lang_list[i];
 -	    }
-+	    goto found_language;
- 	}
+-	}
 -      /*
 -	I've given up. Use whatever the 1st in the list as the fallback.
 -      */
@@ -171,7 +169,8 @@
 -	  Xfree (ic->current_language);
 -	  ic->current_language = strdup (langid);
 -	  return lang_list[0];
--	}
++	    goto found_language;
+ 	}
      }
 +
    return NULL;
@@ -184,11 +183,10 @@
  }
  
  /* Local Variables: */
-Index: iiimxcf/xiiimp.so/iiimp/iiimpIM.c
-===================================================================
---- iiimxcf/xiiimp.so/iiimp/iiimpIM.c	(リビジョン 2433)
-+++ iiimxcf/xiiimp.so/iiimp/iiimpIM.c	(リビジョン 2435)
-@@ -360,6 +360,7 @@
+diff -ruN im-sdk-r12_1-svn2002.orig/iiimxcf/xiiimp.so/iiimp/iiimpIM.c im-sdk-r12_1-svn2002/iiimxcf/xiiimp.so/iiimp/iiimpIM.c
+--- im-sdk-r12_1-svn2002.orig/iiimxcf/xiiimp.so/iiimp/iiimpIM.c	2005-07-27 19:08:54.000000000 +0900
++++ im-sdk-r12_1-svn2002/iiimxcf/xiiimp.so/iiimp/iiimpIM.c	2005-07-27 19:58:23.000000000 +0900
+@@ -361,6 +361,7 @@
      char *lang;
      char *p;
      IIIMCF_language *plangs;
@@ -196,7 +194,7 @@
  
      if (XIM_IIIMP(im, primary_locale)) {
  	lang = strdup(XIM_IIIMP(im, primary_locale));
-@@ -373,7 +374,9 @@
+@@ -374,7 +375,9 @@
  	!= IIIMF_STATUS_SUCCESS)
  	return NULL;
      for (i = 0; i < n; i++) {
@@ -207,7 +205,7 @@
  	if (strcmp(lang, ll) == 0)
  	    return plangs[i];
      }
-@@ -386,7 +389,9 @@
+@@ -387,7 +390,9 @@
  	*p = 0;
  
      for (i = 0; i < n; i++) {
@@ -218,7 +216,7 @@
  	if (strcmp(lang, ll) == 0)
  	    return plangs[i];
      }
-@@ -396,12 +401,26 @@
+@@ -397,12 +402,26 @@
  	*p = 0;
  
      for (i = 0; i < n; i++) {
@@ -246,19 +244,3 @@
      return NULL;
  }
  
-Index: iiimxcf/xiiimp.so/ChangeLog
-===================================================================
---- iiimxcf/xiiimp.so/ChangeLog	(リビジョン 2433)
-+++ iiimxcf/xiiimp.so/ChangeLog	(リビジョン 2435)
-@@ -1,3 +1,11 @@
-+2005-04-04  Akira TAGOH  <tagoh at redhat.com>
-+
-+	* iiimp/iiimpIM.c (get_IM_language): try to find the en LEs too like
-+	iiimgcf does.
-+
-+	* iiimp/iiimcfFun.c (ic_initialize_with_input_language): check NULL.
-+	(get_input_language): return a proper language only. otherwise NULL.
-+
- 2005-04-01  Motonobu Ichimura  <famao at openi18n.org>
- 
- 	* iiimp/iiimpIM.c (getIMLangName): fix memory leak.