Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21994/10.3/unstable/main/finkinfo/utils
Modified Files: kinput2.macim.info kinput2.macim.patch Log Message: Port kinput2.macim-20050629 to 10.3. Use xinitrc mechanism. Index: kinput2.macim.patch =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils/kinput2.macim.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- kinput2.macim.patch 3 May 2005 04:41:53 -0000 1.2 +++ kinput2.macim.patch 12 Mar 2006 16:43:55 -0000 1.3 @@ -1,6 +1,6 @@ -diff -Naur kinput2-v3.1-macim-20040417.orig/Kinput2.conf kinput2-v3.1-macim-20040417/Kinput2.conf ---- kinput2-v3.1-macim-20040417.orig/Kinput2.conf Tue May 3 02:12:41 2005 -+++ kinput2-v3.1-macim-20040417/Kinput2.conf Tue May 3 02:14:22 2005 +diff -Naur kinput2-v3.1-macim-20050629.orig/Kinput2.conf kinput2-v3.1-macim-20050629/Kinput2.conf +--- kinput2-v3.1-macim-20050629.orig/Kinput2.conf Thu Jan 22 00:53:19 2004 ++++ kinput2-v3.1-macim-20050629/Kinput2.conf Sat Jun 4 16:28:42 2005 @@ -79,17 +79,17 @@ * If you have already installed Canna header files and libraries.. */ @@ -24,9 +24,9 @@ XCOMM SJ3 configuration -diff -Naur kinput2-v3.1-macim-20040417.orig/cmd/Imakefile kinput2-v3.1-macim-20040417/cmd/Imakefile ---- kinput2-v3.1-macim-20040417.orig/cmd/Imakefile Tue May 3 02:12:41 2005 -+++ kinput2-v3.1-macim-20040417/cmd/Imakefile Tue May 3 02:14:22 2005 +diff -Naur kinput2-v3.1-macim-20050629.orig/cmd/Imakefile kinput2-v3.1-macim-20050629/cmd/Imakefile +--- kinput2-v3.1-macim-20050629.orig/cmd/Imakefile Thu Jan 22 00:58:31 2004 ++++ kinput2-v3.1-macim-20050629/cmd/Imakefile Sat Jun 4 16:28:42 2005 @@ -49,5 +49,5 @@ SRCS = kinput2.c OBJS = kinput2.o @@ -35,9 +35,9 @@ -InstallAppDefaults(Kinput2) +ComplexProgramTargetNoMan(kinput2.macim) +InstallAppDefaultsLong(Kinput2,Kinput2_macim) -diff -Naur kinput2-v3.1-macim-20040417.orig/cmd/Kinput2.ad kinput2-v3.1-macim-20040417/cmd/Kinput2.ad ---- kinput2-v3.1-macim-20040417.orig/cmd/Kinput2.ad Tue May 3 02:12:41 2005 -+++ kinput2-v3.1-macim-20040417/cmd/Kinput2.ad Tue May 3 02:14:22 2005 +diff -Naur kinput2-v3.1-macim-20050629.orig/cmd/Kinput2.ad kinput2-v3.1-macim-20050629/cmd/Kinput2.ad +--- kinput2-v3.1-macim-20050629.orig/cmd/Kinput2.ad Fri May 6 04:35:47 2005 ++++ kinput2-v3.1-macim-20050629/cmd/Kinput2.ad Sat Jun 4 16:28:42 2005 @@ -5,9 +5,10 @@ !! !! things you shouldn't change @@ -61,9 +61,9 @@ ! common to XimpProtocol and IMProtocol *defaultFontList: -misc-fixed-medium-r-normal--14-*-*-*-c-* *ConversionStartKeys: \ -diff -Naur kinput2-v3.1-macim-20040417.orig/cmd/kinput2.c kinput2-v3.1-macim-20040417/cmd/kinput2.c ---- kinput2-v3.1-macim-20040417.orig/cmd/kinput2.c Tue May 3 02:12:41 2005 -+++ kinput2-v3.1-macim-20040417/cmd/kinput2.c Tue May 3 02:14:22 2005 +diff -Naur kinput2-v3.1-macim-20050629.orig/cmd/kinput2.c kinput2-v3.1-macim-20050629/cmd/kinput2.c +--- kinput2-v3.1-macim-20050629.orig/cmd/kinput2.c Tue Mar 23 01:27:35 2004 ++++ kinput2-v3.1-macim-20050629/cmd/kinput2.c Sat Jun 4 16:28:42 2005 @@ -96,9 +96,9 @@ static String fallback_resources[] = { @@ -86,9 +86,9 @@ options, XtNumber(options), &ac, av, fallback_resources, (ArgList)NULL, 0); -diff -Naur kinput2-v3.1-macim-20040417.orig/copyright kinput2-v3.1-macim-20040417/copyright ---- kinput2-v3.1-macim-20040417.orig/copyright Thu Jan 1 00:00:00 1970 -+++ kinput2-v3.1-macim-20040417/copyright Tue May 3 02:14:22 2005 +diff -Naur kinput2-v3.1-macim-20050629.orig/copyright kinput2-v3.1-macim-20050629/copyright +--- kinput2-v3.1-macim-20050629.orig/copyright Thu Jan 1 00:00:00 1970 ++++ kinput2-v3.1-macim-20050629/copyright Tue May 3 02:14:22 2005 @@ -0,0 +1,22 @@ +/* + * kinput2 @@ -112,9 +112,9 @@ + * [EMAIL PROTECTED] + */ + -diff -Naur kinput2-v3.1-macim-20040417.orig/lib/Canna.c kinput2-v3.1-macim-20040417/lib/Canna.c ---- kinput2-v3.1-macim-20040417.orig/lib/Canna.c Thu Oct 3 09:35:27 2002 -+++ kinput2-v3.1-macim-20040417/lib/Canna.c Tue May 3 02:14:22 2005 +diff -Naur kinput2-v3.1-macim-20050629.orig/lib/Canna.c kinput2-v3.1-macim-20050629/lib/Canna.c +--- kinput2-v3.1-macim-20050629.orig/lib/Canna.c Thu Oct 3 09:35:27 2002 ++++ kinput2-v3.1-macim-20050629/lib/Canna.c Tue May 3 02:14:22 2005 @@ -61,6 +61,10 @@ #include "CannaP.h" #include "DebugPrint.h" @@ -154,9 +154,9 @@ if (nCannaContexts == 0) { #ifdef KC_SETSERVERNAME -diff -Naur kinput2-v3.1-macim-20040417.orig/lib/IMProto.c kinput2-v3.1-macim-20040417/lib/IMProto.c ---- kinput2-v3.1-macim-20040417.orig/lib/IMProto.c Thu Oct 3 09:35:28 2002 -+++ kinput2-v3.1-macim-20040417/lib/IMProto.c Tue May 3 02:14:22 2005 +diff -Naur kinput2-v3.1-macim-20050629.orig/lib/IMProto.c kinput2-v3.1-macim-20050629/lib/IMProto.c +--- kinput2-v3.1-macim-20050629.orig/lib/IMProto.c Thu Oct 3 09:35:28 2002 ++++ kinput2-v3.1-macim-20050629/lib/IMProto.c Tue May 3 02:14:22 2005 @@ -44,7 +44,7 @@ #include "im.h" @@ -166,28 +166,9 @@ #define UNIX_SOCKET_DIR "/tmp/.ki2-unix" /*- resource table -*/ -diff -Naur kinput2-v3.1-macim-20040417.orig/lib/MacIM.c kinput2-v3.1-macim-20040417/lib/MacIM.c ---- kinput2-v3.1-macim-20040417.orig/lib/MacIM.c Tue May 3 02:12:41 2005 -+++ kinput2-v3.1-macim-20040417/lib/MacIM.c Tue May 3 03:56:34 2005 -@@ -58,6 +58,7 @@ - static ICString *GetAuxSegments(); - static int PreeditString(); - static int StatusString(); -+static void setObjectInputMode(MacIMObject, long); - - MacIMClassRec macimClassRec = { - { /* object fields */ -@@ -218,7 +219,6 @@ - extern void PasteFromClipboard(long); - extern long SetInputModeByMenuKey(EventRecord *); - long mode; -- static void setObjectInputMode(MacIMObject, long); - - /* KeyPress CxgÈOͳB*/ - if (event->type == ButtonPress) -diff -Naur kinput2-v3.1-macim-20040417.orig/lib/XimpProto.c kinput2-v3.1-macim-20040417/lib/XimpProto.c ---- kinput2-v3.1-macim-20040417.orig/lib/XimpProto.c Thu Oct 3 09:35:28 2002 -+++ kinput2-v3.1-macim-20040417/lib/XimpProto.c Tue May 3 02:14:22 2005 +diff -Naur kinput2-v3.1-macim-20050629.orig/lib/XimpProto.c kinput2-v3.1-macim-20050629/lib/XimpProto.c +--- kinput2-v3.1-macim-20050629.orig/lib/XimpProto.c Thu Oct 3 09:35:28 2002 ++++ kinput2-v3.1-macim-20050629/lib/XimpProto.c Tue May 3 02:14:22 2005 @@ -45,7 +45,7 @@ @@ -197,3 +178,40 @@ #define SERVER_VERSION "1" #define VENDOR_NAME "SRA" +diff -Naur kinput2-v3.1-macim-20050629.orig/lib/mactext.c kinput2-v3.1-macim-20050629/lib/mactext.c +--- kinput2-v3.1-macim-20050629.orig/lib/mactext.c Wed May 18 18:00:25 2005 ++++ kinput2-v3.1-macim-20050629/lib/mactext.c Sun Mar 12 15:58:51 2006 +@@ -410,10 +410,18 @@ + hiliteRange->fNumOfRanges = 2; + hiliteRange->fRange[0].fStart = 0; + hiliteRange->fRange[0].fEnd = length; ++#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 + hiliteRange->fRange[0].fHiliteStyle = kTSMHiliteConvertedText; ++#else ++ hiliteRange->fRange[0].fHiliteStyle = kConvertedText; ++#endif + hiliteRange->fRange[1].fStart = 0; + hiliteRange->fRange[1].fEnd = length; ++#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 + hiliteRange->fRange[1].fHiliteStyle = kTSMHiliteCaretPosition; ++#else ++ hiliteRange->fRange[1].fHiliteStyle = kCaretPosition; ++#endif + } else + status = memFullErr; + } +diff -Naur kinput2-v3.1-macim-20050629.orig/xinitrc.kinput2.macim.sh kinput2-v3.1-macim-20050629/xinitrc.kinput2.macim.sh +--- kinput2-v3.1-macim-20050629.orig/xinitrc.kinput2.macim.sh Thu Jan 1 00:00:00 1970 ++++ kinput2-v3.1-macim-20050629/xinitrc.kinput2.macim.sh Sun Mar 12 15:13:13 2006 +@@ -0,0 +1,11 @@ ++# If you don't want to launch kinput2.macim, put xinitrc_kinput2_macim_enable=NO ++# in your .xinitrc ++: ${xinitrc_kinput2_macim_enable=YES} ++ ++case $xinitrc_kinput2_macim_enable in ++ [Yy][Ee][Ss]) ++ if test -x "$fink_prefix/bin/kinput2.macim"; then ++ "$fink_prefix/bin/kinput2.macim" -macim -xim & ++ fi ++ ;; ++esac Index: kinput2.macim.info =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils/kinput2.macim.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- kinput2.macim.info 26 Jun 2004 03:38:43 -0000 1.1 +++ kinput2.macim.info 12 Mar 2006 16:43:55 -0000 1.2 @@ -1,19 +1,19 @@ Package: kinput2.macim -Version: 3.1+20040417 -Revision: 1 +Version: 3.1+20050629 +Revision: 2 BuildDepends: system-xfree86-dev | x11-dev -Depends: app-defaults, system-xfree86-shlibs | x11-shlibs, macosx +Depends: app-defaults, x11-shlibs, macosx (>= 10.3), xinitrc 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-20040417.patch.gz -Source4-MD5: be9b20df81c980b08f3d274153753d09 +Source4: http://www.sol.dti.ne.jp/~kikuyan/macosx/patches/kinput2-v3.1-macim-20050629.patch.gz +Source4-MD5: 701dc2f61e3b89444611e9dabef561ac 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-20040417.patch.gz | patch -p0 + gzip -cd ../kinput2-v3.1-macim-20050629.patch.gz | patch -p0 patch -p1 -i %a/%n.patch gzip -d ../Kinput2-MacIM.README.gz << @@ -22,10 +22,13 @@ make Makefiles make depend PREFIX=%p make PREFIX=%p CDEBUGFLAGS=-O3 + test -x %p/bin/kinput2.macim || { echo "Build failed!" >&2; exit 2; } << 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 + mkdir -p -m 755 %p/etc/xinitrc.d + install -m 755 xinitrc.kinput2.macim.sh %p/etc/xinitrc.d/50kinput2.macim.sh << DocFiles: NEWS README ../Kinput2-MacIM.README copyright Description: Input server for easy input of Japanese text, using Kotoeri @@ -38,9 +41,13 @@ kana-kanji conversion, and sends the converted text back to the client. << +DescPort: << +Upstream author says kinput2.macim > 20040417 is only for >= 10.4, but +also runs on 10.3 with a trivial patch. +<< DescUsage: << -Launch kinput2.macim, and set environment value XMODIFIERS to -"@im=kinput2.macim". +Set environment value XMODIFIERS to "@im=kinput2.macim". +kinput2.macim itself is automatically launched by Fink xinitrc mechanism. << License: BSD Maintainer: Todai Fink Team <[EMAIL PROTECTED]> ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits