Fix 'function safe_malloc implicitly converted to pointer' and more wrt #309713.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 52 insertions, 3 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index a3e5de703dfd..95eebce8eece 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/timidity++
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.130 2010/03/09 10:18:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.131 2010/03/16 08:26:13 ssuominen Exp $
+
+  16 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  timidity++-2.13.2-r12.ebuild, +files/timidity++-2.13.2-decl.patch:
+  Fix 'function safe_malloc implicitly converted to pointer' and more wrt
+  #309713.
 
 *timidity++-2.13.2-r12 (09 Mar 2010)
 
diff --git a/media-sound/timidity++/files/timidity++-2.13.2-decl.patch b/media-sound/timidity++/files/timidity++-2.13.2-decl.patch
new file mode 100644
index 000000000000..7851ccd47b0a
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.13.2-decl.patch
@@ -0,0 +1,43 @@
+diff -ur TiMidity++-2.13.2.orig/timidity/effect.c TiMidity++-2.13.2/timidity/effect.c
+--- TiMidity++-2.13.2.orig/timidity/effect.c	2004-03-25 07:51:51.000000000 +0200
++++ TiMidity++-2.13.2/timidity/effect.c	2010-03-16 10:17:24.000000000 +0200
+@@ -29,6 +29,8 @@
+ #include "config.h"
+ #endif /* HAVE_CONFIG_H */
+ 
++#include <stdlib.h>
++
+ #ifndef NO_STRING_H
+ #include <string.h>
+ #else
+diff -ur TiMidity++-2.13.2.orig/timidity/sndfont.c TiMidity++-2.13.2/timidity/sndfont.c
+--- TiMidity++-2.13.2.orig/timidity/sndfont.c	2010-03-16 10:16:57.000000000 +0200
++++ TiMidity++-2.13.2/timidity/sndfont.c	2010-03-16 10:17:24.000000000 +0200
+@@ -55,6 +55,7 @@
+ #include "output.h"
+ #include "filter.h"
+ #include "resample.h"
++#include "freq.h"
+ 
+ #define FILENAME_NORMALIZE(fname) url_expand_home_dir(fname)
+ #define FILENAME_REDUCED(fname)   url_unexpand_home_dir(fname)
+@@ -1615,8 +1616,6 @@
+ 
+  *********************************************************************/
+ 
+-#include "freq.h"
+-
+ #define CFG_FOR_SF_SUPPORT_FFT	1
+ 
+ static FILE *x_out;
+diff -ur TiMidity++-2.13.2.orig/timidity/speex_a.c TiMidity++-2.13.2/timidity/speex_a.c
+--- TiMidity++-2.13.2.orig/timidity/speex_a.c	2010-03-16 10:16:57.000000000 +0200
++++ TiMidity++-2.13.2/timidity/speex_a.c	2010-03-16 10:18:34.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include "config.h"
+ #endif /* HAVE_CONFIG_H */
+ #include <stdio.h>
++#include <stdlib.h>
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
diff --git a/media-sound/timidity++/timidity++-2.13.2-r12.ebuild b/media-sound/timidity++/timidity++-2.13.2-r12.ebuild
index 7302ca02232a..92f1d87a1d0e 100644
--- a/media-sound/timidity++/timidity++-2.13.2-r12.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.2-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r12.ebuild,v 1.1 2010/03/09 10:18:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r12.ebuild,v 1.2 2010/03/16 08:26:13 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils elisp-common
@@ -54,7 +54,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-flac113.patch \
 		"${FILESDIR}"/${P}-protos.patch \
 		"${FILESDIR}"/${P}-params.patch \
-		"${FILESDIR}"/${P}-no_png_set_dither.patch
+		"${FILESDIR}"/${P}-no_png_set_dither.patch \
+		"${FILESDIR}"/${P}-decl.patch
 
 	# fix header location of speex
 	sed -i -e "s:#include <speex:#include <speex/speex:g" \