Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29732/10.4/unstable/main/finkinfo/utils
Modified Files:
kinput2.info kinput2.patch
Log Message:
Use xinitrc mechanism. Take over the maintainership.
Index: kinput2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/kinput2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kinput2.patch 20 Jan 2006 20:32:32 -0000 1.1
+++ kinput2.patch 12 Mar 2006 16:58:51 -0000 1.2
@@ -1,6 +1,6 @@
-diff -Nru kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf
---- kinput2-v3.1.orig/Kinput2.conf Thu Oct 3 18:35:26 2002
-+++ kinput2-v3.1/Kinput2.conf Tue Mar 30 06:19:55 2004
+diff -Naur kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf
+--- kinput2-v3.1.orig/Kinput2.conf Thu Oct 3 09:35:26 2002
++++ kinput2-v3.1/Kinput2.conf Mon Mar 29 21:19:55 2004
@@ -18,7 +18,7 @@
/* #define UseWnn */ /* define if you are going to use Wnn (v4, v6 or v7) */
/* #define UseWnn6 */ /* define if you are going to use Wnn6 or above */
@@ -33,9 +33,9 @@
XCOMM SJ3 configuration
-diff -Nru kinput2-v3.1.orig/cmd/Kinput2.ad kinput2-v3.1/cmd/Kinput2.ad
---- kinput2-v3.1.orig/cmd/Kinput2.ad Thu Oct 3 18:35:26 2002
-+++ kinput2-v3.1/cmd/Kinput2.ad Tue Mar 30 06:18:39 2004
+diff -Naur kinput2-v3.1.orig/cmd/Kinput2.ad kinput2-v3.1/cmd/Kinput2.ad
+--- kinput2-v3.1.orig/cmd/Kinput2.ad Thu Oct 3 09:35:26 2002
++++ kinput2-v3.1/cmd/Kinput2.ad Mon Mar 29 21:18:39 2004
@@ -96,7 +96,7 @@
! XimpProtocol
*XimpProtocol.ForceDefaultServer: true
@@ -45,9 +45,9 @@
! common to XimpProtocol and IMProtocol
*defaultFontList: -misc-fixed-medium-r-normal--14-*-*-*-c-*
*ConversionStartKeys: \
-diff -Nru kinput2-v3.1.orig/copyright kinput2-v3.1/copyright
---- kinput2-v3.1.orig/copyright Thu Jan 1 09:00:00 1970
-+++ kinput2-v3.1/copyright Tue Mar 30 06:16:19 2004
+diff -Naur kinput2-v3.1.orig/copyright kinput2-v3.1/copyright
+--- kinput2-v3.1.orig/copyright Thu Jan 1 00:00:00 1970
++++ kinput2-v3.1/copyright Mon Mar 29 21:16:19 2004
@@ -0,0 +1,22 @@
+/*
+ * kinput2
@@ -71,9 +71,9 @@
+ * [EMAIL PROTECTED]
+ */
+
-diff -Nru kinput2-v3.1.orig/lib/Canna.c kinput2-v3.1/lib/Canna.c
---- kinput2-v3.1.orig/lib/Canna.c Thu Oct 3 18:35:27 2002
-+++ kinput2-v3.1/lib/Canna.c Tue Mar 30 06:20:35 2004
+diff -Naur kinput2-v3.1.orig/lib/Canna.c kinput2-v3.1/lib/Canna.c
+--- kinput2-v3.1.orig/lib/Canna.c Thu Oct 3 09:35:27 2002
++++ kinput2-v3.1/lib/Canna.c Mon Mar 29 21:20:35 2004
@@ -61,6 +61,10 @@
#include "CannaP.h"
#include "DebugPrint.h"
@@ -113,3 +113,18 @@
if (nCannaContexts == 0) {
#ifdef KC_SETSERVERNAME
+diff -Naur kinput2-v3.1.orig/xinitrc.kinput2.sh kinput2-v3.1/xinitrc.kinput2.sh
+--- kinput2-v3.1.orig/xinitrc.kinput2.sh Thu Jan 1 00:00:00 1970
++++ kinput2-v3.1/xinitrc.kinput2.sh Sun Mar 12 09:49:59 2006
+@@ -0,0 +1,11 @@
++# If you don't want to launch kinput2, put xinitrc_kinput2_enable=NO
++# in your .xinitrc
++: ${xinitrc_kinput2_enable=YES}
++
++case $xinitrc_kinput2_enable in
++ [Yy][Ee][Ss])
++ if test -x "$fink_prefix/bin/kinput2"; then
++ "$fink_prefix/bin/kinput2" -canna -xim &
++ fi
++ ;;
++esac
Index: kinput2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/kinput2.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kinput2.info 20 Jan 2006 20:32:32 -0000 1.1
+++ kinput2.info 12 Mar 2006 16:58:51 -0000 1.2
@@ -1,8 +1,9 @@
Package: kinput2
Version: 3.1
-Revision: 4
-BuildDepends: canna-dev, system-xfree86-dev | x11-dev
-Depends: canna-shlibs (>= 3.7p1-1), app-defaults, system-xfree86-shlibs |
x11-shlibs
+Revision: 5
+BuildDepends: canna-dev, x11-dev
+Depends: canna-shlibs (>= 3.7p1-1), app-defaults, x11-shlibs, xinitrc
+Conflicts: user-ja (<< 3.0)
Source: ftp://ftp.sra.co.jp/pub/x11/%n/%n-v%v.tar.gz
Source-MD5: 2de20576f150248d1fdfe66d7cc4e510
Patch: %n.patch
@@ -10,6 +11,8 @@
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.sh %p/etc/xinitrc.d/50kinput2.sh
<<
DocFiles: NEWS README copyright
Description: Input server for easy input of Japanese text
@@ -23,7 +26,7 @@
client.
<<
License: BSD
-Maintainer: None <fink-devel@lists.sourceforge.net>
+Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
DescPackaging: <<
Originally packaged by Masanori Sekino.
<<
-------------------------------------------------------
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
