Added a patch to fix build failure when USE="-gpm"

4 files changed, 36 insertions, 13 deletions

diff --git a/net-www/w3m/ChangeLog b/net-www/w3m/ChangeLog
index 2a9e32977c47..5896e49df859 100644
--- a/net-www/w3m/ChangeLog
+++ b/net-www/w3m/ChangeLog
@@ -1,12 +1,16 @@
 # ChangeLog for net-www/w3m
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.39 2003/11/14 16:12:11 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.40 2003/11/19 16:36:31 usata Exp $
 
   14 Nov 2003; Brad House <brad_mssw@gentoo.org> w3m-0.4.2.ebuild:
   mark stable on amd64
 
 *w3m-0.4.2-r3 (14 Nov 2003)
 
+  20 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2-r3.ebuild,
+  files/w3m-async-gpm-gentoo.diff:
+  Fixed build failure when USE="-gpm"
+
   14 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2-r3.ebuild,
   files/w3m.sh, files/w3mbookmark.sh.in, files/w3mhelperpanel.sh.in:
   Added async patch.
diff --git a/net-www/w3m/Manifest b/net-www/w3m/Manifest
index 0dc715891f19..b784e6e742d6 100644
--- a/net-www/w3m/Manifest
+++ b/net-www/w3m/Manifest
@@ -1,16 +1,17 @@
-MD5 4ba136f1e5e9918deb2bafff542917f9 ChangeLog 7839
-MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 1f7b8fffb13d61fe43a3294dcf037926 w3m-0.3.2.2.ebuild 3732
-MD5 7676892f874fdeefb6cc8dac727f6558 w3m-0.4.1-r3.ebuild 2381
+MD5 34bfbc9113c2288989f7dfac98c08388 ChangeLog 7979
+MD5 12c81940cca65cfeed235e6eb6751082 w3m-0.4.2-r3.ebuild 3677
+MD5 efd0e7ec20245e58a27edc22a41e8d04 w3m-0.4.2-r2.ebuild 3323
 MD5 e1809813737d3273b17639d3f9cccc2b w3m-0.4.2.ebuild 1949
+MD5 1f7b8fffb13d61fe43a3294dcf037926 w3m-0.3.2.2.ebuild 3732
 MD5 003ecc09459bb3933a50d51c2b757630 w3m-0.4.ebuild 4437
-MD5 efd0e7ec20245e58a27edc22a41e8d04 w3m-0.4.2-r2.ebuild 3323
-MD5 6379bf8220687c5df1df9a43b9b76fdc w3m-0.4.2-r3.ebuild 3621
+MD5 7676892f874fdeefb6cc8dac727f6558 w3m-0.4.1-r3.ebuild 2381
+MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+MD5 0fd075401455ce9205836b4267202e22 files/w3m-w3mman-gentoo.diff 1059
+MD5 1e0e222a0e5c3e7c2f9acca4fee13c7d files/digest-w3m-0.4.2-r3 208
+MD5 40e3d07e75b9f601f7b33cc5336214e7 files/digest-w3m-0.4.2-r2 72
 MD5 df74b28e72e6c2140a1dd6e4ea042e58 files/digest-w3m-0.3.2.2 64
 MD5 b289d2ea47e3369102b13b53f2bc47ac files/digest-w3m-0.4 60
+MD5 26cf71e320adb7c19fd0bc71a9bb99fe files/w3m-async-gpm-gentoo.diff 370
+MD5 00a360d12cc07d61c5fd5df08a53d261 files/w3m-0.4-alpha.patch 930
 MD5 fd7a37dd6717b69b356f6179a19e17b7 files/digest-w3m-0.4.1-r3 62
 MD5 ccf8db4eb493664368e4e4c77cea99d4 files/digest-w3m-0.4.2 61
-MD5 1e0e222a0e5c3e7c2f9acca4fee13c7d files/digest-w3m-0.4.2-r3 208
-MD5 00a360d12cc07d61c5fd5df08a53d261 files/w3m-0.4-alpha.patch 930
-MD5 0fd075401455ce9205836b4267202e22 files/w3m-w3mman-gentoo.diff 1059
-MD5 40e3d07e75b9f601f7b33cc5336214e7 files/digest-w3m-0.4.2-r2 72
diff --git a/net-www/w3m/files/w3m-async-gpm-gentoo.diff b/net-www/w3m/files/w3m-async-gpm-gentoo.diff
new file mode 100644
index 000000000000..c1c557fe53e3
--- /dev/null
+++ b/net-www/w3m/files/w3m-async-gpm-gentoo.diff
@@ -0,0 +1,16 @@
+--- terms.c.ORIG	2003-11-20 00:20:23.000000000 +0900
++++ terms.c	2003-11-20 01:21:30.000000000 +0900
+@@ -34,12 +34,12 @@
+ #endif				/* use_SYSMOUSE */
+ 
+ static int is_xterm = 0;
+-static char *term = NULL;
+ 
+ void mouse_init(), mouse_end();
+ int mouseActive = 0;
+ #endif				/* USE_MOUSE */
+ 
++static char *term = NULL;
+ static char *title_str = NULL;
+ 
+ extern int tty;
diff --git a/net-www/w3m/w3m-0.4.2-r3.ebuild b/net-www/w3m/w3m-0.4.2-r3.ebuild
index 2f4a81db57bc..a4203ca929fb 100644
--- a/net-www/w3m/w3m-0.4.2-r3.ebuild
+++ b/net-www/w3m/w3m-0.4.2-r3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2003 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-r3.ebuild,v 1.1 2003/11/14 10:04:04 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.4.2-r3.ebuild,v 1.2 2003/11/19 16:36:31 usata Exp $
 
-IUSE="X nopixbuf imlib imlib2 xface ssl migemo gpm cjk canna"
+IUSE="X nopixbuf imlib imlib2 xface ssl migemo gpm cjk"
+#IUSE="canna"
 
 W3M_CVS_PV="1.890"
 W3M_CVS_P="${PN}-cvs-${W3M_CVS_PV}"
@@ -59,6 +60,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
 	epatch ${DISTDIR}/${W3M_CVS_P}-async-3.diff.gz
+	epatch ${FILESDIR}/${PN}-async-gpm-gentoo.diff
 	#use canna && epatch ${DISTDIR}/${W3M_CVS_P}-canna.patch
 }