fix building with gcc-4.3 by Peter Alfredsen, bug #219783

(Portage version: 2.1.5_rc6)

3 files changed, 74 insertions, 2 deletions

diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
index 5aebb6919bb1..ce7c6871c445 100644
--- a/media-gfx/hugin/ChangeLog
+++ b/media-gfx/hugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/hugin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.37 2008/03/16 00:39:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.38 2008/05/02 11:46:28 maekke Exp $
+
+  02 May 2008; Markus Meier <maekke@gentoo.org>
+  +files/hugin-0.6.1-gcc43.patch, hugin-0.6.1-r2.ebuild:
+  fix building with gcc-4.3 by Peter Alfredsen, bug #219783
 
   16 Mar 2008; Markus Meier <maekke@gentoo.org> hugin-0.6.1-r2.ebuild:
   zip dep is also needed in hugin-0.6
diff --git a/media-gfx/hugin/files/hugin-0.6.1-gcc43.patch b/media-gfx/hugin/files/hugin-0.6.1-gcc43.patch
new file mode 100644
index 000000000000..6888f5840395
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-0.6.1-gcc43.patch
@@ -0,0 +1,67 @@
+diff -NrU5 hugin-0.6.1.orig/src/common/utils.cpp hugin-0.6.1/src/common/utils.cpp
+--- hugin-0.6.1.orig/src/common/utils.cpp	2006-07-25 23:13:27.000000000 +0200
++++ hugin-0.6.1/src/common/utils.cpp	2008-04-30 00:40:03.000000000 +0200
+@@ -27,10 +27,11 @@
+ #else
+     #include <sys/time.h>
+ #endif
+ #include <time.h>
+ #include <stdio.h>
++#include <cstring>
+ #include "common/utils.h"
+ 
+ #ifdef unix
+ std::string utils::CurrentTime()
+ {
+diff -NrU5 hugin-0.6.1.orig/src/foreign/vigra/imageinfo.hxx hugin-0.6.1/src/foreign/vigra/imageinfo.hxx
+--- hugin-0.6.1.orig/src/foreign/vigra/imageinfo.hxx	2006-08-09 22:48:44.000000000 +0200
++++ hugin-0.6.1/src/foreign/vigra/imageinfo.hxx	2008-04-30 00:43:14.000000000 +0200
+@@ -50,10 +50,11 @@
+ #ifndef VIGRA_IMAGEINFO_HXX
+ #define VIGRA_IMAGEINFO_HXX
+ 
+ #include <memory>
+ #include <string>
++#include <cstring>
+ #include "vigra/utilities.hxx"
+ #include "vigra/codec.hxx"
+ 
+ namespace vigra
+ {
+diff -NrU5 hugin-0.6.1.orig/src/include/common/utils.h hugin-0.6.1/src/include/common/utils.h
+--- hugin-0.6.1.orig/src/include/common/utils.h	2006-01-09 16:33:16.000000000 +0100
++++ hugin-0.6.1/src/include/common/utils.h	2008-04-30 00:48:33.000000000 +0200
+@@ -22,11 +22,13 @@
+  */
+ 
+ #ifndef _UTILS_H
+ #define _UTILS_H
+ 
++#include <cstdlib>
+ #include <string>
++#include <cstring>
+ #include <vector>
+ #include <iostream>
+ #include <sstream>
+ #include <cassert>
+ 
+diff -NrU5 hugin-0.6.1.orig/src/tools/color_correct_tiff.cpp hugin-0.6.1/src/tools/color_correct_tiff.cpp
+--- hugin-0.6.1.orig/src/tools/color_correct_tiff.cpp	2006-01-11 14:07:37.000000000 +0100
++++ hugin-0.6.1/src/tools/color_correct_tiff.cpp	2008-04-30 00:58:54.000000000 +0200
+@@ -11,14 +11,15 @@
+  * -c do per-channel correction (different correction on each RGB channel)
+  * Images must be tiff, have the same size, have been aligned prior to correction
+  * and have some opaque overlapping parts (ie use nona with multiple tiff output).
+  */
+ 
++#include <cstdlib>
+ #include <iostream>
+ #include <sstream>
+ #include <exception>
+-#include <string>
++#include <cstring>
+ #include <vector>
+ #include <map>
+ #include <utility>
+ #include <cctype>
+ #include <cmath>
diff --git a/media-gfx/hugin/hugin-0.6.1-r2.ebuild b/media-gfx/hugin/hugin-0.6.1-r2.ebuild
index 801c5c621b59..d66366a256fa 100644
--- a/media-gfx/hugin/hugin-0.6.1-r2.ebuild
+++ b/media-gfx/hugin/hugin-0.6.1-r2.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-gfx/hugin/hugin-0.6.1-r2.ebuild,v 1.5 2008/03/16 00:39:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.6.1-r2.ebuild,v 1.6 2008/05/02 11:46:28 maekke Exp $
 
 inherit wxwidgets eutils autotools libtool
 
@@ -49,6 +49,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-1_0.6.1-1.1.patch"
 	epatch "${FILESDIR}/${P}-as-needed.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
 
 	AT_M4DIR="${S}/m4" eautoreconf
 }