Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3342
Modified Files:
canna.info canna.patch
Log Message:
Updated to Canna 3.7p3.
Index: canna.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils/canna.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- canna.patch 2 Nov 2004 01:18:20 -0000 1.2
+++ canna.patch 30 Mar 2005 07:15:32 -0000 1.3
@@ -1,6 +1,6 @@
-diff -Nru Canna37p1.orig/Canna.conf Canna37p1/Canna.conf
---- Canna37p1.orig/Canna.conf Fri Jan 2 21:26:27 2004
-+++ Canna37p1/Canna.conf Fri Apr 2 00:33:22 2004
+diff -Nru Canna37p3.orig/Canna.conf Canna37p3/Canna.conf
+--- Canna37p3.orig/Canna.conf Thu May 20 00:48:47 2004
++++ Canna37p3/Canna.conf Wed Mar 9 02:04:46 2005
@@ -140,19 +140,23 @@
# define ModernElfLinkAvailable NO
#endif
@@ -76,9 +76,21 @@
#endif
UnixSockName = IROHA
-diff -Nru Canna37p1.orig/dic/phono/Imakefile Canna37p1/dic/phono/Imakefile
---- Canna37p1.orig/dic/phono/Imakefile Sat Oct 19 17:27:40 2002
-+++ Canna37p1/dic/phono/Imakefile Fri Apr 2 00:33:22 2004
+diff -Nru Canna37p3.orig/dic/ideo/words/chimei.t
Canna37p3/dic/ideo/words/chimei.t
+--- Canna37p3.orig/dic/ideo/words/chimei.t Sat Sep 27 15:18:39 2003
++++ Canna37p3/dic/ideo/words/chimei.t Wed Mar 9 02:05:13 2005
+@@ -714,7 +714,7 @@
+ じょうせき #CN 城跡
+ じょうとうく #CNS 城東区
+ じょうなんく #CNS 城南区
+-じょうばんせん #CNS 常盤線
++じょうばんせん #CNS 常磐線
+ じょうようし #CNS 城陽市
+ じょほーる #CN ジョホール
+ じんぐうまえ #CN 神宮前
+diff -Nru Canna37p3.orig/dic/phono/Imakefile Canna37p3/dic/phono/Imakefile
+--- Canna37p3.orig/dic/phono/Imakefile Sat Oct 19 17:27:40 2002
++++ Canna37p3/dic/phono/Imakefile Wed Mar 9 02:04:46 2005
@@ -25,7 +25,11 @@
KPDIC = $(CMDDIR)/kpdic/kpdic
#endif
@@ -91,75 +103,15 @@
DICDIR = $(cannaLibDir)/dic
SAMPLEDIR = $(cannaLibDir)/sample
-diff -Nru Canna37p1.orig/hosts.canna Canna37p1/hosts.canna
---- Canna37p1.orig/hosts.canna Thu Jan 1 09:00:00 1970
-+++ Canna37p1/hosts.canna Fri Apr 2 00:33:22 2004
+diff -Nru Canna37p3.orig/hosts.canna Canna37p3/hosts.canna
+--- Canna37p3.orig/hosts.canna Thu Jan 1 09:00:00 1970
++++ Canna37p3/hosts.canna Wed Mar 9 02:04:46 2005
@@ -0,0 +1,2 @@
+unix
+localhost
-diff -Nru Canna37p1.orig/lib/canna/obind.c Canna37p1/lib/canna/obind.c
---- Canna37p1.orig/lib/canna/obind.c Sun Feb 2 04:34:21 2003
-+++ Canna37p1/lib/canna/obind.c Fri Apr 2 00:33:51 2004
-@@ -21,7 +21,7 @@
- */
-
- #if !defined(lint) && !defined(__CODECENTER__)
--static char rcsid[] = "$Id$";
-+static char rcsid[] = "$Id$";
- #endif
-
- #include "cannaconf.h"
-@@ -66,8 +66,8 @@
- int (*callback_func) pro((char *, int, wchar_t **, int, int *));
- } owcListCallbackStruct;
-
--typedef unsigned short cannawc16;
--typedef unsigned int cannawc32;
-+typedef canna_uint16_t cannawc16;
-+typedef canna_uint32_t cannawc32;
-
- extern int howToReturnModeInfo;
- extern char *context_table;
-@@ -340,14 +340,13 @@
- kanji_status_return)
- unsigned int dpy, win;
- int functionalChar, nbytes;
--char *buffer_return;
-+wchar_t *buffer_return;
- int n_buffer;
- owcKanjiStatus *kanji_status_return;
- {
- int ret;
- wcKanjiStatus wks;
- wchar_t ch;
-- int i;
- cannawc *inbuf = NULL;
- int inbufsize;
- int r;
-@@ -362,10 +361,7 @@
- return -1;
- }
-
-- inbuf[0] = (cannawc)(unsigned char)buffer_return[0];
-- for (i = 1 ; i < nbytes ; i++) {
-- inbuf[i] = (cannawc)(unsigned char)buffer_return[i];
-- }
-+ OldwcstoWCs(inbuf, buffer_return, nbytes ? nbytes : 1);
- ch = buffer_return[0];
- ret = XwcLookupKanji2(dpy, win, inbuf, inbufsize, nbytes, functionalChar,
- &wks);
-@@ -551,7 +547,7 @@
- wchar_t *buffer_return;
- owcKanjiStatus *kanji_status_return;
- {
-- *buffer_return = ch;
-+ *buffer_return = (wchar_t)ch;
-
- return owcLookupKanji2((unsigned int)0, (unsigned int)context_id,
- buffer_return, nbuffer,
-diff -Nru Canna37p1.orig/update-canna-dics-dir Canna37p1/update-canna-dics-dir
---- Canna37p1.orig/update-canna-dics-dir Thu Jan 1 09:00:00 1970
-+++ Canna37p1/update-canna-dics-dir Fri Apr 2 00:33:22 2004
+diff -Nru Canna37p3.orig/update-canna-dics-dir Canna37p3/update-canna-dics-dir
+--- Canna37p3.orig/update-canna-dics-dir Thu Jan 1 09:00:00 1970
++++ Canna37p3/update-canna-dics-dir Wed Mar 9 02:04:46 2005
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+
Index: canna.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils/canna.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- canna.info 11 Jan 2005 13:44:16 -0000 1.4
+++ canna.info 30 Mar 2005 07:15:21 -0000 1.5
@@ -1,11 +1,11 @@
Package: canna
-Version: 3.7p1
-Revision: 9
+Version: 3.7p3
+Revision: 1
Replaces: %N (<= 3.5b2-4)
-BuildDepends: system-xfree86-dev | x11-dev
-Depends: %N-shlibs (= %v-%r), %N-utils (= %v-%r), %N-server (= %v-%r), passwd
-Source: http://downloads.sourceforge.jp/canna/7449/Canna37p1.tar.bz2
-Source-MD5: 849102b32a84cf48cddc150a1fcd83ad
+BuildDepends: system-xfree86-dev | x11-dev, passwd
+Depends: %N-shlibs (= %v-%r), %N-utils (= %v-%r), %N-server (= %v-%r)
+Source: http://downloads.sourceforge.jp/canna/9565/Canna37p3.tar.bz2
+Source-MD5: 0b8c241f63ab4cd3c0b9be569456dc33
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
CompileScript: <<
xmkmf
@@ -104,5 +104,5 @@
<<
DocFiles: OCHANGES* CHANGES.jp README* WHATIS* RKCCONF.jp
License: BSD
-Maintainer: Univ. of Tokyo Educational Computing System Tutors <[EMAIL
PROTECTED]>
+Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
Homepage: http://canna.sourceforge.jp/
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
