gcc 4.3 build fix by Martin Väth <vaeth@mathematik.uni-wuerzburg.de>, bug #215720

Package-Manager: portage-2.1.5_rc2

4 files changed, 57 insertions, 7 deletions

diff --git a/media-video/kdenlive/ChangeLog b/media-video/kdenlive/ChangeLog
index 2d22ec65897f..6528c94ee81d 100644
--- a/media-video/kdenlive/ChangeLog
+++ b/media-video/kdenlive/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/kdenlive
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/ChangeLog,v 1.22 2008/04/11 11:44:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/ChangeLog,v 1.23 2008/04/11 13:40:15 aballier Exp $
+
+  11 Apr 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/kdenlive-0.5-gcc-4.3.patch, kdenlive-0.5.ebuild:
+  gcc 4.3 build fix by Martin Väth <vaeth@mathematik.uni-wuerzburg.de>, bug
+  #215720
 
   11 Apr 2008; Alexis Ballier <aballier@gentoo.org>
   +files/kdenlive-0.5-ffmpegheaders.patch, kdenlive-0.5.ebuild:
diff --git a/media-video/kdenlive/Manifest b/media-video/kdenlive/Manifest
index cb25c13b1dd0..14396d0d08d1 100644
--- a/media-video/kdenlive/Manifest
+++ b/media-video/kdenlive/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA1
 
 AUX kdenlive-0.5-ffmpegheaders.patch 919 RMD160 3627b2388736b766c1848e621467bda1638f5cfa SHA1 3fe247bf73b26480f81ac8c0d48233ac4f360435 SHA256 1d33e6884935c28ca9e47ecae4abd9ba7d36ad312ff5582e7bd3828a784df958
+AUX kdenlive-0.5-gcc-4.3.patch 780 RMD160 bdd38877ef48093d7c5ec7b473d7a375c9ca19ff SHA1 919096f300257bd1b5daf5b401d3438046a16462 SHA256 2aaa7427fbbdcf1d407f23c6fdd592a3738785b7907f5803f859c9c816216af5
 DIST kdenlive-0.4.tar.gz 2493873 RMD160 1928e0383073657fcacdd5a3a79b6bc98399789a SHA1 2ac5b11a701a59016a5e6e23aef0a9b0b8c8fe6e SHA256 937ff6bf90422e1305b2d35264fc3c2284e6111b0ed5cfcd17da2b34fd5fc28e
 DIST kdenlive-0.5-1.tar.gz 7526119 RMD160 e15b2b881e25542646e34f4d027d2b89e3d72029 SHA1 5e9fea4d197189daf65ae493f5eb48704579d041 SHA256 f2e9b11d0f897baad17df849e6b082500c003361f4e605b2bdf3632327e01044
 EBUILD kdenlive-0.4.ebuild 1277 RMD160 053142aea593e5dfb65c0d02e2d68cffcdbcd335 SHA1 50038e76bfc1d29f528c6fd351a9a42a8fbf88ab SHA256 1ee5216856553582dbde44a7a2bd6535fde25f9df2c347db7f1bd0d9967f955c
-EBUILD kdenlive-0.5.ebuild 1390 RMD160 4fbb63866ee4b93769a225ad27af6aa8f60f99fb SHA1 12a8215bd9903be7a5cde2c48965551ee84a9741 SHA256 0089f353b08a0298c8d2cd1b8652d6b12d551ed74eee343af89897c35e848903
-MISC ChangeLog 3417 RMD160 fd9777ecbc9e4e1c37045aef251ca30c19b13cc1 SHA1 b1978b89e87f166e7fe8214958a38463514712da SHA256 24965140a99d84612007819f5d0f2bfcba3d6950f305ff00dc934fe713e94af5
+EBUILD kdenlive-0.5.ebuild 1431 RMD160 aaf92fd27d521f32819e51f5d1c748af6ae0a30d SHA1 8012032fa44852d71e176d5f836497350737436c SHA256 c7ce5b3313191db8d7cb7043a96db198528e79228598c30790766d3d0e1a419a
+MISC ChangeLog 3615 RMD160 392ce9e08c5ec92eefd0561cd41ece194be488a5 SHA1 f62a3719c5dd28961018ac53c24183aecd668a02 SHA256 204c09891a72efc2864b774301c6525a990c4b50185905413131ed2cb41f7e5e
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkf/TyAACgkQvFcC4BYPU0rfKwCfRFmw3K0YbnQ/QCxvnZrGqiIs
-HIUAnA8HtMl+Xl+ZVs+uLNz0iHIloef+
-=cDIY
+iEYEARECAAYFAkf/akgACgkQvFcC4BYPU0rMhgCglQo0bvURL0Gm5jPzyCNUJTUk
+SsMAoKB9uYlBbYOc3kpUkUkQGYUdL8hN
+=QEst
 -----END PGP SIGNATURE-----
diff --git a/media-video/kdenlive/files/kdenlive-0.5-gcc-4.3.patch b/media-video/kdenlive/files/kdenlive-0.5-gcc-4.3.patch
new file mode 100644
index 000000000000..c5c3cec01d0e
--- /dev/null
+++ b/media-video/kdenlive/files/kdenlive-0.5-gcc-4.3.patch
@@ -0,0 +1,43 @@
+--- kdenlive/kdenlive.cpp
++++ kdenlive/kdenlive.cpp
+@@ -17,6 +17,8 @@
+ 
+ #define _ISOC99_SOURCE
+ 
++#include <cstdlib>
++
+ // include files for QT
+ #include <qdir.h>
+ #include <qprinter.h>
+--- kdenlive/krender.cpp
++++ kdenlive/krender.cpp
+@@ -27,6 +27,7 @@
+ }
+ 
+ #include <iostream>
++#include <cstdlib>
+ 
+ // ffmpeg Header files
+ 
+--- kdenlive/kruler.cpp
++++ kdenlive/kruler.cpp
+@@ -24,6 +24,7 @@
+ 
+ #include <iostream>
+ #include <cmath>
++#include <cstdlib>
+ 
+ #include <kdebug.h>
+ #include <kstyle.h>
+--- kdenlive/ktrackview.cpp
++++ kdenlive/ktrackview.cpp
+@@ -16,7 +16,8 @@
+  ***************************************************************************/
+ 
+ #include <iostream>
+-#include <math.h>
++#include <cmath>
++#include <cstdlib>
+ 
+ #include <qpainter.h>
+ #include <qcursor.h>
diff --git a/media-video/kdenlive/kdenlive-0.5.ebuild b/media-video/kdenlive/kdenlive-0.5.ebuild
index 4b4c661dbdc5..407f9a732c36 100644
--- a/media-video/kdenlive/kdenlive-0.5.ebuild
+++ b/media-video/kdenlive/kdenlive-0.5.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/media-video/kdenlive/kdenlive-0.5.ebuild,v 1.3 2008/04/11 11:44:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/kdenlive-0.5.ebuild,v 1.4 2008/04/11 13:40:15 aballier Exp $
 
 inherit eutils kde
 
@@ -39,6 +39,7 @@ pkg_setup() {
 src_unpack() {
 	kde_src_unpack
 	epatch "${FILESDIR}/${P}-ffmpegheaders.patch"
+	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
 	rm -f configure
 }