Import of pkgsrc-2013Q2

inputmethod/scim-python/patches/patch-aa

@@ -0,0 +1,42 @@
+$NetBSD: patch-aa,v 1.1.1.1 2010/08/08 01:05:04 obache Exp $
+
+portability fix.
+
+--- configure.orig	2008-07-11 04:17:12.000000000 +0000
++++ configure
+@@ -20602,7 +20602,7 @@ fi
+ 
+ 
+ # define PYTHOPN_CFLAGS & PYTHON_LIBS
+-PYTHON_CONFIG=`type -p python$PYTHON_VERSION-config`
++PYTHON_CONFIG="python$PYTHON_VERSION-config"
+ if test "$PYTHON_CONFIG" != ""; then
+ 	PYTHON_CFLAGS=`$PYTHON_CONFIG --includes`
+ 	PYTHON_LIBS=`$PYTHON_CONFIG --libs`
+@@ -20660,7 +20660,7 @@ if test "${enable_english_writer+set}" =
+ fi
+ 
+ 
+-if test "$enable_english_writer" == "force"; then
++if test "$enable_english_writer" = "force"; then
+ 	 if true; then
+   ENABLE_ENGLISH_WRITER_TRUE=
+   ENABLE_ENGLISH_WRITER_FALSE='#'
+@@ -20669,7 +20669,7 @@ else
+   ENABLE_ENGLISH_WRITER_FALSE=
+ fi
+ 
+-elif test "$enable_english_writer" == "no"; then
++elif test "$enable_english_writer" = "no"; then
+ 	 if false; then
+   ENABLE_ENGLISH_WRITER_TRUE=
+   ENABLE_ENGLISH_WRITER_FALSE='#'
+@@ -20679,7 +20679,7 @@ else
+ fi
+ 
+ else
+-	if test "$have_python_enchant" == "no"; then
++	if test "$have_python_enchant" = "no"; then
+ 		{ { echo "$as_me:$LINENO: error:
+ 		Your system does not have python-enchant, please install it or run \"./configure --disable-english-writer\".
+ 		You may also use \"./configure --enable-english-writer=force\" to foce build this english engine." >&5

inputmethod/scim-python/patches/patch-ab

@@ -0,0 +1,33 @@
+$NetBSD: patch-ab,v 1.2 2013/03/22 13:29:42 obache Exp $
+
+* 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
+@@ -621,7 +621,7 @@ PyIMEngine::py_update_preedit_string (Py
+ 
+ 	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 ((scim::ucs4_t *)unistr), 
+ 								Attributes_FromTupleOrList (pAttrs));
+ 	g_free (unistr);
+ 
+@@ -659,7 +659,7 @@ PyIMEngine::py_update_aux_string (PyIMEn
+ 		return NULL;
+ 
+ 	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 ((scim::ucs4_t *)unistr),
+ 								Attributes_FromTupleOrList (pAttrs));
+ 	g_free (unistr);
+ #endif
+@@ -713,7 +713,7 @@ PyIMEngine::py_commit_string (PyIMEngine
+ 		return NULL;
+ 
+ 	unistr = g_utf16_to_ucs4 (str, size, NULL, NULL, NULL);
+-	self->engine.commit_string (WideString ((wchar_t *)unistr));
++	self->engine.commit_string (WideString ((scim::ucs4_t *)unistr));
+ 	g_free (unistr);
+ #endif
+ 

inputmethod/scim-python/patches/patch-ac

@@ -0,0 +1,28 @@
+$NetBSD: patch-ac,v 1.2 2013/03/22 13:29:42 obache Exp $
+
+* 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
+@@ -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((scim::ucs4_t *)unistr);
+ 			g_free (unistr);
+ 		#endif
+ 		}
+ 		else if (PyString_Check (pValue)) {
+ 			gunichar *unistr = g_utf8_to_ucs4 (PyString_AsString (pValue),
+ 						PyString_GET_SIZE (pValue), NULL, NULL, NULL);
+-			result = (wchar_t *)unistr;
++			result = WideString((scim::ucs4_t *)unistr);
+ 			g_free (unistr);
+ 		}
+ 		Py_DECREF (pValue);

inputmethod/scim-python/patches/patch-ad

@@ -0,0 +1,33 @@
+$NetBSD: patch-ad,v 1.3 2013/03/22 13:29:42 obache Exp $
+
+* 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
+@@ -86,7 +86,7 @@ PyLookupTable::py_set_candidate_labels (
+ #else
+ 		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 ((scim::ucs4_t *)unistr));
+ 		g_free (unistr);
+ #endif
+ 	}
+@@ -518,7 +518,7 @@ PyLookupTable::py_append_candidate (PyLo
+ 		return NULL;
+ 	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 ((scim::ucs4_t *)unistr),
+ 								Attributes_FromTupleOrList (pAttrs)))
+ 	{
+ 		result = Py_True;
+@@ -596,7 +596,7 @@ PyLookupTable::py_init (PyLookupTableObj
+ void
+ PyLookupTable::py_dealloc (PyLookupTableObject *self)
+ {
+-	self->lookup_table.~LookupTable ();
++	self->lookup_table.~PyLookupTable ();
+ 	((PyObject *)self)->ob_type->tp_free (self);
+ }
+