fix building with gcc-4.4 by David Watzke, bug #270593

(Portage version: 2.2_rc33/cvs/Linux i686)

4 files changed, 44 insertions, 8 deletions

diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
index 88d01a191eb9..ca96526f4d5e 100644
--- a/media-gfx/hugin/ChangeLog
+++ b/media-gfx/hugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/hugin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.61 2009/05/07 20:56:18 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.62 2009/05/24 10:07:59 maekke Exp $
+
+  24 May 2009; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild,
+  hugin-0.7.0-r1.ebuild, +files/hugin-0.7.0-gcc44.patch:
+  fix building with gcc-4.4 by David Watzke, bug #270593
 
 *hugin-0.8.0_rc1 (07 May 2009)
 
diff --git a/media-gfx/hugin/files/hugin-0.7.0-gcc44.patch b/media-gfx/hugin/files/hugin-0.7.0-gcc44.patch
new file mode 100644
index 000000000000..3409c2ecadcc
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-0.7.0-gcc44.patch
@@ -0,0 +1,31 @@
+--- src/hugin_base/appbase/ProgressDisplayOld.h~	2009-05-20 17:37:43.003423691 +0200
++++ src/hugin_base/appbase/ProgressDisplayOld.h	2009-05-20 17:38:01.960420437 +0200
+@@ -26,6 +26,7 @@
+ #ifndef _APPBASE_POGRESSDISPLAYOLD_H
+ #define _APPBASE_POGRESSDISPLAYOLD_H
+ 
++#include <cstdio>
+ #include <string>
+ #include <vector>
+ #include <iostream>
+--- src/hugin_base/hugin_utils/utils.cpp~	2009-05-20 17:40:01.592423706 +0200
++++ src/hugin_base/hugin_utils/utils.cpp	2009-05-20 17:40:09.448420660 +0200
+@@ -171,7 +171,7 @@
+     if (digits < 0) {
+         strcpy(fmt,"%f");
+     } else {
+-        std::sprintf(fmt,"%%.%df",digits);
++        sprintf(fmt,"%%.%df",digits);
+     }
+     char c[1024];
+     c[1023] = 0;
+--- src/hugin_base/panodata/PTScriptParsing.h~	2009-05-20 17:45:42.491422105 +0200
++++ src/hugin_base/panodata/PTScriptParsing.h	2009-05-20 17:45:56.836420882 +0200
+@@ -25,6 +25,7 @@
+ #ifndef _PANODATA_PTSCRIPTPARSING_H
+ #define _PANODATA_PTSCRIPTPARSING_H
+ 
++#include <cstdio>
+ #include <string>
+ #include <vigra/diff2d.hxx>
+ 
diff --git a/media-gfx/hugin/hugin-0.7.0-r1.ebuild b/media-gfx/hugin/hugin-0.7.0-r1.ebuild
index cd1d1f4fae34..45f8317d713d 100644
--- a/media-gfx/hugin/hugin-0.7.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-0.7.0-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.7.0-r1.ebuild,v 1.5 2009/03/19 19:11:48 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.7.0-r1.ebuild,v 1.6 2009/05/24 10:07:59 maekke Exp $
 
 EAPI="2"
 WX_GTK_VER="2.8"
 
-inherit cmake-utils eutils wxwidgets
+inherit cmake-utils wxwidgets
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
@@ -31,7 +31,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 DOCS="AUTHORS README TODO"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.0_rc2-as-needed.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.0_rc2-as-needed.patch
+	"${FILESDIR}"/${P}-gcc44.patch
+)
diff --git a/media-gfx/hugin/hugin-0.7.0.ebuild b/media-gfx/hugin/hugin-0.7.0.ebuild
index 7a9773145075..10720d6e9810 100644
--- a/media-gfx/hugin/hugin-0.7.0.ebuild
+++ b/media-gfx/hugin/hugin-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.7.0.ebuild,v 1.7 2009/03/19 19:11:48 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.7.0.ebuild,v 1.8 2009/05/24 10:07:59 maekke Exp $
 
 EAPI="1"
 WX_GTK_VER="2.8"
@@ -46,4 +46,5 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-0.7.0_rc2-as-needed.patch
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 }