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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 55 insertions, 5 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++/Manifest b/media-sound/timidity++/Manifest
index 25ec118f5a43..a0367cbe958b 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -2,6 +2,7 @@ AUX 50timidity++-gentoo.el 180 RMD160 120c40280826edc0e6c746ed2b09372222235492 S
 AUX conf.d.timidity 912 RMD160 ba936b4f721ed4d3dac2912659b13b125b09833a SHA1 4636543aa1c2c90afb4ee02e8f11067bda2bd271 SHA256 df5cec5d1335b9bdaf87c358b6d69f4f9300454c16aceaaccb212c98fb08f5a3
 AUX conf.d.timidity.2 972 RMD160 60bd6643d195fd846185ca23132a969eef950f55 SHA1 c74e787f048229b7e3795e2783207d85ec9c3dad SHA256 a3a6fc74fc1353f2c5e7eda51a244fb3212cd5f33b407fe5ce1245ca2757593e
 AUX init.d.timidity.3 502 RMD160 45dcebcc3e2dd3048b4551941464a6ffcf1b8b0e SHA1 4e9f0069d14bdd121c83163d95f75a02801707a9 SHA256 b11e108210446221ccc8344f07a780349197248194bde5956ca69552f7aa5b14
+AUX timidity++-2.13.2-decl.patch 1441 RMD160 69d66d1e218fdc8410b428044d282ffed47992f1 SHA1 329ddde21601807c7838a3848152a05b17cd2a98 SHA256 10978930289531a04537adcda1988d9f880d59073f6544fa794de01c520b561b
 AUX timidity++-2.13.2-flac.patch 735 RMD160 65abbbc330b0ae486af3686cea8329a4f9a1b75c SHA1 53f4cbf7a343002a3f6508938ba3e24d1f4bf5f5 SHA256 5ae270f3bc0b74def45dde4b85d178c8ebfbef01752ef6b4ec2588ffda48bbca
 AUX timidity++-2.13.2-flac113.patch 11509 RMD160 709a31cc664a9686f1ac22974459e0c932511418 SHA1 173cc8f2ec5ecfc834d5a0027aa3cdecd3f9f14d SHA256 2ed4abfb75d225f6bd295ba4ffbc63f47c6caab57cb09e670df508c5d7447424
 AUX timidity++-2.13.2-gcc4.patch 1325 RMD160 31383eb4a1d0a839d60af8d635aeba02febc9bb5 SHA1 8d50618a2379c078b07e8d0fc59457855c16106c SHA256 20ca5deb95ccbb527c0212f4ad002a5a8df1a9c005e210494abe7bc240cef3ee
@@ -18,6 +19,6 @@ DIST TiMidity++-2.13.2.tar.bz2 1581230 RMD160 0156221846a88abef9312700a050972d85
 DIST timidity++-2.13.2-exiterror.patch 21406 RMD160 6b73552e18580422ca4471f12142440a4f3760a9 SHA1 7cd697b4f7cb1ce45cec46c2e0f6e5e8bf1d9d60 SHA256 ccf1a3678beff5cd143bec07b64ca35620b8eac98b093898c072459051752b77
 EBUILD timidity++-2.13.2-r10.ebuild 4639 RMD160 21e650caf537afb9faeb9ddd1ce46409239add48 SHA1 140e6ad322a58ce5d968380dc4772628bf2be526 SHA256 48cd342a2066f7cce5e83ce868eea22278c7cee1a9a30253a32e87668265af49
 EBUILD timidity++-2.13.2-r11.ebuild 5315 RMD160 37327d023d76108b88a4d400ca6094f749e6d32c SHA1 60f43d032166fed241e45e6519804322aefb1392 SHA256 6fb63d85eff872883b8f23e4282f95c3762276abcff93007d58db9b3d50933e8
-EBUILD timidity++-2.13.2-r12.ebuild 5375 RMD160 a50c8c0f586a8158819bc28ca8a239c831c6fbdb SHA1 5c3577867e2fa674cc68384d264fb7f377afca4b SHA256 7714b22b926dc91caea3921934f8112e7313d067fa9b239510dec7821e0a8e6a
-MISC ChangeLog 20511 RMD160 a185206ca4bb15034298c0a49d3848d2135ffad2 SHA1 bb9de18a8e248eca956d6d80e9110cfa6cb91350 SHA256 63330e4402075f28e2de3769b79657eecee33648db8ff8d00ee67a76d71eef53
+EBUILD timidity++-2.13.2-r12.ebuild 5409 RMD160 d81b5aecb1aff2d1aa8c7516b4a9834ae5876083 SHA1 14c3759a5211f25c406b5380db587b193e9baa39 SHA256 6022c198642a899363494c59b38481fa72c92f6a6c198f73b75e2ffbf9f0cb01
+MISC ChangeLog 20720 RMD160 889ae87ed414ff1f5ebeb743a0bca120d1a12458 SHA1 632a8d7316b2f36dd891236e362161861e5de49d SHA256 79b340fa646a901d2e24cb2b7d6d5869d8f2d3af145e7fd358fbc9f29428cb74
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
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" \