]>
Commit | Line | Data |
---|---|---|
6d97482e | 1 | ## 06_gcc-4.4.dpatch by Wolfram Quester <wolfi@sigxcpu.org> |
2 | ## | |
3 | ## DP: Patch by Martin Michlmayr <tbm@cyrius.com> to make inkscape compile with | |
4 | ## DP: gcc 4.4. His bug report and description: | |
5 | ## DP: Your package fails to build with the upcoming GCC 4.4. Version 4.4 | |
6 | ## DP: has not been released yet but I'm building with a snapshot in order | |
7 | ## DP: to find errors and give people an advance warning. | |
8 | ## DP: | |
9 | ## DP: GCC 4.4 cleaned up some more C++ headers. You always have to #include | |
10 | ## DP: headers directly and cannot rely for things to be included indirectly. | |
11 | ## DP: | |
12 | ## DP: You can reproduce this problem with gcc-snapshot from unstable. | |
13 | ## DP: | |
14 | ## DP: > Automatic build of inkscape_0.46-3 on em64t by sbuild/amd64 0.53 | |
15 | ## DP: ... | |
16 | ## DP: > x86_64-linux-gnu-g++ -DHAVE_CONFIG_H -I. -I.. -I/usr/include/freetype2 -pthread -DORBIT2=1 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -DRELAYTOOL_CRYPTO='static const int libcrypto_is_present = 1; static int __attribute__((unused)) libcrypto_symbol_is_present(char *m) { return 1; }' -DRELAYTOOL_SSL='static const int libssl_is_present = 1; static int __attribute__((unused)) libssl_symbol_is_present(char *m) { return 1; }' -DHAVE_SSL -I/usr/include/libwpg-0.1 -I/usr/include/libwpd-0.8 -I/usr/include/freetype2 -I/usr/include/poppler -D_REENTRANT -I/usr/include/poppler/glib -I/usr/include/poppler -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1 -DPOTRACE=\"potrace\" -D_REENTRANT -pthread -I/usr/include/gdkmm-2.4 -I/usr/lib/gdkmm-2.4/include -I/usr/include/glibmm-2.4 -I/usr/lib/glibmm-2.4/include -I/usr/include/pangomm-1.4 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/cairomm-1.0 -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1 -I/usr/include/gtkmm-2.4 -I/usr/lib/gtkmm-2.4/include -I/usr/include/atkmm-1.6 -I/usr/include/atk-1.0 -I/usr/include/libxml2 -I/usr/include/gtkspell-2.0 -I../cxxtest -Wall -g -O2 -MT conn-avoid-ref.o -MD -MP -MF $depbase.Tpo -c -o conn-avoid-ref.o conn-avoid-ref.cpp &&\ | |
17 | ## DP: > mv -f $depbase.Tpo $depbase.Po | |
18 | ## DP: > In file included from ./libavoid/graph.h:30, | |
19 | ## DP: > from libavoid/router.h:30, | |
20 | ## DP: > from conn-avoid-ref.cpp:20: | |
21 | ## DP: > ./libavoid/vertices.h:60: error: 'stdout' was not declared in this scope | |
22 | ## DP: > ./libavoid/vertices.h: In member function 'void Avoid::VertInfList::stats()': | |
23 | ## DP: > ./libavoid/vertices.h:103: error: 'printf' was not declared in this scope | |
24 | ## DP: > make[3]: *** [conn-avoid-ref.o] Error 1 | |
25 | ## DP: > make[3]: Leaving directory `/build/tbm/inkscape-0.46/src' | |
26 | ||
27 | --- src/xml/event.cpp~ 2008-11-14 08:27:20.000000000 +0000 | |
28 | +++ inkscape-0.46/src/xml/event.cpp 2008-11-14 08:27:26.000000000 +0000 | |
29 | @@ -14,6 +14,7 @@ | |
30 | */ | |
31 | ||
32 | #include <glib.h> // g_assert() | |
33 | +#include <cstdio> | |
34 | ||
35 | #include "event.h" | |
36 | #include "event-fns.h" | |
37 | --- src/io/inkscapestream.h~ 2008-11-14 08:02:53.000000000 +0000 | |
38 | +++ inkscape-0.46/src/io/inkscapestream.h 2008-11-14 08:03:00.000000000 +0000 | |
39 | @@ -12,6 +12,7 @@ | |
40 | */ | |
41 | ||
42 | ||
43 | +#include <cstdio> | |
44 | #include <glibmm.h> | |
45 | ||
46 | namespace Inkscape | |
47 | --- src/io/sys.cpp~ 2008-11-14 08:04:54.000000000 +0000 | |
48 | +++ inkscape-0.46/src/io/sys.cpp 2008-11-14 08:05:11.000000000 +0000 | |
49 | @@ -22,6 +22,8 @@ | |
50 | #include <glibmm/ustring.h> | |
51 | #include <gtk/gtkmessagedialog.h> | |
52 | ||
53 | +#include <cstdio> | |
54 | + | |
55 | #include "prefs-utils.h" | |
56 | #include "sys.h" | |
57 | ||
58 | --- src/dom/io/domstream.h~ 2008-11-14 07:51:18.000000000 +0000 | |
59 | +++ inkscape-0.46/src/dom/io/domstream.h 2008-11-14 07:51:28.000000000 +0000 | |
60 | @@ -33,6 +33,8 @@ | |
61 | ||
62 | #include <dom/dom.h> | |
63 | ||
64 | +#include <cstdio> | |
65 | + | |
66 | namespace org | |
67 | { | |
68 | namespace w3c | |
69 | --- src/dom/svg/svgtypes.h~ 2008-11-14 07:53:23.000000000 +0000 | |
70 | +++ inkscape-0.46/src/dom/svg/svgtypes.h 2008-11-14 07:53:32.000000000 +0000 | |
71 | @@ -47,6 +47,7 @@ | |
72 | #include "dom/smil.h" | |
73 | ||
74 | ||
75 | +#include <cstdio> | |
76 | #include <math.h> | |
77 | ||
78 | ||
79 | --- src/dom/domimpl.cpp~ 2008-11-14 07:49:10.000000000 +0000 | |
80 | +++ inkscape-0.46/src/dom/domimpl.cpp 2008-11-14 07:49:18.000000000 +0000 | |
81 | @@ -30,6 +30,8 @@ | |
82 | ||
83 | #include "domimpl.h" | |
84 | ||
85 | +#include <cstdio> | |
86 | + | |
87 | namespace org | |
88 | { | |
89 | namespace w3c | |
90 | --- src/dom/xpathtoken.h~ 2008-11-14 07:52:27.000000000 +0000 | |
91 | +++ inkscape-0.46/src/dom/xpathtoken.h 2008-11-14 07:52:36.000000000 +0000 | |
92 | @@ -35,6 +35,7 @@ | |
93 | ||
94 | #include <math.h> | |
95 | ||
96 | +#include <cstdio> | |
97 | #include <vector> | |
98 | ||
99 | namespace org | |
100 | --- src/libavoid/vertices.h~ 2008-11-14 07:14:36.000000000 +0000 | |
101 | +++ inkscape-0.46/src/libavoid/vertices.h 2008-11-14 07:14:41.000000000 +0000 | |
102 | @@ -23,6 +23,7 @@ | |
103 | #ifndef AVOID_VERTICES_H | |
104 | #define AVOID_VERTICES_H | |
105 | ||
106 | +#include <cstdio> | |
107 | #include <list> | |
108 | #include <set> | |
109 | #include <map> | |
110 | --- src/libnr/nr-matrix-fns.cpp~ 2008-11-14 08:16:43.000000000 +0000 | |
111 | +++ inkscape-0.46/src/libnr/nr-matrix-fns.cpp 2008-11-14 08:16:48.000000000 +0000 | |
112 | @@ -1,5 +1,7 @@ | |
113 | #include <libnr/nr-matrix-fns.h> | |
114 | ||
115 | +#include <cstdio> | |
116 | + | |
117 | namespace NR { | |
118 | ||
119 | Matrix elliptic_quadratic_form(Matrix const &m) { | |
120 | --- src/libnr/nr-matrix.cpp~ 2008-11-14 08:19:20.000000000 +0000 | |
121 | +++ inkscape-0.46/src/libnr/nr-matrix.cpp 2008-11-14 08:19:26.000000000 +0000 | |
122 | @@ -11,6 +11,7 @@ | |
123 | * This code is in public domain | |
124 | */ | |
125 | ||
126 | +#include <cstdio> | |
127 | #include <cstdlib> | |
128 | #include "nr-matrix.h" | |
129 | ||
130 | --- src/2geom/svg-path-parser.h~ 2008-11-14 08:06:45.000000000 +0000 | |
131 | +++ inkscape-0.46/src/2geom/svg-path-parser.h 2008-11-14 08:06:51.000000000 +0000 | |
132 | @@ -32,6 +32,7 @@ | |
133 | #ifndef SEEN_SVG_PATH_PARSER_H | |
134 | #define SEEN_SVG_PATH_PARSER_H | |
135 | ||
136 | +#include <cstdio> | |
137 | #include <vector> | |
138 | #include <iterator> | |
139 | #include <stdexcept> | |
140 | --- src/2geom/sbasis-math.cpp~ 2008-11-14 08:29:42.000000000 +0000 | |
141 | +++ inkscape-0.46/src/2geom/sbasis-math.cpp 2008-11-14 08:31:32.000000000 +0000 | |
142 | @@ -38,11 +38,11 @@ | |
143 | //#define ZERO 1e-3 | |
144 | ||
145 | ||
146 | -namespace Geom { | |
147 | +#include <math.h> | |
148 | +#include <cstdio> | |
149 | ||
150 | +namespace Geom { | |
151 | ||
152 | -#include <stdio.h> | |
153 | -#include <math.h> | |
154 | ||
155 | //-|x|----------------------------------------------------------------------- | |
156 | Piecewise<SBasis> abs(SBasis const &f){ | |
157 | --- src/streams-handles.cpp~ 2008-11-14 07:41:07.000000000 +0000 | |
158 | +++ inkscape-0.46/src/streams-handles.cpp 2008-11-14 07:41:14.000000000 +0000 | |
159 | @@ -12,6 +12,7 @@ | |
160 | #include "streams-handles.h" | |
161 | #include "uri.h" | |
162 | ||
163 | +#include <cstdio> | |
164 | #include <iostream> | |
165 | ||
166 | namespace Inkscape { | |
167 | --- src/streams-zlib.cpp~ 2008-11-14 07:41:24.000000000 +0000 | |
168 | +++ inkscape-0.46/src/streams-zlib.cpp 2008-11-14 07:41:30.000000000 +0000 | |
169 | @@ -9,6 +9,7 @@ | |
170 | * Released under GNU LGPL, read the file 'COPYING.LIB' for more information | |
171 | */ | |
172 | ||
173 | +#include <cstdio> | |
174 | #include <cstring> | |
175 | #include <string> | |
176 | #include <string.h> | |
177 | --- src/dom/io/socket.cpp~ 2008-03-11 05:19:32.000000000 +0100 | |
178 | +++ inkscape-0.46/src/dom/io/socket.cpp 2009-05-26 12:09:45.000000000 +0200 | |
179 | @@ -57,6 +57,7 @@ | |
180 | RELAYTOOL_SSL | |
181 | #endif | |
182 | ||
183 | +#include <cstdio> | |
184 | ||
185 | namespace org | |
186 | { |