Tue Dec 25 21:07:47 2012 UTC ()
Call correct destructor.


(joerg)
diff -r1.1.1.1 -r1.2 pkgsrc/inputmethod/scim-python/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/inputmethod/scim-python/patches/patch-ad
cvs diff -r1.1.1.1 -r1.2 pkgsrc/inputmethod/scim-python/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/inputmethod/scim-python/Attic/distinfo 2010/08/08 01:05:04 1.1.1.1
+++ pkgsrc/inputmethod/scim-python/Attic/distinfo 2012/12/25 21:07:47 1.2
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.1.1.1 2010/08/08 01:05:04 obache Exp $ 1$NetBSD: distinfo,v 1.2 2012/12/25 21:07:47 joerg Exp $
2 2
3SHA1 (pinyin-database-0.1.10.5.tar.bz2) = d0bb78416431a59cbcaf62809e56fab284f6d588 3SHA1 (pinyin-database-0.1.10.5.tar.bz2) = d0bb78416431a59cbcaf62809e56fab284f6d588
4RMD160 (pinyin-database-0.1.10.5.tar.bz2) = 3acfa16d11b2099d7719f3b7b5a77c523b982d2d 4RMD160 (pinyin-database-0.1.10.5.tar.bz2) = 3acfa16d11b2099d7719f3b7b5a77c523b982d2d
5Size (pinyin-database-0.1.10.5.tar.bz2) = 12044655 bytes 5Size (pinyin-database-0.1.10.5.tar.bz2) = 12044655 bytes
6SHA1 (scim-python-0.1.13rc1.tar.gz) = 93343522a5f50fc1f68fd29e76e276036a77e965 6SHA1 (scim-python-0.1.13rc1.tar.gz) = 93343522a5f50fc1f68fd29e76e276036a77e965
7RMD160 (scim-python-0.1.13rc1.tar.gz) = 1a47d4f7d2be5d171d23f040748299b6e0c1dce4 7RMD160 (scim-python-0.1.13rc1.tar.gz) = 1a47d4f7d2be5d171d23f040748299b6e0c1dce4
8Size (scim-python-0.1.13rc1.tar.gz) = 715364 bytes 8Size (scim-python-0.1.13rc1.tar.gz) = 715364 bytes
9SHA1 (patch-aa) = b576047a60704b19db91792fcdbe4e1e8515be26 9SHA1 (patch-aa) = b576047a60704b19db91792fcdbe4e1e8515be26
10SHA1 (patch-ab) = 4505e5d93f2b44d46560f9d04fa769038bea8956 10SHA1 (patch-ab) = 4505e5d93f2b44d46560f9d04fa769038bea8956
11SHA1 (patch-ac) = e3b795ee4b218d8c1bb0e57cfbc2ec879f9bc840 11SHA1 (patch-ac) = e3b795ee4b218d8c1bb0e57cfbc2ec879f9bc840
12SHA1 (patch-ad) = 9fbfb2bb233a0779d0b4cef7dff476956757a5f2 12SHA1 (patch-ad) = bc2ab7119ec979ab8888fb9a7b6f238993f5cf22
cvs diff -r1.1.1.1 -r1.2 pkgsrc/inputmethod/scim-python/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/inputmethod/scim-python/patches/Attic/patch-ad 2010/08/08 01:05:04 1.1.1.1
+++ pkgsrc/inputmethod/scim-python/patches/Attic/patch-ad 2012/12/25 21:07:47 1.2
@@ -1,24 +1,33 @@ @@ -1,24 +1,33 @@
1$NetBSD: patch-ad,v 1.1.1.1 2010/08/08 01:05:04 obache Exp $ 1$NetBSD: patch-ad,v 1.2 2012/12/25 21:07:47 joerg Exp $
2 2
3remove unwanted cast. 3remove unwanted cast.
4 4
5--- src/scim-python-lookup-table.cpp.orig 2008-07-11 04:16:15.000000000 +0000 5--- src/scim-python-lookup-table.cpp.orig 2008-07-11 04:16:15.000000000 +0000
6+++ src/scim-python-lookup-table.cpp 6+++ src/scim-python-lookup-table.cpp
7@@ -86,7 +86,7 @@ PyLookupTable::py_set_candidate_labels ( 7@@ -86,7 +86,7 @@ PyLookupTable::py_set_candidate_labels (
8 #else 8 #else
9 int usize = PyUnicode_GET_SIZE (items[i]); 9 int usize = PyUnicode_GET_SIZE (items[i]);
10 gunichar *unistr = g_utf16_to_ucs4 (PyUnicode_AS_UNICODE (items[i]), usize, NULL, NULL, NULL); 10 gunichar *unistr = g_utf16_to_ucs4 (PyUnicode_AS_UNICODE (items[i]), usize, NULL, NULL, NULL);
11- _labels.push_back (WideString ((wchar_t *)unistr)); 11- _labels.push_back (WideString ((wchar_t *)unistr));
12+ _labels.push_back (WideString (unistr)); 12+ _labels.push_back (WideString (unistr));
13 g_free (unistr); 13 g_free (unistr);
14 #endif 14 #endif
15 } 15 }
16@@ -518,7 +518,7 @@ PyLookupTable::py_append_candidate (PyLo 16@@ -518,7 +518,7 @@ PyLookupTable::py_append_candidate (PyLo
17 return NULL; 17 return NULL;
18 unistr = g_utf16_to_ucs4 (candidate, size, NULL, NULL, NULL); 18 unistr = g_utf16_to_ucs4 (candidate, size, NULL, NULL, NULL);
19  19
20- if (self->lookup_table.append_candidate (WideString ((wchar_t *)unistr), 20- if (self->lookup_table.append_candidate (WideString ((wchar_t *)unistr),
21+ if (self->lookup_table.append_candidate (WideString (unistr), 21+ if (self->lookup_table.append_candidate (WideString (unistr),
22 Attributes_FromTupleOrList (pAttrs))) 22 Attributes_FromTupleOrList (pAttrs)))
23 { 23 {
24 result = Py_True; 24 result = Py_True;
 25@@ -596,7 +596,7 @@ PyLookupTable::py_init (PyLookupTableObj
 26 void
 27 PyLookupTable::py_dealloc (PyLookupTableObject *self)
 28 {
 29- self->lookup_table.~LookupTable ();
 30+ self->lookup_table.~PyLookupTable ();
 31 ((PyObject *)self)->ob_type->tp_free (self);
 32 }
 33