diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-04-20 09:37:12 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-04-20 09:37:12 +0000 |
| commit | 18cc9a5b98de237ef8ce4fa33383ef713e5d8e7c (patch) | |
| tree | 9f840dab31fe2ddef13762df5f87cb20abf993a7 | |
| parent | Version bump. (diff) | |
| download | gentoo-2-18cc9a5b98de237ef8ce4fa33383ef713e5d8e7c.tar.gz gentoo-2-18cc9a5b98de237ef8ce4fa33383ef713e5d8e7c.tar.bz2 gentoo-2-18cc9a5b98de237ef8ce4fa33383ef713e5d8e7c.zip | |
Add fix from Debian for building with gcc-4.3 #214181 by Peter Alfredsen.
(Portage version: 2.2_pre5)
| -rw-r--r-- | dev-util/xxdiff/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/xxdiff/files/xxdiff-3.2-gcc43.patch | 16 | ||||
| -rw-r--r-- | dev-util/xxdiff/xxdiff-3.2-r1.ebuild | 6 |
3 files changed, 25 insertions, 5 deletions
diff --git a/dev-util/xxdiff/ChangeLog b/dev-util/xxdiff/ChangeLog index 5d6a57022850..ffc19194d2c4 100644 --- a/dev-util/xxdiff/ChangeLog +++ b/dev-util/xxdiff/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/xxdiff -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.45 2008/03/18 19:57:26 armin76 Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.46 2008/04/20 09:37:11 vapier Exp $ + + 20 Apr 2008; Mike Frysinger <vapier@gentoo.org> + +files/xxdiff-3.2-gcc43.patch, xxdiff-3.2-r1.ebuild: + Add fix from Debian for building with gcc-4.3 #214181 by Peter Alfredsen. 18 Mar 2008; Raúl Porcel <armin76@gentoo.org> -xxdiff-3.0.2-r1.ebuild, -xxdiff-3.2.ebuild, xxdiff-3.2-r1.ebuild: diff --git a/dev-util/xxdiff/files/xxdiff-3.2-gcc43.patch b/dev-util/xxdiff/files/xxdiff-3.2-gcc43.patch new file mode 100644 index 000000000000..df56a5ff9e9c --- /dev/null +++ b/dev-util/xxdiff/files/xxdiff-3.2-gcc43.patch @@ -0,0 +1,16 @@ +fix from Debian for building with gcc-4.3 + +http://bugs.gentoo.org/214181 + +--- xxdiff-3.2/src/resources.inline.h ++++ xxdiff-3.2/src/resources.inline.h +@@ -20,6 +20,8 @@ + * + ******************************************************************************/ + ++#include <cstdlib> ++ + /*============================================================================== + * EXTERNAL DECLARATIONS + *============================================================================*/ + diff --git a/dev-util/xxdiff/xxdiff-3.2-r1.ebuild b/dev-util/xxdiff/xxdiff-3.2-r1.ebuild index 8529fad20d7f..f3aba4877e7f 100644 --- a/dev-util/xxdiff/xxdiff-3.2-r1.ebuild +++ b/dev-util/xxdiff/xxdiff-3.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-3.2-r1.ebuild,v 1.5 2008/03/18 19:57:26 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-3.2-r1.ebuild,v 1.6 2008/04/20 09:37:11 vapier Exp $ EAPI="1" @@ -17,11 +17,9 @@ IUSE="kde python debug" RDEPEND="=x11-libs/qt-3* kde? ( kde-base/kdelibs:3.5 )" - DEPEND="${RDEPEND} sys-devel/flex || ( sys-devel/bison dev-util/yacc )" - RDEPEND="${RDEPEND} sys-apps/diffutils" @@ -29,6 +27,8 @@ set-kdedir 3 src_unpack() { unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-gcc43.patch #214181 if use kde; then cd "${S}/src" |