zoneminder: fixed 1.24.2 build error

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

4 files changed, 21 insertions, 4 deletions

diff --git a/www-misc/zoneminder/ChangeLog b/www-misc/zoneminder/ChangeLog
index 96efb3902889..8e35db689d6b 100644
--- a/www-misc/zoneminder/ChangeLog
+++ b/www-misc/zoneminder/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-misc/zoneminder
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.38 2010/02/22 15:39:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.39 2010/06/02 23:09:15 wired Exp $
+
+  02 Jun 2010; Alex Alexander <wired@gentoo.org>
+  +files/1.24.2/zm_build_fix.patch, zoneminder-1.24.2.ebuild:
+  fixed 1.24.2 build error
 
   22 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
   +files/1.24.2/zm_jpeg.patch, zoneminder-1.24.2.ebuild:
diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index de394ba6ce2b..bd595ba03631 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -3,6 +3,7 @@ AUX 1.23.1/zm_create.sql.in.patch 19013 RMD160 076dbeb30a4758e4ff708139e40302d6d
 AUX 1.23.1/zm_remote_camera.patch 1551 RMD160 03024108ba012b7e39620ed950b96df1c4ab63f3 SHA1 cfda28aa3a17c8dda9d5e7dc014dda6a81b5a0a1 SHA256 fdce259c8bbe18bde09c99c270e8615531f4340db98eb28461177b2b305ed097
 AUX 1.24.2/Makefile.am.patch 899 RMD160 2ffe9cbb75d433353769759d55580be9d0d8ccd8 SHA1 84024eb973f86e28d0fefa40c9a233f90c52a262 SHA256 301f23e57099c6841601017aed5a834a2ffc5e95a4b2f7e273272d4b11344ac3
 AUX 1.24.2/db_upgrade_script_location.patch 412 RMD160 368052be3fc8f32276cd59a146fd99a3b23b05f8 SHA1 a7a04bb212c0ca6ec693ca821d4c5de56b3e65c9 SHA256 3ffaa44c013dd27c3e5e937de77158c60b4cd37f28e1fc42dd7283f80075b067
+AUX 1.24.2/zm_build_fix.patch 407 RMD160 ac45177bb3f06dd0fd9cd1f938b90ba2297d07d2 SHA1 d7c6978c9fc71baf3c86b2405959fbe3da5eec99 SHA256 51f1effb3551bc8f9fbfe9e516db5f318091965f83dbf9e9772e6c7a02d2e640
 AUX 1.24.2/zm_create.sql.in.patch 16846 RMD160 c1b3b4ad6c5e70f4497f60a840a358a886125849 SHA1 7299c116be6f4a9cd97e55eb75c87d686a43d41c SHA256 edd4476e34c2b3b0e533809bce36827d8c84482cf25a9fca167453174866016f
 AUX 1.24.2/zm_jpeg.patch 2661 RMD160 e4d95b98a46a0b77874862a4afaa937e4c2814ef SHA1 58852307e7ed7df47660d2795199e91fa13319c7 SHA256 e8ac509821d9b0629c8cccb31ce25908b2b0bb7831aa7d710440b0551ad5ef3a
 AUX 1.24.2/zm_remote_camera_http.patch 1566 RMD160 644a681789d0ecf424156cde4b4ea8f6c5065197 SHA1 74dbe274d129997826b9a775c672c28286b60e3f SHA256 f554f2bcc7977e5ac151bd87aa2b8a0b7a9eeb9099839afe0d8b2b60a37ce04e
@@ -12,6 +13,6 @@ AUX init.d 392 RMD160 075f5bb61776cc55bca82b3725b8e6f0cdc877e8 SHA1 76de21342416
 DIST ZoneMinder-1.23.3.tar.gz 764528 RMD160 cf04dcd61891a5b8b1a30d738a8b1274ecefad70 SHA1 aaca4fb26b2f09d57b1901f49c538d7e46963254 SHA256 76cba999bf602b1d561921cfcbbf7a9eab64370f349a0b389efff75f4b0c3af2
 DIST ZoneMinder-1.24.2.tar.gz 965521 RMD160 3ec5ca1a6d418feeeecd6dc3c4a78a79f5ead373 SHA1 ea854c941b83374a352d7d794a4462e279fea487 SHA256 fd8475138ccee8870534f1210a3d1e3e1990e963dd73146a6d310dc71c463dca
 EBUILD zoneminder-1.23.3.ebuild 3709 RMD160 43deb29960b4d7f5a3ba3192442d9d7b6c4d95e1 SHA1 880e0cda0191f16018516cb45b2e573778c042cd SHA256 6010993db0f86bdf7b640beb17574ec55ab84dbd3a4fcee3ca14baf01c0e6a52
