fixes patch about cast for the case of __STDC_ISO_10646__

4 files changed, 23 insertions, 18 deletions

diff --git a/inputmethod/scim-python/distinfo b/inputmethod/scim-python/distinfo
index 6e03ad5994f..de77961673d 100644
--- a/inputmethod/scim-python/distinfo
+++ b/inputmethod/scim-python/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2012/12/25 21:07:47 joerg Exp $
+$NetBSD: distinfo,v 1.3 2013/03/22 13:29:42 obache Exp $
 
 SHA1 (pinyin-database-0.1.10.5.tar.bz2) = d0bb78416431a59cbcaf62809e56fab284f6d588
 RMD160 (pinyin-database-0.1.10.5.tar.bz2) = 3acfa16d11b2099d7719f3b7b5a77c523b982d2d
@@ -7,6 +7,6 @@ SHA1 (scim-python-0.1.13rc1.tar.gz) = 93343522a5f50fc1f68fd29e76e276036a77e965
 RMD160 (scim-python-0.1.13rc1.tar.gz) = 1a47d4f7d2be5d171d23f040748299b6e0c1dce4
 Size (scim-python-0.1.13rc1.tar.gz) = 715364 bytes
 SHA1 (patch-aa) = b576047a60704b19db91792fcdbe4e1e8515be26
-SHA1 (patch-ab) = 4505e5d93f2b44d46560f9d04fa769038bea8956
-SHA1 (patch-ac) = e3b795ee4b218d8c1bb0e57cfbc2ec879f9bc840
-SHA1 (patch-ad) = bc2ab7119ec979ab8888fb9a7b6f238993f5cf22
+SHA1 (patch-ab) = 3b3987411af8c6e6598de8699ac6e28c994fba41
+SHA1 (patch-ac) = f42db4a786023652ccdd7cfb396796f667127493
+SHA1 (patch-ad) = 6ff86e5ccbf4bb8bfd86626ec1223279c9617b78
diff --git a/inputmethod/scim-python/patches/patch-ab b/inputmethod/scim-python/patches/patch-ab
index f65cd192bf5..8bc2f447a00 100644
--- a/inputmethod/scim-python/patches/patch-ab
+++ b/inputmethod/scim-python/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2010/08/08 01:05:04 obache Exp $
+$NetBSD: patch-ab,v 1.2 2013/03/22 13:29:42 obache Exp $
 
-remove unwanted cast.
+* let to cast with appropriate type.
 
 --- src/scim-python-engine.cpp.orig	2008-07-11 04:16:15.000000000 +0000
 +++ src/scim-python-engine.cpp
