summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-07-25 20:09:00 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-07-25 20:09:00 +0000
commit2b4ce41341b85c93c787891de5480b7116cc3f7f (patch)
tree12f058f18a11c6adb0f8203510f9919560e3f7e7 /www-client/w3mmee
parentFixed typo in ebuild (diff)
downloadgentoo-2-2b4ce41341b85c93c787891de5480b7116cc3f7f.tar.gz
gentoo-2-2b4ce41341b85c93c787891de5480b7116cc3f7f.tar.bz2
gentoo-2-2b4ce41341b85c93c787891de5480b7116cc3f7f.zip
Fix building with GCC 4.4 wrt #278079.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'www-client/w3mmee')
-rw-r--r--www-client/w3mmee/ChangeLog8
-rw-r--r--www-client/w3mmee/files/w3mmee-gcc44.patch12
-rw-r--r--www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild11
3 files changed, 24 insertions, 7 deletions
diff --git a/www-client/w3mmee/ChangeLog b/www-client/w3mmee/ChangeLog
index 50152d15ec97..4301a0b1bec8 100644
--- a/www-client/w3mmee/ChangeLog
+++ b/www-client/w3mmee/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/w3mmee
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/ChangeLog,v 1.9 2007/02/22 00:26:37 jokey Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/ChangeLog,v 1.10 2009/07/25 20:09:00 ssuominen Exp $
+
+ 25 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+ +files/w3mmee-gcc44.patch, w3mmee-0.3.2_p24-r6.ebuild:
+ Fix building with GCC 4.4 wrt #278079.
22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
Redigest for Manifest2
diff --git a/www-client/w3mmee/files/w3mmee-gcc44.patch b/www-client/w3mmee/files/w3mmee-gcc44.patch
new file mode 100644
index 000000000000..092adb5ba40c
--- /dev/null
+++ b/www-client/w3mmee/files/w3mmee-gcc44.patch
@@ -0,0 +1,12 @@
+diff -ur w3mmee-p24-22.orig/indep.c w3mmee-p24-22/indep.c
+--- w3mmee-p24-22.orig/indep.c 2002-11-27 16:35:37.000000000 +0200
++++ w3mmee-p24-22/indep.c 2009-07-25 23:06:52.000000000 +0300
+@@ -14,7 +14,7 @@
+ {
+ #ifdef HAVE_STRTOLL
+ return strtoll(s, NULL, base);
+-#elif HAVE_STRTOQ
++#elif defined(HAVE_STRTOQ)
+ return strtoq(s, NULL, base);
+ #else
+ int minus, digit;
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild
index fdb60c4558d1..9b8c876eeb2c 100644
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild,v 1.6 2006/04/21 17:33:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild,v 1.7 2009/07/25 20:09:00 ssuominen Exp $
inherit alternatives eutils
@@ -30,12 +30,13 @@ DEPEND=">=sys-libs/ncurses-5.2-r3
PROVIDE="virtual/w3m"
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
src_unpack() {
unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
+ cd "${S}"
+ epatch "${FILESDIR}"/${PN}-w3mman-gentoo.diff \
+ "${FILESDIR}"/${PN}-gcc44.patch
}
src_compile() {