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

Package-Manager: portage-2.2_rc33/cvs/Linux i686

5 files changed, 51 insertions, 14 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/Manifest b/media-gfx/hugin/Manifest
index 856c6b835f88..e8026d132d5e 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX hugin-0.7.0-gcc44.patch 1037 RMD160 3c5d67abfd507199db909de33368f487cea47c4f SHA1 1d2091be6006bb088b20f7e3aa119521b47cab32 SHA256 622513fc0280498006c3978a06cadced9085a3adadc0720b33cbbafc62d7575c
 AUX hugin-0.7.0_rc2-as-needed.patch 1522 RMD160 fe9cad07ed8426d8b435ab5ef1f06a2b689cb544 SHA1 961d26b6000da8e297620acb759f6495183cb031 SHA256 f7f8d8f177f5edf8654f1769bc51155ccc5e2bd5b8ab6664f265eff9b6588077
 AUX hugin-0.8.0_beta1-as-needed.patch 2077 RMD160 ebcf7007101213055b1b28d1cf5e317cca2ceb47 SHA1 0415a41ea5fef56610ffcfa627f4f05c8ccb7f95 SHA256 51ae48fcf577b6f421c3a43e033fedb24b9f1f94433ddb8b8103c188a6d657ad
 DIST hugin-0.7.0.tar.gz 6074207 RMD160 a64875d9b86dbc54b3959fdb54fbd77b5a16a119 SHA1 6452ddc4e4d7a67b8e84d0a52a9c536664a62abf SHA256 8e31fad113d60881c229d0eaf9c9971cbc0082a7148014b6980f3f92fedf7959
@@ -9,19 +10,19 @@ DIST hugin-0.8.0_beta2.tar.gz 11694265 RMD160 fea939c0c4301f905fc22eeaf52db589ef
 DIST hugin-0.8.0_beta3.tar.gz 11391090 RMD160 5d6b8eb65df7a3cb18ebe6a04e0cd3f60bed6ebd SHA1 be0903c9c5b218f1f50e1ea654d66e80f89cff30 SHA256 b54060c57daaf1bfad3f499f99c893dfb99f8e45934da71b40f5d0cd6150bc28
 DIST hugin-0.8.0_beta4.tar.gz 11987882 RMD160 7c78e8d6a2934143b1248d5a1a04d1143788891a SHA1 21fcd6f444bbcdb11a7e49edce7eec7150f98b30 SHA256 77c0bd09180d97d1c3280324a09876b2b0b7763c73fcd719ec1bb86d8caee0b6
 DIST hugin-0.8.0_rc1.tar.gz 11982423 RMD160 d901c0353fc6e44ca0a408ca30bc21ba77b31e73 SHA1 df0e871363c5e732e9d917ba096dca1400aa0f64 SHA256 f80d549f81c0b5051c95afe123e935c81919dad1be78e6096a8e5949b2fded9d
-EBUILD hugin-0.7.0-r1.ebuild 930 RMD160 14c4a7c2f21d9b192f54c016c2136c81a14c85f9 SHA1 9bcfa2aaa105875f169ec0157c2d3fd0f8398859 SHA256 34e60f24c0fb1b41c2e0b33a3c612f6864765721e7f2ecca81bdc77214479ad1
-EBUILD hugin-0.7.0.ebuild 1127 RMD160 449d484339f20274a55faa1a8fe5b775a0cb0e1a SHA1 c9787f54be1f9a9fedf2358f4587381714e890f1 SHA256 f9a59da874af9bf7e1f287977bc41f1030e9c9edf7c85e5b42e9166f317fa9a6
+EBUILD hugin-0.7.0-r1.ebuild 941 RMD160 38ff169cc7b2efc6056ccca4f7fd15b929b12ec9 SHA1 0899add5f32c03b9b756336f237a07d930e6e918 SHA256 4f494f445fbd1dd51dfd1ba5349bfddcbc14d42defa7dccb1b5e888575010efa
+EBUILD hugin-0.7.0.ebuild 1166 RMD160 32e4dbf6a0eb7ef999df3fb70b3ac2d2213d3ae2 SHA1 e554a8f95ba9bfd1421a0fb4043e984023598afa SHA256 063f03bad0f7bc806c1551ad8551331690a7a9ad0f2d7de4a80e3604197a8be2
 EBUILD hugin-0.8.0_beta1.ebuild 990 RMD160 a216eaebef839724b20c8699afba75fec9849eb4 SHA1 e2243e178f6487797d658cbdd9f9b7e8e44f29a0 SHA256 75f02254887942120b38140c6ed8595b83a3ab788afe6cff91fd9c0d14e67e22
 EBUILD hugin-0.8.0_beta2.ebuild 1280 RMD160 5c9b062067658542526dc762afb8177d58a14925 SHA1 e233afbd37b6b2504f0517e0ab4f3b53a841389f SHA256 fe9a92dc8b05e7f6850d20fbe4f29f14f973bf8aab1d10b4b9ffa2b42ed06e18
 EBUILD hugin-0.8.0_beta3.ebuild 1330 RMD160 b7a6c9df3e24f399b2400270db1a18cace69fa4e SHA1 ec82fd212b7b329ebee60a92b24f99213bfe4273 SHA256 ccad79baecf9a11c3336d8edb5acbe2d70c9dde742fa7e36632b4dec95a9362d
 EBUILD hugin-0.8.0_beta4.ebuild 1330 RMD160 0e6ccbcadaef2a8ddfe0db53b92b7a051127f79f SHA1 20e446ae54390f80b99b9f7815a16d7c790394dd SHA256 d6f43f41025aa3b2e4b5fba43d48db06742ba447eba4d81513926dc49a9b18e0
 EBUILD hugin-0.8.0_rc1.ebuild 1328 RMD160 7f7c21b9891d112da06c8c6878d73810cf9a61ff SHA1 0b5f7ea4b60bea9312bd5302649d269a0b9c6856 SHA256 dd38f8c529650347aa24539d378a1f2db646fc95aeb0885179c829641ce096a2
-MISC ChangeLog 10123 RMD160 79ce7425ab72bf45d73428884d968229052b35ab SHA1 74b4a5890cc40ab70f5a9a307c2fd663bceb32c5 SHA256 dffc3ac62d9594d981fba78d45ae44b73c464461055186d1d276ae3c6a568f88
+MISC ChangeLog 10306 RMD160 e14d3b920421f0637dd98afdb4f22c59d0291aef SHA1 e703e0747a0c33db43517db962216f01ba6f5b9e SHA256 25d69ba6c79a6334e65fc068d58d0d978f1c05f8c559a757dbd07a0fce07a258
 MISC metadata.xml 389 RMD160 245f5d872a463181d63366d6c76a82c87d020fd7 SHA1 a26b77c69d62bedb9789e79b5ca35f28fa56981d SHA256 6f26cd9c2b64a96c1c86a8a468a261af4cf4dfaa86b4d7ddcfaee1ca98314803
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoDS1UACgkQkKaRLQcq0GKuggCfZNQOae7OFZdio2MA7OEqzwiY
-WOEAmQEX21C3H1rSdqqi0inbPpJ1DnFf
-=LgV8
+iEYEARECAAYFAkoZHN4ACgkQkKaRLQcq0GKn4wCeKE6EZFAFu9grwPEDyFYs8sbI
+HH8AoKoPq9/AjEz27qJxUEFDBkNfpj88
+=hixV
 -----END PGP SIGNATURE-----
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
 }