-EBUILD zoneminder-1.24.2.ebuild 4055 RMD160 841a14e6de02013cc893af5bc482c5f8b5a55443 SHA1 5d9636bc63311bc1af0bef31c849a53578972ff3 SHA256 35f0ad713c8d5dc76d7a346a007cec546c73f804e6e8bbbf3325dcae5dc3b592
-MISC ChangeLog 6988 RMD160 b01334a704818a61805692513d716dad3f511d12 SHA1 560c62e045a8199db4db45cc307e0541e872f07b SHA256 22fbed21c9dfb0032f02d206662bd9519f7af84cd025b893536d7bed99727293
+EBUILD zoneminder-1.24.2.ebuild 4104 RMD160 1951c72444ff3bda54547d510cc6369527431d29 SHA1 c4d3401c22d0c05bb6935d3156822ec479133b24 SHA256 147b2519e07a03471d1d01fde9dc4959fca1bf60996b19a572cbd338d5f87c16
+MISC ChangeLog 7123 RMD160 9f7e0d1f0892d97575bb3b336cb447801fc1d484 SHA1 7ec7f6c78d5d08b97ed447f3db6dc955889a830e SHA256 a0c8cc4246f26f4dceb806583740ac2a24e43593c0cf1e0588e462a3cb769d78
 MISC metadata.xml 260 RMD160 c12fd64bd707f1295bbe662f72c9cfa50e9774e2 SHA1 75c4629846789f80cee0e163f2822d725d1388fb SHA256 3059d89f940a19b5e4c03c954c4fe960c0f7daeff0f57540271fa0aec70a7b24
diff --git a/www-misc/zoneminder/files/1.24.2/zm_build_fix.patch b/www-misc/zoneminder/files/1.24.2/zm_build_fix.patch
new file mode 100644
index 000000000000..164a10689362
--- /dev/null
+++ b/www-misc/zoneminder/files/1.24.2/zm_build_fix.patch
@@ -0,0 +1,11 @@
+diff -u -ru ZoneMinder-1.24.2-old//src/zm_utils.cpp ZoneMinder-1.24.2/src/zm_utils.cpp
+--- ZoneMinder-1.24.2-old//src/zm_utils.cpp	2010-06-03 01:34:27.981235559 +0300
++++ ZoneMinder-1.24.2/src/zm_utils.cpp	2010-06-03 01:44:52.108291327 +0300
+@@ -20,6 +20,7 @@
+ //#include "zm_debug.h"
+ #include "zm_utils.h"
+ 
++#include <cstdio>
+ #include <stdarg.h>
+ 
+ const std::string stringtf( const char *format, ... )
diff --git a/www-misc/zoneminder/zoneminder-1.24.2.ebuild b/www-misc/zoneminder/zoneminder-1.24.2.ebuild
index 7a58b6dc23eb..5ad9e4188e96 100644
--- a/www-misc/zoneminder/zoneminder-1.24.2.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.24.2.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/www-misc/zoneminder/zoneminder-1.24.2.ebuild,v 1.2 2010/02/22 15:39:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.24.2.ebuild,v 1.3 2010/06/02 23:09:15 wired Exp $
 
 inherit eutils autotools depend.php depend.apache multilib
 
@@ -64,6 +64,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PATCH_PV}/zm_remote_camera_http.patch
 	epatch "${FILESDIR}"/${PATCH_PV}/db_upgrade_script_location.patch
 	epatch "${FILESDIR}"/${PATCH_PV}/zm_jpeg.patch
+	epatch "${FILESDIR}"/${PATCH_PV}/zm_build_fix.patch
 
 	eautoreconf
 }