fixed crush bug

5 files changed, 191 insertions, 3 deletions

diff --git a/app-i18n/kinput2/ChangeLog b/app-i18n/kinput2/ChangeLog
index 9b5fca4dd81a..e31bf5480425 100644
--- a/app-i18n/kinput2/ChangeLog
+++ b/app-i18n/kinput2/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for app-i18n/kinput2
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kinput2/ChangeLog,v 1.9 2003/02/12 04:50:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kinput2/ChangeLog,v 1.10 2003/08/16 16:27:55 matsuu Exp $
 
+*kinput2-3.1-r1 (17 Aug 2003)
+
+  17 Aug 2003; MATSUU Takuto <matsuu@gentoo.org> kinput2-3.1-r1.ebuild,
+  files/kinput2-3.1-r1-gentoo.diff:
+  fixed crush bug.
 
 *kinput2-3.1 (25 Nov 2002)
   03 Dec 2002; Masatomo Nakano <nakano@gentoo.org> : kinput2-3.1.ebuild 
diff --git a/app-i18n/kinput2/Manifest b/app-i18n/kinput2/Manifest
index 1e28657bc7e9..deb5815b77e2 100644
--- a/app-i18n/kinput2/Manifest
+++ b/app-i18n/kinput2/Manifest
@@ -1,7 +1,7 @@
-MD5 2d05fae8df98fd0419bfd1e32cbee39e ChangeLog 1443
+MD5 3ada51a5dace28291d5902edf307c010 ChangeLog 1602
 MD5 f43d6f6f821649162acb366363a5c0c3 kinput2-3.1.ebuild 1713
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 bf8ec240ade36afacc4dd20f187c98f3 kinput2-3.1-r1.ebuild 1407
+MD5 71daaee14c7184415d0e1918a05ec622 kinput2-3.1-r1.ebuild 1507
 MD5 1b5bc6a0f8cc7f7aa3476666132d5390 files/digest-kinput2-3.1 64
 MD5 ef81b78a1308a9f435389f5ad661bc18 files/kinput2-3.1-gentoo.diff 3387
 MD5 1b5bc6a0f8cc7f7aa3476666132d5390 files/digest-kinput2-3.1-r1 64
