summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-06-23 19:46:02 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-06-23 19:46:02 +0000
commit640183f0daf23db10be3e433cbda765bf1dd7ce4 (patch)
tree455f3f803b79007005be1c2b29e8189ee36f3eda /www-client/w3mmee
parentadobe-flash is not keyworded for ppc (diff)
downloadgentoo-2-640183f0daf23db10be3e433cbda765bf1dd7ce4.tar.gz
gentoo-2-640183f0daf23db10be3e433cbda765bf1dd7ce4.tar.bz2
gentoo-2-640183f0daf23db10be3e433cbda765bf1dd7ce4.zip
Fix building with GCC 4.5+ wrt #317815 byy Kacper Kowalik.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'www-client/w3mmee')
-rw-r--r--www-client/w3mmee/ChangeLog6
-rw-r--r--www-client/w3mmee/files/w3mmee-gcc45.patch17
-rw-r--r--www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild6
3 files changed, 25 insertions, 4 deletions
diff --git a/www-client/w3mmee/ChangeLog b/www-client/w3mmee/ChangeLog
index c5746ddd03f9..81bcb3f36802 100644
--- a/www-client/w3mmee/ChangeLog
+++ b/www-client/w3mmee/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/w3mmee
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/ChangeLog,v 1.11 2010/01/26 15:48:31 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/ChangeLog,v 1.12 2010/06/23 19:46:02 ssuominen Exp $
+
+ 23 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+ +files/w3mmee-gcc45.patch, w3mmee-0.3.2_p24-r6.ebuild:
+ Fix building with GCC 4.5+ wrt #317815 byy Kacper Kowalik.
26 Jan 2010; MATSUU Takuto <matsuu@gentoo.org>
-w3mmee-0.3.2_p24-r4.ebuild, -w3mmee-0.3.2_p24-r5.ebuild:
diff --git a/www-client/w3mmee/files/w3mmee-gcc45.patch b/www-client/w3mmee/files/w3mmee-gcc45.patch
new file mode 100644
index 000000000000..db6f86e4deee
--- /dev/null
+++ b/www-client/w3mmee/files/w3mmee-gcc45.patch
@@ -0,0 +1,17 @@
+Fixing build with gcc-4.5
+
+https://bugs.gentoo.org/show_bug.cgi?id=317815
+
+Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
+
+--- configure
++++ configure
+@@ -2636,7 +2636,7 @@
+ fi
+
+ cat >do_mk_btri.sh <<END_OF_DO_MK_BTRI
+-$dcpp "\$1" | sed -n "/^[ ]*[\\"'%]/p" | $mk_btri_cmd
++$dcpp -P "\$1" | sed -n "/^[ ]*[\\"'%]/p" | $mk_btri_cmd
+ END_OF_DO_MK_BTRI
+
+ cat >TABMakefile <<END_OF_TABMAKEFILE1
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 9b8c876eeb2c..7fe9ca3f8646 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-2009 Gentoo Foundation
+# Copyright 1999-2010 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.7 2009/07/25 20:09:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild,v 1.8 2010/06/23 19:46:02 ssuominen Exp $
inherit alternatives eutils
@@ -36,7 +36,7 @@ src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${PN}-w3mman-gentoo.diff \
- "${FILESDIR}"/${PN}-gcc44.patch
+ "${FILESDIR}"/${PN}-gcc4{4,5}.patch
}
src_compile() {