@@ -9,7 +9,7 @@ remove unwanted cast.
  	unistr = g_utf16_to_ucs4 (str, size, NULL, NULL, NULL);
  
 -	self->engine.update_preedit_string (WideString ((wchar_t *)unistr), 
-+	self->engine.update_preedit_string (WideString (unistr), 
++	self->engine.update_preedit_string (WideString ((scim::ucs4_t *)unistr), 
  								Attributes_FromTupleOrList (pAttrs));
  	g_free (unistr);
  
@@ -18,7 +18,7 @@ remove unwanted cast.
  
  	unistr = g_utf16_to_ucs4 (str, size, NULL, NULL, NULL);
 -	self->engine.update_aux_string (WideString ((wchar_t *)unistr),
-+	self->engine.update_aux_string (WideString (unistr),
++	self->engine.update_aux_string (WideString ((scim::ucs4_t *)unistr),
  								Attributes_FromTupleOrList (pAttrs));
  	g_free (unistr);
  #endif
@@ -27,7 +27,7 @@ remove unwanted cast.
  
  	unistr = g_utf16_to_ucs4 (str, size, NULL, NULL, NULL);
 -	self->engine.commit_string (WideString ((wchar_t *)unistr));
-+	self->engine.commit_string (WideString (unistr));
++	self->engine.commit_string (WideString ((scim::ucs4_t *)unistr));
  	g_free (unistr);
  #endif
  
diff --git a/inputmethod/scim-python/patches/patch-ac b/inputmethod/scim-python/patches/patch-ac
index cda22dd4c2b..05e3c0554e8 100644
--- a/inputmethod/scim-python/patches/patch-ac
+++ b/inputmethod/scim-python/patches/patch-ac
@@ -1,15 +1,20 @@
-$NetBSD: patch-ac,v 1.1.1.1 2010/08/08 01:05:04 obache Exp $
+$NetBSD: patch-ac,v 1.2 2013/03/22 13:29:42 obache Exp $
 
-add wanted convert.
+* let to cast with appropriate type.
 
 --- src/scim-python-factory.cpp.orig	2008-07-11 04:16:15.000000000 +0000
 +++ src/scim-python-factory.cpp
-@@ -134,14 +134,14 @@ PyIMEngineFactory::get_attr_unicode (cha
+@@ -130,18 +130,18 @@ PyIMEngineFactory::get_attr_unicode (cha
+ 	if (pValue) {
+ 		if (PyUnicode_Check (pValue)) {
+ 		#if Py_UNICODE_SIZE == 4
+-			result = (wchar_t *)PyUnicode_AS_UNICODE (pValue);
++			result = (scim::ucs4_t *)PyUnicode_AS_UNICODE (pValue);
  		#else
  			gunichar *unistr = g_utf16_to_ucs4 (PyUnicode_AS_UNICODE (pValue),
  						PyUnicode_GET_SIZE (pValue), NULL, NULL, NULL);
 -			result = (wchar_t *) unistr;
-+			result = WideString(unistr);
++			result = WideString((scim::ucs4_t *)unistr);
  			g_free (unistr);
  		#endif
  		}
@@ -17,7 +22,7 @@ add wanted convert.
  			gunichar *unistr = g_utf8_to_ucs4 (PyString_AsString (pValue),
  						PyString_GET_SIZE (pValue), NULL, NULL, NULL);
 -			result = (wchar_t *)unistr;
-+			result = WideString(unistr);
++			result = WideString((scim::ucs4_t *)unistr);
  			g_free (unistr);
  		}
  		Py_DECREF (pValue);
diff --git a/inputmethod/scim-python/patches/patch-ad b/inputmethod/scim-python/patches/patch-ad
index 5ef236a1c20..deb460d5b94 100644
--- a/inputmethod/scim-python/patches/patch-ad
+++ b/inputmethod/scim-python/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.2 2012/12/25 21:07:47 joerg Exp $
+$NetBSD: patch-ad,v 1.3 2013/03/22 13:29:42 obache Exp $
 
-remove unwanted cast.
+* let to cast with appropriate type.
 
 --- src/scim-python-lookup-table.cpp.orig	2008-07-11 04:16:15.000000000 +0000
 +++ src/scim-python-lookup-table.cpp
@@ -9,7 +9,7 @@ remove unwanted cast.
  		int usize = PyUnicode_GET_SIZE (items[i]);
  		gunichar *unistr = g_utf16_to_ucs4 (PyUnicode_AS_UNICODE (items[i]), usize, NULL, NULL, NULL);
 -		_labels.push_back (WideString ((wchar_t *)unistr));
-+		_labels.push_back (WideString (unistr));
++		_labels.push_back (WideString ((scim::ucs4_t *)unistr));
  		g_free (unistr);
  #endif
  	}
@@ -18,7 +18,7 @@ remove unwanted cast.
  	unistr = g_utf16_to_ucs4 (candidate, size, NULL, NULL, NULL);
  
 -	if (self->lookup_table.append_candidate (WideString ((wchar_t *)unistr),
-+	if (self->lookup_table.append_candidate (WideString (unistr),
++	if (self->lookup_table.append_candidate (WideString ((scim::ucs4_t *)unistr),
  								Attributes_FromTupleOrList (pAttrs)))
  	{
  		result = Py_True;