diff --git a/app-i18n/kinput2/files/digest-kinput2-3.1-r1 b/app-i18n/kinput2/files/digest-kinput2-3.1-r1
new file mode 100644
index 000000000000..4894c0b9614b
--- /dev/null
+++ b/app-i18n/kinput2/files/digest-kinput2-3.1-r1
@@ -0,0 +1 @@
+MD5 2de20576f150248d1fdfe66d7cc4e510 kinput2-v3.1.tar.gz 512177
diff --git a/app-i18n/kinput2/files/kinput2-3.1-r1-gentoo.diff b/app-i18n/kinput2/files/kinput2-3.1-r1-gentoo.diff
new file mode 100644
index 000000000000..d4c03d527c4d
--- /dev/null
+++ b/app-i18n/kinput2/files/kinput2-3.1-r1-gentoo.diff
@@ -0,0 +1,125 @@
+diff -Naur kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf
+--- kinput2-v3.1.orig/Kinput2.conf	2002-10-03 18:35:26.000000000 +0900
++++ kinput2-v3.1/Kinput2.conf	2003-08-13 15:51:21.000000000 +0900
+@@ -17,8 +17,8 @@
+ 
+ /* #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 */
+-#define UseCanna	/* define if you are going to use Canna */
+-#define UseSj3		/* define if you are going to use Sj3 */
++/* #define UseCanna */	/* define if you are going to use Canna */
++/* #define UseSj3 */	/* define if you are going to use Sj3 */
+ /* #define UseAtok */	/* define if you are going to use Atok */
+ 
+ 
+@@ -34,7 +34,7 @@
+  * You have to define WnnLibDir if Wnn4 configuration files
+  * are not installed in /usr/local/lib/wnn (which is the default).
+  */
+-/* #define WnnLibDir /some/peculiar/directory/wnn */
++#define WnnLibDir /usr/lib/wnn 
+ 
+ /* for convenience.. */
+ #if defined(UseWnn6) && !defined(UseWnn)
+@@ -52,17 +52,17 @@
+  * WnnLibDir above.
+  */
+ XCOMM use installed header files
+-XCOMM WNNINCDIR = /usr/X11R6/include/wnn
++WNNINCDIR = /usr/include/wnn
+ XCOMM use installed library
+-XCOMM WNNLIB = -lwnn
++WNNLIB = -lwnn
+ 
+ /*
+  * Or, use library in the source tree..
+  */
+ XCOMM use library in the source tree
+-WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn
+-WNNINCDIR = $(WNNSRC)/include
+-WNNLIB = $(WNNSRC)/jlib/libwnn.a
++XCOMM WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn
++XCOMM WNNINCDIR = $(WNNSRC)/include
++XCOMM WNNLIB = $(WNNSRC)/jlib/libwnn.a
+ 
+ 
+ XCOMM Canna configuration
+@@ -78,17 +78,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 = /usr
++CANNASRC = $(CANNAINSTDIR)/include
++CANNALIB = -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
+@@ -100,7 +100,7 @@
+  *		   definition files are to be installed
+  */
+ 
+-SJ3DEF_DIR = $(LIBDIR)/sj3def
++XCOMM SJ3DEF_DIR = $(LIBDIR)/sj3def
+ 
+ /*
+  * If you have installed SJ3 library and header file,
+@@ -117,8 +117,8 @@
+  * Use compiled library in the source tree..
+  */
+ XCOMM use library in the source tree
+-SJ3SRC = $(CONTRIBSRC)/programs/sj3
+-SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
++XCOMM SJ3SRC = $(CONTRIBSRC)/programs/sj3
++XCOMM SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
+ 
+ 
+ XCOMM Atok configuration
+@@ -133,8 +133,8 @@
+  */
+ XCOMM use installed headers/libraries
+ XCOMM ATOKINCDIR = /usr/include/atok
+-XCOMM ATOKLIBDIR = /usr/jp/lib
+-ATOKLIB = -latok12n -latok12util
++XCOMM ATOKLIBDIR = /var/lib/atok
++XCOMM ATOKLIB = -latok12n -latok12util
+ 
+ 
+ /**
+diff -Naur kinput2-v3.1.orig/cmd/kinput2.c kinput2-v3.1/cmd/kinput2.c
+--- kinput2-v3.1.orig/cmd/kinput2.c	2002-10-03 18:35:26.000000000 +0900
++++ kinput2-v3.1/cmd/kinput2.c	2003-08-13 15:51:21.000000000 +0900
+@@ -644,3 +644,8 @@
+     return n;
+ }
+ #endif
++
++#if defined(linux) && defined(PPC)
++/* avoid nusty gcc bug */
++void _XtInherit() {}
++#endif
+diff -Naur kinput2-v3.1.orig/lib/imlib/imconv.c kinput2-v3.1/lib/imlib/imconv.c
+--- kinput2-v3.1.orig/lib/imlib/imconv.c	2002-10-03 18:35:30.000000000 +0900
++++ kinput2-v3.1/lib/imlib/imconv.c	2003-08-13 15:55:54.000000000 +0900
+@@ -591,6 +591,9 @@
+ 	}
+     }
+     IMFinishRequest(conn, offset);
++    #ifdef STATUS_SYNC
++	IMFlush(conn);
++    #endif /* STATUS_SYNC */
+ }
+ 
+ /*- preeditCaret: do actual preedit caret -*/
diff --git a/app-i18n/kinput2/kinput2-3.1-r1.ebuild b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
new file mode 100644
index 000000000000..c07616e56fc3
--- /dev/null
+++ b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kinput2/kinput2-3.1-r1.ebuild,v 1.1 2003/08/16 16:27:55 matsuu Exp $
+
+MY_P="${PN}-v${PV}"
+DESCRIPTION="A Japanese input server which supports the XIM protocol"
+SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://www.nec.co.jp/canna/"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="canna freewnn"
+
+DEPEND="virtual/glibc
+	canna? >=app-i18n/canna-3.5_beta2-r1
+	freewnn? >=app-i18n/freewnn-1.1.1_alpha19 : >=app-i18n/canna-3.5_beta2-r1"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	local mysed=""
+
+	unpack ${A}
+	epatch ${FILESDIR}/${PF}-gentoo.diff
+
+	use canna \
+		&& mysed="${mysed} -e 's:/\* \(\#define UseCanna\) \*/:\\1:'"
+	use freewnn \
+		&& mysed="${mysed} -e 's:/\* \(\#define UseWnn\) \*/:\\1:'"
+
+	#use sj3 \
+	#	&& mysed="${mysed} -e 's:/\* \(\#Define UseSj3\) \*/:\\1:'"
+	#use atok \
+	#	&& mysed="${mysed} -e 's:/\* \(\#Define UseAtok\) \*/:\\1:'"
+	#use wnn6 \
+	#	&& mysed="${mysed} -e 's:/\* \(\#Define UseWnn6\) \*/:\\1:'"
+
+	use canna || use freewnn \
+		|| mysed="${mysed} -e 's:/\* \(\#define UseCanna\) \*/:\\1:'"
+
+	echo ${mysed}
+	cp ${S}/Kinput2.conf ${T}
+	eval sed ${mysed} ${T}/Kinput2.conf > ${S}/Kinput2.conf || die
+}
+
+src_compile() {
+	xmkmf -a || die
+	make CDEBUGFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc README NEWS doc/*
+	newman cmd/${PN}.man ${PN}.1
+}