Added a patch to (hopefully) resolve compilation problem with wnnlib.c

4 files changed, 20 insertions, 6 deletions

diff --git a/app-i18n/im-ja/ChangeLog b/app-i18n/im-ja/ChangeLog
index ed05fc0188b5..fac5944ca54b 100644
--- a/app-i18n/im-ja/ChangeLog
+++ b/app-i18n/im-ja/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-i18n/im-ja
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/ChangeLog,v 1.6 2003/09/04 14:39:45 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/ChangeLog,v 1.7 2003/09/05 02:52:23 usata Exp $
 
 *im-ja-0.7_p2 (20 Aug 2003)
 
@@ -10,7 +10,7 @@
 *im-ja-0.6 (07 Jul 2003)
 
   04 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> im-ja-0.4.ebuild,
-  im-ja-0.6.ebuild:
+  im-ja-0.6.ebuild, files/im-ja-0.6-gentoo.diff:
   Added -I/usr/include/wnn to fix compilation bug in #27896.
   Marked stable on x86 for im-ja-0.6.
 
diff --git a/app-i18n/im-ja/Manifest b/app-i18n/im-ja/Manifest
index 4fdd36d0709c..1426a1d4aa6c 100644
--- a/app-i18n/im-ja/Manifest
+++ b/app-i18n/im-ja/Manifest
@@ -1,6 +1,6 @@
-MD5 a300301d661668d4051d256453291b6c ChangeLog 1236
+MD5 62cc67dd576983b6800abd2abd57f3d6 ChangeLog 1265
 MD5 a839be5f8502638a4241719f1036d451 im-ja-0.4.ebuild 957
-MD5 5ee089dda85e47d8a5cccbf9c4ee463f im-ja-0.6.ebuild 1657
+MD5 475bf8e566d1f6b647d0afd9ee4903cd im-ja-0.6.ebuild 1714
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 da4f9455f40d857fe5f3933e2b65c434 im-ja-0.5.ebuild 1591
 MD5 fed360ec96b59abdca4c9ed55e58bf48 im-ja-0.7_p2.ebuild 1217
@@ -8,3 +8,4 @@ MD5 21cfa892d1937a4396772e7d1582316f files/digest-im-ja-0.4 61
 MD5 8116d40492e309d8a6bcf4ff70bcb49f files/digest-im-ja-0.5 61
 MD5 0d70fbe4f0f67a7a474c20b9f047c60b files/digest-im-ja-0.6 61
 MD5 6f3230b84289fc2f9a9a255f604f324b files/digest-im-ja-0.7_p2 63
+MD5 131326130e94a82f0581cd5ed17c7160 files/im-ja-0.6-gentoo.diff 290
diff --git a/app-i18n/im-ja/files/im-ja-0.6-gentoo.diff b/app-i18n/im-ja/files/im-ja-0.6-gentoo.diff
new file mode 100644
index 000000000000..98b93f77ebf6
--- /dev/null
+++ b/app-i18n/im-ja/files/im-ja-0.6-gentoo.diff
@@ -0,0 +1,10 @@
+--- im-ja-0.6.ORIG/src/wnnlib.c	2003-07-01 20:56:23.000000000 +0900
++++ im-ja-0.6/src/wnnlib.c	2003-09-05 11:23:50.000000000 +0900
+@@ -585,6 +585,7 @@
+ #include	<string.h>
+ #include        <stdlib.h>
+ #include	<pwd.h>
++#include	<unistd.h>
+ 
+ #ifndef ENVDIR
+ #define ENVDIR	"/usr/share/wnn"
diff --git a/app-i18n/im-ja/im-ja-0.6.ebuild b/app-i18n/im-ja/im-ja-0.6.ebuild
index 62e6ac1f4d76..7737ea6be4b0 100644
--- a/app-i18n/im-ja/im-ja-0.6.ebuild
+++ b/app-i18n/im-ja/im-ja-0.6.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-0.6.ebuild,v 1.2 2003/09/04 14:39:45 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-0.6.ebuild,v 1.3 2003/09/05 02:52:23 usata Exp $
+
+inherit eutils
 
 DESCRIPTION="A Japanese input module for GTK2"
 HOMEPAGE="http://im-ja.sourceforge.net/"
@@ -27,10 +29,11 @@ GCONFDIR=$(gconftool-2 --get-default-source | sed -e "s|^xml::/|${D}|")
 src_unpack() {
 
 	unpack ${A}
+	epatch ${FILESDIR}/${P}-gentoo.diff
 
 	cd ${S}/data
 	# work around
-	dosed "s:\(GCONF_CONFIG_SOURCE=\)\$(GCONF_CONFIG_SOURCE):\1\$(GCONF_SCHEMA_CONFIG_SOURCE):" Makefile.in
+	sed -i -e "s:\(GCONF_CONFIG_SOURCE=\)\$(GCONF_CONFIG_SOURCE):\1\$(GCONF_SCHEMA_CONFIG_SOURCE):" Makefile.in
 }
 
 src_compile() {