summaryrefslogtreecommitdiff
path: root/inputmethod
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2007-01-13 13:02:54 +0000
committerjoerg <joerg@pkgsrc.org>2007-01-13 13:02:54 +0000
commit87bcb0d3e8f827ea6ecdbd0e6fbf5393f93d199d (patch)
tree332455424e39779a327963abaa72c98af0536bd3 /inputmethod
parentd6d5afa70131902859abaec9dcbbcbf39cf2bc15 (diff)
downloadpkgsrc-87bcb0d3e8f827ea6ecdbd0e6fbf5393f93d199d.tar.gz
Fix build with standard-compliant^W^Wnon-NetBSD iconv.
Diffstat (limited to 'inputmethod')
-rw-r--r--inputmethod/kasumi/distinfo4
-rw-r--r--inputmethod/kasumi/patches/patch-aa13
2 files changed, 9 insertions, 8 deletions
diff --git a/inputmethod/kasumi/distinfo b/inputmethod/kasumi/distinfo
index d15267d0d6c..d8486ebdfc4 100644
--- a/inputmethod/kasumi/distinfo
+++ b/inputmethod/kasumi/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2007/01/07 02:00:14 obache Exp $
+$NetBSD: distinfo,v 1.3 2007/01/13 13:02:54 joerg Exp $
SHA1 (kasumi-1.0.1.tar.gz) = 8cd7d5d9b91875a7dea5450fcdfdcbabdd1d52ce
RMD160 (kasumi-1.0.1.tar.gz) = 2c49afa2b6c0de63d303cefdfd71457c394cf950
Size (kasumi-1.0.1.tar.gz) = 290336 bytes
-SHA1 (patch-aa) = b111c7f78982376c1422fd102505cc02b6033591
+SHA1 (patch-aa) = e7193e682109428908d7eab6c5182a20fefc3d1b
SHA1 (patch-ab) = ec4e7923c447faa4f72b77ca9087d3e4777585e1
SHA1 (patch-ac) = 151e00c3d326cd9c1778c5454baa700a5cf58a8c
diff --git a/inputmethod/kasumi/patches/patch-aa b/inputmethod/kasumi/patches/patch-aa
index 3ddf392e4ae..821ec636ef6 100644
--- a/inputmethod/kasumi/patches/patch-aa
+++ b/inputmethod/kasumi/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/01/02 15:18:12 obache Exp $
+$NetBSD: patch-aa,v 1.2 2007/01/13 13:02:54 joerg Exp $
---- KasumiWord.cxx.orig Mon Jan 10 20:30:37 2005
-+++ KasumiWord.cxx Mon Jan 10 20:38:01 2005
-@@ -16,24 +16,27 @@
+--- KasumiWord.cxx.orig 2005-09-01 08:01:45.000000000 +0000
++++ KasumiWord.cxx
+@@ -17,24 +17,28 @@ iconv_t KasumiWord::IconvEUCJP_To_UTF8 =
string KasumiWord::convertUTF8ToEUCJP(const string &aUTF8){
char *utf8 = (char*)malloc(strlen(aUTF8.c_str())+1);
strcpy(utf8, aUTF8.c_str());
-+ const char *ptr_utf8 = utf8;
++ ICONV_CONST char *ptr_utf8 = utf8;
size_t len = strlen(utf8)+1;
size_t len_eucjp = len*2;
char *eucjp_buf = (char*)malloc(len_eucjp);
@@ -20,7 +20,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/01/02 15:18:12 obache Exp $
string KasumiWord::convertEUCJPToUTF8(const string &aEUCJP){
char *eucjp = (char*)malloc(strlen(aEUCJP.c_str())+1);
strcpy(eucjp, aEUCJP.c_str());
-+ const char *ptr_eucjp = eucjp;
++ ICONV_CONST char *ptr_eucjp = eucjp;
++
size_t len = strlen(eucjp)+1;
size_t len_utf8 = len*2;
char *utf8_buf = (char*)malloc(len_utf8);