Update of /cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/utils
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12398/stable/main/finkinfo/utils
Added Files:
kinput2.macim.info kinput2.macim.patch
Log Message:
upstream revision bumped: kinput2.macim
--- NEW FILE: kinput2.macim.patch ---
diff -Naur kinput2-v3.1-macim-20050528.orig/Kinput2.conf
kinput2-v3.1-macim-20050528/Kinput2.conf
--- kinput2-v3.1-macim-20050528.orig/Kinput2.conf Thu Jan 22 00:53:19 2004
+++ kinput2-v3.1-macim-20050528/Kinput2.conf Sat Jun 4 16:28:42 2005
@@ -79,17 +79,17 @@
* If you have already installed Canna header files and libraries..
*/
XCOMM use installed headers/libraries
-XCOMM CANNAINSTDIR = /usr/local/canna
-XCOMM CANNASRC = $(CANNAINSTDIR)/include
-XCOMM CANNALIB = -lcanna16
+CANNAINSTDIR = $(PREFIX)
+CANNASRC = $(CANNAINSTDIR)/include
+CANNALIB = -L$(CANNAINSTDIR)/lib -lcanna16
/*
* If you have compiled Canna that came with X11R6 (contrib/programs/Canna),
* but not installed yet..
*/
XCOMM use headers/libraries in the source tree
-CANNASRC = $(CONTRIBSRC)/programs/Canna32
-CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
+XCOMM CANNASRC = $(CONTRIBSRC)/programs/Canna32
+XCOMM CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
XCOMM SJ3 configuration
diff -Naur kinput2-v3.1-macim-20050528.orig/cmd/Imakefile
kinput2-v3.1-macim-20050528/cmd/Imakefile
--- kinput2-v3.1-macim-20050528.orig/cmd/Imakefile Thu Jan 22 00:58:31 2004
+++ kinput2-v3.1-macim-20050528/cmd/Imakefile Sat Jun 4 16:28:42 2005
@@ -49,5 +49,5 @@
SRCS = kinput2.c
OBJS = kinput2.o
-ComplexProgramTarget(kinput2)
-InstallAppDefaults(Kinput2)
+ComplexProgramTargetNoMan(kinput2.macim)
+InstallAppDefaultsLong(Kinput2,Kinput2_macim)
diff -Naur kinput2-v3.1-macim-20050528.orig/cmd/Kinput2.ad
kinput2-v3.1-macim-20050528/cmd/Kinput2.ad
--- kinput2-v3.1-macim-20050528.orig/cmd/Kinput2.ad Fri May 6 04:35:47 2005
+++ kinput2-v3.1-macim-20050528/cmd/Kinput2.ad Sat Jun 4 16:28:42 2005
@@ -5,9 +5,10 @@
!!
!! things you shouldn't change
!!
-Kinput2.mappedWhenManaged: false
-Kinput2.width: 1
-Kinput2.height: 1
+Kinput2_macim.conversionEngine: macim
+Kinput2_macim.mappedWhenManaged: false
+Kinput2_macim.width: 1
+Kinput2_macim.height: 1
*converter.accelerators: <Key>: to-inputobj()
! AIX seems to need the following superfluous definition.
*ki2AppDefsLoaded: true
@@ -96,7 +97,7 @@
! XimpProtocol
*XimpProtocol.ForceDefaultServer: true
! X Input Method Protocol
-*IMProtocol.locales: ja_JP.SJIS, ja_JP.EUC, ja_JP, japanese, japan, ja
+*IMProtocol.locales: ja_JP.UTF-8, ja_JP.eucJP, ja_JP.SJIS, ja_JP, japanese,
japan, ja
! common to XimpProtocol and IMProtocol
*defaultFontList: -misc-fixed-medium-r-normal--14-*-*-*-c-*
*ConversionStartKeys: \
diff -Naur kinput2-v3.1-macim-20050528.orig/cmd/kinput2.c
kinput2-v3.1-macim-20050528/cmd/kinput2.c
--- kinput2-v3.1-macim-20050528.orig/cmd/kinput2.c Tue Mar 23 01:27:35 2004
+++ kinput2-v3.1-macim-20050528/cmd/kinput2.c Sat Jun 4 16:28:42 2005
@@ -96,9 +96,9 @@
static String fallback_resources[] = {
"*ki2AppDefsLoaded: false",
- "Kinput2.mappedWhenManaged: false",
- "Kinput2.width: 1",
- "Kinput2.height: 1",
+ "Kinput2_macim.mappedWhenManaged: false",
+ "Kinput2_macim.width: 1",
+ "Kinput2_macim.height: 1",
NULL,
};
@@ -200,7 +200,7 @@
WidgetClass inputobjclass, displayobjclass;
Widget inputobj;
- toplevel = XtAppInitialize(&apc, "Kinput2",
+ toplevel = XtAppInitialize(&apc, "Kinput2_macim",
options, XtNumber(options),
&ac, av,
fallback_resources, (ArgList)NULL, 0);
diff -Naur kinput2-v3.1-macim-20050528.orig/copyright
kinput2-v3.1-macim-20050528/copyright
--- kinput2-v3.1-macim-20050528.orig/copyright Thu Jan 1 00:00:00 1970
+++ kinput2-v3.1-macim-20050528/copyright Tue May 3 02:14:22 2005
@@ -0,0 +1,22 @@
+/*
+ * kinput2
+ */
+
+/*
+ * Copyright (C) 1991 by Software Research Associates, Inc.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Software Research Associates not be
+ * used in advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission. Software Research
+ * Associates makes no representations about the suitability of this software
+ * for any purpose. It is provided "as is" without express or implied
+ * warranty.
+ *
+ * Author: Makoto Ishisone, Software Research Associates, Inc., Japan
+ * [EMAIL PROTECTED]
+ */
+
diff -Naur kinput2-v3.1-macim-20050528.orig/lib/Canna.c
kinput2-v3.1-macim-20050528/lib/Canna.c
--- kinput2-v3.1-macim-20050528.orig/lib/Canna.c Thu Oct 3 09:35:27 2002
+++ kinput2-v3.1-macim-20050528/lib/Canna.c Tue May 3 02:14:22 2005
@@ -61,6 +61,10 @@
#include "CannaP.h"
#include "DebugPrint.h"
+/* Canna 3.7$B0J9_$O$3$N$h$&$KDj5A$9$k(B */
+#define CANNA_WCHAR16
+#define CANNA_NEW_WCHAR_AWARE
+/* Canna 3.6$B$^$G$N>l9g(B */
#define _WCHAR_T /* $B$3$NDj5A$O(B jrkanji.h $B$G(B wcKanjiStatus
$B$J$I$rDj5A$9$k$?$a(B */
#define wchar_t wchar
@@ -246,7 +250,7 @@
kanabuf[0] = '\0';
nbytes = XKanaLookup(event, kanabuf, 20, &ks, &compose_status);
- buf[0] = (wchar)kanabuf[0]; /* $B$-$?$J$$(B */
+ buf[0] = (wchar)(unsigned char)kanabuf[0]; /* $B$-$?$J$$(B */
if (ks == XK_space && (event->xkey.state & ShiftMask)) {
void convend();
@@ -271,7 +275,7 @@
/* $B$+$J4A;zJQ49$9$k(B */
len = wcKanjiString((int)obj, (int)buf[0],
- (wchar_t *)buf, 1024, &kanji_status);
+ (wchar *)buf, 1024, &kanji_status);
displayPreEdit(obj, len, buf, &kanji_status);
return (kanji_status.info & KanjiThroughInfo) ? 1 : 0;
@@ -642,7 +646,9 @@
CannaObject obj;
{
char **warn = 0;
+#ifndef CANNA_JR_BEEP_FUNC_DECLARED
extern (*jrBeepFunc)();
+#endif
if (nCannaContexts == 0) {
#ifdef KC_SETSERVERNAME
diff -Naur kinput2-v3.1-macim-20050528.orig/lib/IMProto.c
kinput2-v3.1-macim-20050528/lib/IMProto.c
--- kinput2-v3.1-macim-20050528.orig/lib/IMProto.c Thu Oct 3 09:35:28 2002
+++ kinput2-v3.1-macim-20050528/lib/IMProto.c Tue May 3 02:14:22 2005
@@ -44,7 +44,7 @@
#include "im.h"
-#define SERVER_NAME "kinput2"
+#define SERVER_NAME "kinput2.macim"
#define UNIX_SOCKET_DIR "/tmp/.ki2-unix"
/*- resource table -*/
diff -Naur kinput2-v3.1-macim-20050528.orig/lib/XimpProto.c
kinput2-v3.1-macim-20050528/lib/XimpProto.c
--- kinput2-v3.1-macim-20050528.orig/lib/XimpProto.c Thu Oct 3 09:35:28 2002
+++ kinput2-v3.1-macim-20050528/lib/XimpProto.c Tue May 3 02:14:22 2005
@@ -45,7 +45,7 @@
#define PROTOCOL_VERSION_STR "XIMP.3.5"
-#define SERVER_NAME "kinput2"
+#define SERVER_NAME "kinput2.macim"
#define SERVER_VERSION "1"
#define VENDOR_NAME "SRA"
--- NEW FILE: kinput2.macim.info ---
Package: kinput2.macim
Version: 3.1+20050528
Revision: 1
BuildDepends: system-xfree86-dev | x11-dev
Depends: app-defaults, system-xfree86-shlibs | x11-shlibs, macosx (>= 10.4)
Source: ftp://ftp.sra.co.jp/pub/x11/kinput2/kinput2-v3.1.tar.gz
Source-MD5: 2de20576f150248d1fdfe66d7cc4e510
Source2:
http://homepage1.nifty.com/daemon/MachTen/sonoda/kinput2.fix4.macim.0.2.patch.gz
Source2-MD5: 8533185fe2957f7106d02803f28bc31b
Source3:
http://homepage1.nifty.com/daemon/MachTen/sonoda/Kinput2-MacIM.README.gz
Source3-MD5: f99be328fc4b5145fb48bfe53cf25c4d
Source4:
http://www.sol.dti.ne.jp/~kikuyan/macosx/patches/kinput2-v3.1-macim-20050528.patch.gz
Source4-MD5: 5834788573331c1b7745542c35f2db22
PatchScript: <<
gzip -cd ../kinput2.fix4.macim.0.2.patch.gz | sed -n -e '143,549p' -e '581,$p'
| patch -p1
gzip -cd ../kinput2-v3.1-macim-20050528.patch.gz | patch -p0
patch -p1 -i %a/%n.patch
gzip -d ../Kinput2-MacIM.README.gz
<<
CompileScript: <<
xmkmf
make Makefiles
make depend PREFIX=%p
make PREFIX=%p CDEBUGFLAGS=-O3
<<
InstallScript: <<
make install install.man DESTDIR=%d PREFIX=%p BINDIR=%p/bin LIBDIR=%p/lib
CONFDIR=%p/etc MANSOURCEPATH=%p/share/man/man DOCDIR=%p/share/doc/%n
XAPPLOADDIR=%p/etc/app-defaults
rm -f %i/lib/app-defaults
<<
DocFiles: NEWS README ../Kinput2-MacIM.README copyright
Description: Input server for easy input of Japanese text, using Kotoeri
DescDetail: <<
Kinput2 is an input server for X11 applications that want Japanese
text input.
A client that wants kana-kanji conversion service for Japanese text
sends a request to kinput2. Kinput2 receives the request, does
kana-kanji conversion, and sends the converted text back to the
client.
<<
DescUsage: <<
Launch kinput2.macim, and set environment value XMODIFIERS to
"@im=kinput2.macim".
<<
License: BSD
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
Homepage: http://www.sol.dti.ne.jp/~kikuyan/macosx/x11kotoeri.html
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
