Gentoo Archives: gentoo-commits

From: "Markus Meier (maekke)" <maekke@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/hugin/files: hugin-0.6.1-gcc43.patch
Date: Fri, 02 May 2008 11:46:32
Message-Id: E1Jrtif-0002KD-E4@stork.gentoo.org
1 maekke 08/05/02 11:46:29
2
3 Added: hugin-0.6.1-gcc43.patch
4 Log:
5 fix building with gcc-4.3 by Peter Alfredsen, bug #219783
6 (Portage version: 2.1.5_rc6)
7
8 Revision Changes Path
9 1.1 media-gfx/hugin/files/hugin-0.6.1-gcc43.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/hugin/files/hugin-0.6.1-gcc43.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/hugin/files/hugin-0.6.1-gcc43.patch?rev=1.1&content-type=text/plain
13
14 Index: hugin-0.6.1-gcc43.patch
15 ===================================================================
16 diff -NrU5 hugin-0.6.1.orig/src/common/utils.cpp hugin-0.6.1/src/common/utils.cpp
17 --- hugin-0.6.1.orig/src/common/utils.cpp 2006-07-25 23:13:27.000000000 +0200
18 +++ hugin-0.6.1/src/common/utils.cpp 2008-04-30 00:40:03.000000000 +0200
19 @@ -27,10 +27,11 @@
20 #else
21 #include <sys/time.h>
22 #endif
23 #include <time.h>
24 #include <stdio.h>
25 +#include <cstring>
26 #include "common/utils.h"
27
28 #ifdef unix
29 std::string utils::CurrentTime()
30 {
31 diff -NrU5 hugin-0.6.1.orig/src/foreign/vigra/imageinfo.hxx hugin-0.6.1/src/foreign/vigra/imageinfo.hxx
32 --- hugin-0.6.1.orig/src/foreign/vigra/imageinfo.hxx 2006-08-09 22:48:44.000000000 +0200
33 +++ hugin-0.6.1/src/foreign/vigra/imageinfo.hxx 2008-04-30 00:43:14.000000000 +0200
34 @@ -50,10 +50,11 @@
35 #ifndef VIGRA_IMAGEINFO_HXX
36 #define VIGRA_IMAGEINFO_HXX
37
38 #include <memory>
39 #include <string>
40 +#include <cstring>
41 #include "vigra/utilities.hxx"
42 #include "vigra/codec.hxx"
43
44 namespace vigra
45 {
46 diff -NrU5 hugin-0.6.1.orig/src/include/common/utils.h hugin-0.6.1/src/include/common/utils.h
47 --- hugin-0.6.1.orig/src/include/common/utils.h 2006-01-09 16:33:16.000000000 +0100
48 +++ hugin-0.6.1/src/include/common/utils.h 2008-04-30 00:48:33.000000000 +0200
49 @@ -22,11 +22,13 @@
50 */
51
52 #ifndef _UTILS_H
53 #define _UTILS_H
54
55 +#include <cstdlib>
56 #include <string>
57 +#include <cstring>
58 #include <vector>
59 #include <iostream>
60 #include <sstream>
61 #include <cassert>
62
63 diff -NrU5 hugin-0.6.1.orig/src/tools/color_correct_tiff.cpp hugin-0.6.1/src/tools/color_correct_tiff.cpp
64 --- hugin-0.6.1.orig/src/tools/color_correct_tiff.cpp 2006-01-11 14:07:37.000000000 +0100
65 +++ hugin-0.6.1/src/tools/color_correct_tiff.cpp 2008-04-30 00:58:54.000000000 +0200
66 @@ -11,14 +11,15 @@
67 * -c do per-channel correction (different correction on each RGB channel)
68 * Images must be tiff, have the same size, have been aligned prior to correction
69 * and have some opaque overlapping parts (ie use nona with multiple tiff output).
70 */
71
72 +#include <cstdlib>
73 #include <iostream>
74 #include <sstream>
75 #include <exception>
76 -#include <string>
77 +#include <cstring>
78 #include <vector>
79 #include <map>
80 #include <utility>
81 #include <cctype>
82 #include <cmath>
83
84
85
86 --
87 gentoo-commits@l.g.o mailing list