Fixed compile error when USE="async -cjk". Closing bug #40774

5 files changed, 61 insertions, 6 deletions

diff --git a/net-www/w3m/ChangeLog b/net-www/w3m/ChangeLog
index 0f78fe7199f3..1b4b5008d397 100644
--- a/net-www/w3m/ChangeLog
+++ b/net-www/w3m/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/w3m
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.47 2004/02/07 13:16:21 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.48 2004/02/17 13:40:58 usata Exp $
+
+*w3m-0.4.2-r9 (17 Feb 2004)
+
+  17 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2-r9.ebuild,
+  files/w3m-0.4.2-async-m17n-gentoo.diff:
+  Fixed compile error when USE="async -cjk". Closing bug #40774
 
 *w3m-0.4.2-r8 (07 Feb 2004)
 
diff --git a/net-www/w3m/Manifest b/net-www/w3m/Manifest
index 226c61f8d8c7..0a7f8402b607 100644
--- a/net-www/w3m/Manifest
+++ b/net-www/w3m/Manifest
@@ -1,9 +1,9 @@
-MD5 e5fe179a432679beed478927f7bb9249 w3m-0.4.2-r8.ebuild 4337
 MD5 1c5e6bd9c59cff053e5d78a5321de411 w3m-0.3.2.2.ebuild 3729
-MD5 907b73fa626c8648910d359a2df630c0 ChangeLog 9273
+MD5 bba18a825aba1531bd93647caf21aff3 w3m-0.4.2-r9.ebuild 4410
+MD5 67fc6ad42caf6416b463c2dce1ba87d4 ChangeLog 9479
 MD5 8e10c8fb50097c894200b100a02601eb w3m-0.4.2.ebuild 1945
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 7eaf4e81f63a7050a49996bf510d87be files/digest-w3m-0.4.2-r8 276
+MD5 7eaf4e81f63a7050a49996bf510d87be files/digest-w3m-0.4.2-r9 276
 MD5 838d56c55726f00c34b0c8649e948e3c files/w3m-0.4.2-form.diff 429
 MD5 5b34b82be16b1b02dd603acbfd11d9db files/w3m-libwc-gentoo.diff 437
 MD5 0fd075401455ce9205836b4267202e22 files/w3m-w3mman-gentoo.diff 1059
@@ -11,3 +11,4 @@ MD5 ccf8db4eb493664368e4e4c77cea99d4 files/digest-w3m-0.4.2 61
 MD5 df74b28e72e6c2140a1dd6e4ea042e58 files/digest-w3m-0.3.2.2 64
 MD5 00a360d12cc07d61c5fd5df08a53d261 files/w3m-0.4-alpha.patch 930
 MD5 4deea28e3a4e09f22019b01b52273ab3 files/w3m-m17n-search-gentoo.diff 446
+MD5 ca82b0ff2fa196fadebdc71b825b4ccf files/w3m-0.4.2-async-m17n-gentoo.diff 1539
diff --git a/net-www/w3m/files/digest-w3m-0.4.2-r8 b/net-www/w3m/files/digest-w3m-0.4.2-r9
index 2b2d4cf7adbb..2b2d4cf7adbb 100644
--- a/net-www/w3m/files/digest-w3m-0.4.2-r8
+++ b/net-www/w3m/files/digest-w3m-0.4.2-r9
diff --git a/net-www/w3m/files/w3m-0.4.2-async-m17n-gentoo.diff b/net-www/w3m/files/w3m-0.4.2-async-m17n-gentoo.diff
new file mode 100644
index 000000000000..ebc5fbb84768
--- /dev/null
+++ b/net-www/w3m/files/w3m-0.4.2-async-m17n-gentoo.diff
@@ -0,0 +1,45 @@
+diff -urN w3m.orig/file.c w3m/file.c
+--- w3m.orig/file.c	2004-02-17 19:10:27.055076000 +0900
++++ w3m/file.c	2004-02-17 22:00:49.578016400 +0900
+@@ -652,13 +652,11 @@
+ 		cont = TRUE;
+ #ifdef USE_M17N
+ 	    lineBuf2 = decodeMIME(lineBuf2, &mime_charset);
++#endif
+ 	    lineBuf2 = convertLine(NULL, lineBuf2, RAW_MODE,
+ 				   mime_charset ? &mime_charset : &newBuf->document_charset,
+ 				   mime_charset ? mime_charset
+ 				   : DocumentCharset);
+-#else
+-	    lineBuf2 = convertLine(NULL, lineBuf2, &newBuf->document_code, RAW_MODE);
+-#endif
+ 	    /* separated with line and stored */
+ 	    tmp = Strnew_size(lineBuf2->length);
+ 	    for (p = lineBuf2->ptr; *p; p = q) {
+@@ -6772,13 +6770,11 @@
+ 	}
+ #endif
+ 	if (!newBuf->internal) {
+-#ifdef USE_M17N
+ 	    lineBuf2 = convertLine(f, lineBuf2, HTML_MODE, &newBuf->document_charset, newBuf->document_charset);
++#ifdef USE_M17N
+ #ifdef USE_IMAGE
+ 	    h_env->document_charset = newBuf->document_charset;
+ #endif
+-#else
+-	    lineBuf2 = convertLine(f, lineBuf2, &newBuf->document_code, HTML_MODE);
+ #endif
+ 	}
+ 	HTMLlineproc0(lineBuf2->ptr, h_env, newBuf->internal);
+@@ -7497,11 +7493,7 @@
+ 	buf->nlines++;
+ 	buf->linelen += lineBuf2->length;
+ 	showProgressBuffer(buf);
+-#ifdef USE_M17N
+ 	lineBuf2 = convertLine(uf, lineBuf2, PAGER_MODE, &buf->document_charset, buf->document_charset);
+-#else
+-	lineBuf2 = convertLine(uf, lineBuf2, &buf->document_charset, PAGER_MODE);
+-#endif
+ 	if (squeezeBlankLine) {
+ 	    squeeze_flag = FALSE;
+ 	    if (lineBuf2->ptr[0] == '\n' && buf->pre_lbuf == '\n') {
diff --git a/net-www/w3m/w3m-0.4.2-r8.ebuild b/net-www/w3m/w3m-0.4.2-r9.ebuild
index d9498f75581f..da6b69ac172a 100644
--- a/net-www/w3m/w3m-0.4.2-r8.ebuild
+++ b/net-www/w3m/w3m-0.4.2-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.4.2-r8.ebuild,v 1.1 2004/02/07 09:25:01 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.4.2-r9.ebuild,v 1.1 2004/02/17 13:40:58 usata Exp $
 
 W3M_CVS_PV="1.890"
 W3M_CVS_P="${PN}-cvs-${W3M_CVS_PV}"
@@ -67,7 +67,10 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-libwc-gentoo.diff
 	epatch ${DISTDIR}/${W3M_CVS_P}-nls-4.diff
 	#epatch ${DISTDIR}/${W3M_CVS_P}-ja.po.diff
-	use async && epatch ${DISTDIR}/${W3M_CVS_P}-async-5.diff.gz
+	if [ -n "`use async`" ] ; then
+		epatch ${DISTDIR}/${W3M_CVS_P}-async-5.diff.gz
+		epatch ${FILESDIR}/${P}-async-m17n-gentoo.diff
+	fi
 	#epatch ${DISTDIR}/${P}-cvs-1.895_256-001.patch.gz
 	#use canna && epatch ${DISTDIR}/${W3M_CVS_P}-canna.patch
 }