Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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/inkscape/files: inkscape-0.46-gcc44.patch
Date: Mon, 20 Apr 2009 19:17:08
Message-Id: E1LvyzD-0002mF-2U@stork.gentoo.org
1 maekke 09/04/20 19:16:59
2
3 Added: inkscape-0.46-gcc44.patch
4 Log:
5 fix building with gcc-4.4 by Daniel J. in bug #265041
6 (Portage version: 2.2_rc30/cvs/Linux i686)
7
8 Revision Changes Path
9 1.1 media-gfx/inkscape/files/inkscape-0.46-gcc44.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/inkscape/files/inkscape-0.46-gcc44.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/inkscape/files/inkscape-0.46-gcc44.patch?rev=1.1&content-type=text/plain
13
14 Index: inkscape-0.46-gcc44.patch
15 ===================================================================
16 diff -Naur inkscape-0.46-orig/src/2geom/sbasis-math.cpp inkscape-0.46/src/2geom/sbasis-math.cpp
17 --- inkscape-0.46-orig/src/2geom/sbasis-math.cpp 2009-04-05 16:47:42.000000000 -0400
18 +++ inkscape-0.46/src/2geom/sbasis-math.cpp 2009-04-05 18:21:30.000000000 -0400
19 @@ -38,11 +38,11 @@
20 //#define ZERO 1e-3
21
22
23 -namespace Geom {
24 +#include <math.h>
25 +#include <cstdio>
26
27 +namespace Geom {
28
29 -#include <stdio.h>
30 -#include <math.h>
31
32 //-|x|-----------------------------------------------------------------------
33 Piecewise<SBasis> abs(SBasis const &f){
34 diff -Naur inkscape-0.46-orig/src/2geom/svg-path-parser.h inkscape-0.46/src/2geom/svg-path-parser.h
35 --- inkscape-0.46-orig/src/2geom/svg-path-parser.h 2009-04-05 16:47:42.000000000 -0400
36 +++ inkscape-0.46/src/2geom/svg-path-parser.h 2009-04-05 18:21:30.000000000 -0400
37 @@ -32,6 +32,7 @@
38 #ifndef SEEN_SVG_PATH_PARSER_H
39 #define SEEN_SVG_PATH_PARSER_H
40
41 +#include <cstdio>
42 #include <vector>
43 #include <iterator>
44 #include <stdexcept>
45 diff -Naur inkscape-0.46-orig/src/dom/domimpl.cpp inkscape-0.46/src/dom/domimpl.cpp
46 --- inkscape-0.46-orig/src/dom/domimpl.cpp 2009-04-05 16:47:42.000000000 -0400
47 +++ inkscape-0.46/src/dom/domimpl.cpp 2009-04-05 18:21:30.000000000 -0400
48 @@ -30,6 +30,8 @@
49
50 #include "domimpl.h"
51
52 +#include <cstdio>
53 +
54 namespace org
55 {
56 namespace w3c
57 diff -Naur inkscape-0.46-orig/src/dom/io/domstream.h inkscape-0.46/src/dom/io/domstream.h
58 --- inkscape-0.46-orig/src/dom/io/domstream.h 2009-04-05 16:47:42.000000000 -0400
59 +++ inkscape-0.46/src/dom/io/domstream.h 2009-04-05 18:21:30.000000000 -0400
60 @@ -33,6 +33,8 @@
61
62 #include <dom/dom.h>
63
64 +#include <cstdio>
65 +
66 namespace org
67 {
68 namespace w3c
69 diff -Naur inkscape-0.46-orig/src/dom/io/socket.h inkscape-0.46/src/dom/io/socket.h
70 --- inkscape-0.46-orig/src/dom/io/socket.h 2009-04-05 16:47:42.000000000 -0400
71 +++ inkscape-0.46/src/dom/io/socket.h 2009-04-05 18:34:14.000000000 -0400
72 @@ -29,6 +29,7 @@
73 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
74 */
75
76 +#include <cstdio>
77 #include "dom/dom.h"
78
79 #ifdef HAVE_SSL
80 diff -Naur inkscape-0.46-orig/src/dom/io/stringstream.h inkscape-0.46/src/dom/io/stringstream.h
81 --- inkscape-0.46-orig/src/dom/io/stringstream.h 2009-04-05 16:47:42.000000000 -0400
82 +++ inkscape-0.46/src/dom/io/stringstream.h 2009-04-05 18:22:50.000000000 -0400
83 @@ -29,7 +29,7 @@
84 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
85 */
86
87 -
88 +#include <cstdio>
89 #include "domstream.h"
90
91
92 diff -Naur inkscape-0.46-orig/src/dom/svg/svgtypes.h inkscape-0.46/src/dom/svg/svgtypes.h
93 --- inkscape-0.46-orig/src/dom/svg/svgtypes.h 2009-04-05 16:47:42.000000000 -0400
94 +++ inkscape-0.46/src/dom/svg/svgtypes.h 2009-04-05 18:21:30.000000000 -0400
95 @@ -47,6 +47,7 @@
96 #include "dom/smil.h"
97
98
99 +#include <cstdio>
100 #include <math.h>
101
102
103 diff -Naur inkscape-0.46-orig/src/dom/xpathtoken.h inkscape-0.46/src/dom/xpathtoken.h
104 --- inkscape-0.46-orig/src/dom/xpathtoken.h 2009-04-05 16:47:42.000000000 -0400
105 +++ inkscape-0.46/src/dom/xpathtoken.h 2009-04-05 18:21:30.000000000 -0400
106 @@ -35,6 +35,7 @@
107
108 #include <math.h>
109
110 +#include <cstdio>
111 #include <vector>
112
113 namespace org
114 diff -Naur inkscape-0.46-orig/src/io/inkscapestream.h inkscape-0.46/src/io/inkscapestream.h
115 --- inkscape-0.46-orig/src/io/inkscapestream.h 2009-04-05 16:47:42.000000000 -0400
116 +++ inkscape-0.46/src/io/inkscapestream.h 2009-04-05 18:21:30.000000000 -0400
117 @@ -12,6 +12,7 @@
118 */
119
120
121 +#include <cstdio>
122 #include <glibmm.h>
123
124 namespace Inkscape
125 diff -Naur inkscape-0.46-orig/src/io/sys.cpp inkscape-0.46/src/io/sys.cpp
126 --- inkscape-0.46-orig/src/io/sys.cpp 2009-04-05 16:47:42.000000000 -0400
127 +++ inkscape-0.46/src/io/sys.cpp 2009-04-05 18:21:30.000000000 -0400
128 @@ -22,6 +22,8 @@
129 #include <glibmm/ustring.h>
130 #include <gtk/gtkmessagedialog.h>
131
132 +#include <cstdio>
133 +
134 #include "prefs-utils.h"
135 #include "sys.h"
136
137 diff -Naur inkscape-0.46-orig/src/libavoid/vertices.h inkscape-0.46/src/libavoid/vertices.h
138 --- inkscape-0.46-orig/src/libavoid/vertices.h 2009-04-05 16:47:42.000000000 -0400
139 +++ inkscape-0.46/src/libavoid/vertices.h 2009-04-05 18:21:30.000000000 -0400
140 @@ -23,6 +23,7 @@
141 #ifndef AVOID_VERTICES_H
142 #define AVOID_VERTICES_H
143
144 +#include <cstdio>
145 #include <list>
146 #include <set>
147 #include <map>
148 diff -Naur inkscape-0.46-orig/src/libnr/nr-matrix-fns.cpp inkscape-0.46/src/libnr/nr-matrix-fns.cpp
149 --- inkscape-0.46-orig/src/libnr/nr-matrix-fns.cpp 2009-04-05 16:47:42.000000000 -0400
150 +++ inkscape-0.46/src/libnr/nr-matrix-fns.cpp 2009-04-05 18:21:30.000000000 -0400
151 @@ -1,5 +1,7 @@
152 #include <libnr/nr-matrix-fns.h>
153
154 +#include <cstdio>
155 +
156 namespace NR {
157
158 Matrix elliptic_quadratic_form(Matrix const &m) {
159 diff -Naur inkscape-0.46-orig/src/libnr/nr-matrix.cpp inkscape-0.46/src/libnr/nr-matrix.cpp
160 --- inkscape-0.46-orig/src/libnr/nr-matrix.cpp 2009-04-05 16:47:42.000000000 -0400
161 +++ inkscape-0.46/src/libnr/nr-matrix.cpp 2009-04-05 18:21:30.000000000 -0400
162 @@ -11,6 +11,7 @@
163 * This code is in public domain
164 */
165
166 +#include <cstdio>
167 #include <cstdlib>
168 #include "nr-matrix.h"
169
170 diff -Naur inkscape-0.46-orig/src/streams-handles.cpp inkscape-0.46/src/streams-handles.cpp
171 --- inkscape-0.46-orig/src/streams-handles.cpp 2009-04-05 16:47:42.000000000 -0400
172 +++ inkscape-0.46/src/streams-handles.cpp 2009-04-05 18:21:30.000000000 -0400
173 @@ -12,6 +12,7 @@
174 #include "streams-handles.h"
175 #include "uri.h"
176
177 +#include <cstdio>
178 #include <iostream>
179
180 namespace Inkscape {
181 diff -Naur inkscape-0.46-orig/src/streams-zlib.cpp inkscape-0.46/src/streams-zlib.cpp
182 --- inkscape-0.46-orig/src/streams-zlib.cpp 2009-04-05 16:47:42.000000000 -0400
183 +++ inkscape-0.46/src/streams-zlib.cpp 2009-04-05 18:21:30.000000000 -0400
184 @@ -9,6 +9,7 @@
185 * Released under GNU LGPL, read the file 'COPYING.LIB' for more information
186 */
187
188 +#include <cstdio>
189 #include <cstring>
190 #include <string>
191 #include <string.h>
192 diff -Naur inkscape-0.46-orig/src/xml/event.cpp inkscape-0.46/src/xml/event.cpp
193 --- inkscape-0.46-orig/src/xml/event.cpp 2009-04-05 16:47:42.000000000 -0400
194 +++ inkscape-0.46/src/xml/event.cpp 2009-04-05 18:21:30.000000000 -0400
195 @@ -14,6 +14,7 @@
196 */
197
198 #include <glib.h> // g_assert()
199 +#include <cstdio>
200
201 #include "event.h"
202 #include "event-fns.h"
Report Message
Find on MARC Find on Google Groups