diff options
| author |   Joe Peterson <lavajoe@gentoo.org> | 2007-10-24 15:38:29 +0000 |
|---|---|---|
| committer | Joe Peterson <lavajoe@gentoo.org> | 2007-10-24 15:38:29 +0000 |
| commit | c3f1a43ee0478ab6aec1c367f02586790f8d3c70 (patch) | |
| tree | 3b69f8a751e2376c8ef764ee25ecd542b94229df | |
| parent | x86 stable, bug #196840 (diff) | |
| download | gentoo-2-c3f1a43ee0478ab6aec1c367f02586790f8d3c70.tar.gz gentoo-2-c3f1a43ee0478ab6aec1c367f02586790f8d3c70.tar.bz2 gentoo-2-c3f1a43ee0478ab6aec1c367f02586790f8d3c70.zip | |
Make malloc.h -> stdlib.h patch unconditional
(Portage version: 2.1.3.16)
| -rw-r--r-- | media-libs/libprojectm/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/libprojectm/files/libprojectm-1.01-freebsd.patch | 15 | ||||
| -rw-r--r-- | media-libs/libprojectm/files/libprojectm-1.01-malloc.patch | 11 | ||||
| -rw-r--r-- | media-libs/libprojectm/libprojectm-1.01.ebuild | 4 |
4 files changed, 19 insertions, 18 deletions
diff --git a/media-libs/libprojectm/ChangeLog b/media-libs/libprojectm/ChangeLog index aa1fa1cf20e0..2eb2156f610b 100644 --- a/media-libs/libprojectm/ChangeLog +++ b/media-libs/libprojectm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/libprojectm # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/ChangeLog,v 1.16 2007/10/24 00:43:40 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/ChangeLog,v 1.17 2007/10/24 15:38:28 lavajoe Exp $ + + 24 Oct 2007; Joe Peterson <lavajoe@gentoo.org> + -files/libprojectm-1.01-freebsd.patch, + +files/libprojectm-1.01-malloc.patch, libprojectm-1.01.ebuild: + Make malloc.h -> stdlib.h patch unconditional 24 Oct 2007; Jeroen Roovers <jer@gentoo.org> libprojectm-1.01.ebuild: Marked ~hppa (bug #196836). diff --git a/media-libs/libprojectm/files/libprojectm-1.01-freebsd.patch b/media-libs/libprojectm/files/libprojectm-1.01-freebsd.patch deleted file mode 100644 index f98176c64ec2..000000000000 --- a/media-libs/libprojectm/files/libprojectm-1.01-freebsd.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nur libprojectM-1.01.old/MoodBar.cpp libprojectM-1.01/MoodBar.cpp ---- libprojectM-1.01.old/MoodBar.cpp 2007-10-10 08:47:14 -0600 -+++ libprojectM-1.01/MoodBar.cpp 2007-10-23 14:42:32 -0600 -@@ -19,7 +19,11 @@ - - #include <cmath> - extern "C" { -+#ifdef __FreeBSD__ -+#include <stdlib.h> -+#else - #include <malloc.h> -+#endif - } - #include <iostream> - #include <cassert> diff --git a/media-libs/libprojectm/files/libprojectm-1.01-malloc.patch b/media-libs/libprojectm/files/libprojectm-1.01-malloc.patch new file mode 100644 index 000000000000..f847d19a939a --- /dev/null +++ b/media-libs/libprojectm/files/libprojectm-1.01-malloc.patch @@ -0,0 +1,11 @@ +--- libprojectM-1.01/MoodBar.cpp.old 2007-10-10 08:47:14 -0600 ++++ libprojectM-1.01/MoodBar.cpp 2007-10-24 09:01:46 -0600 +@@ -19,7 +19,7 @@ + + #include <cmath> + extern "C" { +-#include <malloc.h> ++#include <stdlib.h> + } + #include <iostream> + #include <cassert> diff --git a/media-libs/libprojectm/libprojectm-1.01.ebuild b/media-libs/libprojectm/libprojectm-1.01.ebuild index c0e92d2d4b3b..6779cf131988 100644 --- a/media-libs/libprojectm/libprojectm-1.01.ebuild +++ b/media-libs/libprojectm/libprojectm-1.01.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/libprojectm-1.01.ebuild,v 1.4 2007/10/24 00:43:40 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/libprojectm-1.01.ebuild,v 1.5 2007/10/24 15:38:28 lavajoe Exp $ inherit toolchain-funcs eutils @@ -31,7 +31,7 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/${P}-freebsd.patch" + epatch "${FILESDIR}/${P}-malloc.patch" } src_compile() { |