diff --git a/inkscape-0.45.1-gcc43.patch b/inkscape-0.45.1-gcc43.patch deleted file mode 100644 index 431cd65..0000000 --- a/inkscape-0.45.1-gcc43.patch +++ /dev/null @@ -1,1716 +0,0 @@ -diff -Naur inkscape-0.45.1/src/#arc.txt# inkscape-0.45.1-mp/src/#arc.txt# ---- inkscape-0.45.1/src/#arc.txt# 1970-01-01 01:00:00.000000000 +0100 -+++ inkscape-0.45.1-mp/src/#arc.txt# 2007-11-10 10:13:21.000000000 +0100 -@@ -0,0 +1,7 @@ -+streq.h: return std::strcmp(a, b) == 0; -+style.cpp: && (!base->set || strcmp(val->value, base->value)))) -+text-chemistry.cpp: if (!strcmp(copy->name(), "svg:tspan")) { -+text-editing.cpp: if ((this_attr == NULL || strcmp(attrs->value, this_attr)) && this_node_attrs->attribute(key) == NULL) -+tools-switch.cpp: return (!strcmp(dt->event_context->prefs_repr->attribute("id"), tool_ids[num])); -+uri-references.cpp: if ( len < 3 || strcmp(id+len-2, "))") ) { -+verbs.h: return strcmp(s1, s2) < 0; -diff -Naur inkscape-0.45.1/src/color-profile.cpp inkscape-0.45.1-mp/src/color-profile.cpp ---- inkscape-0.45.1/src/color-profile.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/color-profile.cpp 2007-11-10 09:45:40.000000000 +0100 -@@ -1,5 +1,6 @@ - -- -+#include -+#include - #include "xml/repr.h" - #include "color-profile.h" - #include "color-profile-fns.h" -diff -Naur inkscape-0.45.1/src/composite-undo-stack-observer.cpp inkscape-0.45.1-mp/src/composite-undo-stack-observer.cpp ---- inkscape-0.45.1/src/composite-undo-stack-observer.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/composite-undo-stack-observer.cpp 2007-11-10 11:12:40.000000000 +0100 -@@ -12,6 +12,7 @@ - */ - - -+#include - #include "composite-undo-stack-observer.h" - #include "xml/event.h" - -diff -Naur inkscape-0.45.1/src/conn-avoid-ref.cpp inkscape-0.45.1-mp/src/conn-avoid-ref.cpp ---- inkscape-0.45.1/src/conn-avoid-ref.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/conn-avoid-ref.cpp 2007-11-10 09:46:10.000000000 +0100 -@@ -10,7 +10,8 @@ - */ - - -- -+#include -+#include - #include "sp-item.h" - #include "conn-avoid-ref.h" - #include "libnr/nr-rect-ops.h" -diff -Naur inkscape-0.45.1/src/connector-context.cpp inkscape-0.45.1-mp/src/connector-context.cpp ---- inkscape-0.45.1/src/connector-context.cpp 2007-02-03 14:24:35.000000000 +0100 -+++ inkscape-0.45.1-mp/src/connector-context.cpp 2007-11-10 09:46:36.000000000 +0100 -@@ -42,6 +42,8 @@ - */ - - #include -+#include -+#include - - #include "connector-context.h" - #include "pixmaps/cursor-connector.xpm" -diff -Naur inkscape-0.45.1/src/desktop-style.cpp inkscape-0.45.1-mp/src/desktop-style.cpp ---- inkscape-0.45.1/src/desktop-style.cpp 2007-03-17 00:26:16.000000000 +0100 -+++ inkscape-0.45.1-mp/src/desktop-style.cpp 2007-11-10 09:47:04.000000000 +0100 -@@ -12,6 +12,8 @@ - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -+#include -+#include - #include "desktop.h" - #include "color-rgba.h" - #include "svg/css-ostringstream.h" -diff -Naur inkscape-0.45.1/src/dialogs/object-attributes.cpp inkscape-0.45.1-mp/src/dialogs/object-attributes.cpp ---- inkscape-0.45.1/src/dialogs/object-attributes.cpp 2007-01-16 03:45:42.000000000 +0100 -+++ inkscape-0.45.1-mp/src/dialogs/object-attributes.cpp 2007-11-09 00:08:56.000000000 +0100 -@@ -25,6 +25,9 @@ - #include - #include - -+#include -+#include -+ - struct SPAttrDesc { - gchar const *label; - gchar const *attribute; -diff -Naur inkscape-0.45.1/src/dialogs/unclump.cpp inkscape-0.45.1-mp/src/dialogs/unclump.cpp ---- inkscape-0.45.1/src/dialogs/unclump.cpp 2007-01-16 03:45:42.000000000 +0100 -+++ inkscape-0.45.1-mp/src/dialogs/unclump.cpp 2007-11-10 11:07:31.000000000 +0100 -@@ -11,6 +11,7 @@ - */ - - -+#include - #include - #include "libnr/nr-matrix-ops.h" - #include "sp-item.h" -diff -Naur inkscape-0.45.1/src/dir-util.cpp inkscape-0.45.1-mp/src/dir-util.cpp ---- inkscape-0.45.1/src/dir-util.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/dir-util.cpp 2007-11-10 09:47:48.000000000 +0100 -@@ -3,7 +3,8 @@ - #define DIR_UTIL_C - - #include --#include -+#include -+#include - #include - #include - #include -diff -Naur inkscape-0.45.1/src/display/curve.cpp inkscape-0.45.1-mp/src/display/curve.cpp ---- inkscape-0.45.1/src/display/curve.cpp 2007-01-16 03:45:15.000000000 +0100 -+++ inkscape-0.45.1-mp/src/display/curve.cpp 2007-11-09 01:21:18.000000000 +0100 -@@ -21,6 +21,8 @@ - #include - #include - #include -+#include -+#include - - #define SP_CURVE_LENSTEP 32 - -diff -Naur inkscape-0.45.1/src/display/nr-arena-item.cpp inkscape-0.45.1-mp/src/display/nr-arena-item.cpp ---- inkscape-0.45.1/src/display/nr-arena-item.cpp 2007-02-04 19:43:09.000000000 +0100 -+++ inkscape-0.45.1-mp/src/display/nr-arena-item.cpp 2007-11-09 01:05:08.000000000 +0100 -@@ -15,6 +15,8 @@ - #define noNR_ARENA_ITEM_VERBOSE - #define noNR_ARENA_ITEM_DEBUG_CASCADE - -+#include -+#include - - #include - #include -diff -Naur inkscape-0.45.1/src/display/nr-filter.cpp inkscape-0.45.1-mp/src/display/nr-filter.cpp ---- inkscape-0.45.1/src/display/nr-filter.cpp 2007-02-04 19:43:09.000000000 +0100 -+++ inkscape-0.45.1-mp/src/display/nr-filter.cpp 2007-11-09 01:47:22.000000000 +0100 -@@ -13,6 +13,8 @@ - - #include - #include -+#include -+#include - - #include "display/nr-filter.h" - #include "display/nr-filter-primitive.h" -diff -Naur inkscape-0.45.1/src/display/nr-filter-gaussian.cpp inkscape-0.45.1-mp/src/display/nr-filter-gaussian.cpp ---- inkscape-0.45.1/src/display/nr-filter-gaussian.cpp 2007-02-04 19:43:09.000000000 +0100 -+++ inkscape-0.45.1-mp/src/display/nr-filter-gaussian.cpp 2007-11-09 03:06:06.000000000 +0100 -@@ -15,6 +15,7 @@ - - #include - #include -+#include - - using std::isnormal; - -diff -Naur inkscape-0.45.1/src/document.cpp inkscape-0.45.1-mp/src/document.cpp ---- inkscape-0.45.1/src/document.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/document.cpp 2007-11-10 09:49:09.000000000 +0100 -@@ -38,6 +38,8 @@ - # include "config.h" - #endif - #include -+#include -+#include - #include "application/application.h" - #include "application/editor.h" - #include "libnr/nr-matrix-fns.h" -diff -Naur inkscape-0.45.1/src/document-undo.cpp inkscape-0.45.1-mp/src/document-undo.cpp ---- inkscape-0.45.1/src/document-undo.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/document-undo.cpp 2007-11-10 09:49:46.000000000 +0100 -@@ -57,6 +57,8 @@ - #if HAVE_STDLIB_H - #endif - -+#include -+#include - #include "xml/repr.h" - #include "document-private.h" - #include "inkscape.h" -diff -Naur inkscape-0.45.1/src/dyna-draw-context.cpp inkscape-0.45.1-mp/src/dyna-draw-context.cpp ---- inkscape-0.45.1/src/dyna-draw-context.cpp 2007-02-04 01:29:44.000000000 +0100 -+++ inkscape-0.45.1-mp/src/dyna-draw-context.cpp 2007-11-10 09:50:11.000000000 +0100 -@@ -28,6 +28,8 @@ - #include - #include - #include -+#include -+#include - - #include "svg/svg.h" - #include "display/canvas-bpath.h" -diff -Naur inkscape-0.45.1/src/event-context.cpp inkscape-0.45.1-mp/src/event-context.cpp ---- inkscape-0.45.1/src/event-context.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/event-context.cpp 2007-11-10 09:50:43.000000000 +0100 -@@ -30,6 +30,8 @@ - #include - #include - #include -+#include -+#include - - #include "display/sp-canvas.h" - #include "xml/node-event-vector.h" -diff -Naur inkscape-0.45.1/src/extension/internal/libwpg/WPGOLEStream.cpp inkscape-0.45.1-mp/src/extension/internal/libwpg/WPGOLEStream.cpp ---- inkscape-0.45.1/src/extension/internal/libwpg/WPGOLEStream.cpp 2007-01-16 03:45:20.000000000 +0100 -+++ inkscape-0.45.1-mp/src/extension/internal/libwpg/WPGOLEStream.cpp 2007-11-09 03:26:31.000000000 +0100 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #include "WPGOLEStream.h" - #include "libwpg_utils.h" -diff -Naur inkscape-0.45.1/src/gc.cpp inkscape-0.45.1-mp/src/gc.cpp ---- inkscape-0.45.1/src/gc.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/gc.cpp 2007-11-10 09:41:08.000000000 +0100 -@@ -11,6 +11,8 @@ - - #include "gc-core.h" - #include -+#include -+#include - #include - #include - #include -diff -Naur inkscape-0.45.1/src/gradient-drag.cpp inkscape-0.45.1-mp/src/gradient-drag.cpp ---- inkscape-0.45.1/src/gradient-drag.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/gradient-drag.cpp 2007-11-10 09:51:26.000000000 +0100 -@@ -16,6 +16,8 @@ - #endif - - #include -+#include -+#include - - #include "desktop-handles.h" - #include "selection.h" -diff -Naur inkscape-0.45.1/src/graphlayout/graphlayout.cpp inkscape-0.45.1-mp/src/graphlayout/graphlayout.cpp ---- inkscape-0.45.1/src/graphlayout/graphlayout.cpp 2007-02-03 14:24:01.000000000 +0100 -+++ inkscape-0.45.1-mp/src/graphlayout/graphlayout.cpp 2007-11-10 05:24:41.000000000 +0100 -@@ -10,6 +10,8 @@ - * Released under GNU GPL. Read the file 'COPYING' for more information. - */ - #include -+#include -+#include - #include - #include - #include -diff -Naur inkscape-0.45.1/src/inkjar/jar.cpp inkscape-0.45.1-mp/src/inkjar/jar.cpp ---- inkscape-0.45.1/src/inkjar/jar.cpp 2007-01-16 03:46:06.000000000 +0100 -+++ inkscape-0.45.1-mp/src/inkjar/jar.cpp 2007-11-09 22:51:00.000000000 +0100 -@@ -42,7 +42,9 @@ - #include - //#endif - -- -+#include -+#include -+#include - #include - - #include "jar.h" -diff -Naur inkscape-0.45.1/src/inkscape.cpp inkscape-0.45.1-mp/src/inkscape.cpp ---- inkscape-0.45.1/src/inkscape.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/inkscape.cpp 2007-11-10 09:51:59.000000000 +0100 -@@ -42,6 +42,8 @@ - #include - - #include -+#include -+#include - #include "helper/sp-marshal.h" - #include "dialogs/debugdialog.h" - #include "application/application.h" -diff -Naur inkscape-0.45.1/src/interface.cpp inkscape-0.45.1-mp/src/interface.cpp ---- inkscape-0.45.1/src/interface.cpp 2007-03-13 19:06:22.000000000 +0100 -+++ inkscape-0.45.1-mp/src/interface.cpp 2007-11-10 09:52:24.000000000 +0100 -@@ -20,6 +20,8 @@ - #endif - - #include -+#include -+#include - #include "inkscape-private.h" - #include "extension/effect.h" - #include "widgets/icon.h" -diff -Naur inkscape-0.45.1/src/io/gzipstream.cpp inkscape-0.45.1-mp/src/io/gzipstream.cpp ---- inkscape-0.45.1/src/io/gzipstream.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/io/gzipstream.cpp 2007-11-09 18:19:08.000000000 +0100 -@@ -14,7 +14,8 @@ - */ - - #include "gzipstream.h" -- -+#include -+#include - - namespace Inkscape - { -diff -Naur inkscape-0.45.1/src/io/simple-sax.cpp inkscape-0.45.1-mp/src/io/simple-sax.cpp ---- inkscape-0.45.1/src/io/simple-sax.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/io/simple-sax.cpp 2007-11-09 19:09:53.000000000 +0100 -@@ -9,7 +9,8 @@ - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -- -+#include -+#include - #include "simple-sax.h" - - namespace Inkscape { -diff -Naur inkscape-0.45.1/src/io/uristream.cpp inkscape-0.45.1-mp/src/io/uristream.cpp ---- inkscape-0.45.1/src/io/uristream.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/io/uristream.cpp 2007-11-09 20:15:32.000000000 +0100 -@@ -13,6 +13,8 @@ - - #include "uristream.h" - #include "sys.h" -+#include -+#include - - #ifdef WIN32 - // For now to get at is_os_wide(). -diff -Naur inkscape-0.45.1/src/libavoid/connector.cpp inkscape-0.45.1-mp/src/libavoid/connector.cpp ---- inkscape-0.45.1/src/libavoid/connector.cpp 2007-01-16 03:45:49.000000000 +0100 -+++ inkscape-0.45.1-mp/src/libavoid/connector.cpp 2007-11-10 01:02:12.000000000 +0100 -@@ -20,6 +20,7 @@ - * - */ - -+#include - #include "libavoid/graph.h" - #include "libavoid/connector.h" - #include "libavoid/makepath.h" -diff -Naur inkscape-0.45.1/src/libavoid/makepath.cpp inkscape-0.45.1-mp/src/libavoid/makepath.cpp ---- inkscape-0.45.1/src/libavoid/makepath.cpp 2007-01-16 03:45:49.000000000 +0100 -+++ inkscape-0.45.1-mp/src/libavoid/makepath.cpp 2007-11-10 11:10:43.000000000 +0100 -@@ -33,6 +33,8 @@ - #include "libavoid/router.h" - #include - #include -+#include -+#include - - namespace Avoid { - -diff -Naur inkscape-0.45.1/src/libavoid/router.cpp inkscape-0.45.1-mp/src/libavoid/router.cpp ---- inkscape-0.45.1/src/libavoid/router.cpp 2007-01-16 03:45:49.000000000 +0100 -+++ inkscape-0.45.1-mp/src/libavoid/router.cpp 2007-11-10 02:03:16.000000000 +0100 -@@ -20,6 +20,7 @@ - * - */ - -+#include - #include "libavoid/shape.h" - #include "libavoid/router.h" - #include "libavoid/visibility.h" -@@ -619,7 +620,7 @@ - if (((int) r_p2.y) != 0) - { - printf("r_p2.y: %f != 0\n", r_p2.y); -- abort(); -+ std::abort(); - } - // This might be slightly off. - r_p2.y = 0; -diff -Naur inkscape-0.45.1/src/libavoid/visibility.cpp inkscape-0.45.1-mp/src/libavoid/visibility.cpp ---- inkscape-0.45.1/src/libavoid/visibility.cpp 2007-01-16 03:45:49.000000000 +0100 -+++ inkscape-0.45.1-mp/src/libavoid/visibility.cpp 2007-11-10 11:11:12.000000000 +0100 -@@ -21,6 +21,7 @@ - */ - - -+#include - #include - - #include "libavoid/shape.h" -diff -Naur inkscape-0.45.1/src/libcola/straightener.cpp inkscape-0.45.1-mp/src/libcola/straightener.cpp ---- inkscape-0.45.1/src/libcola/straightener.cpp 2007-01-16 03:45:34.000000000 +0100 -+++ inkscape-0.45.1-mp/src/libcola/straightener.cpp 2007-11-10 03:41:35.000000000 +0100 -@@ -20,6 +20,7 @@ - #include "straightener.h" - #include - #include -+#include - - using std::set; - using std::vector; -diff -Naur inkscape-0.45.1/src/libnr/n-art-bpath.h inkscape-0.45.1-mp/src/libnr/n-art-bpath.h ---- inkscape-0.45.1/src/libnr/n-art-bpath.h 2007-01-16 03:46:04.000000000 +0100 -+++ inkscape-0.45.1-mp/src/libnr/n-art-bpath.h 2007-11-08 21:00:40.000000000 +0100 -@@ -7,6 +7,7 @@ - - #include "libnr/nr-point.h" - #include "libnr/nr-path-code.h" -+#include - - /** - * Old-style path segment. -@@ -29,7 +30,7 @@ - case 1: return NR::Point(x1, y1); - case 2: return NR::Point(x2, y2); - case 3: return NR::Point(x3, y3); -- default: abort(); -+ default: std::abort(); - } - } - -@@ -41,7 +42,7 @@ - case 1: x1 = p[X]; y1 = p[Y]; break; - case 2: x2 = p[X]; y2 = p[Y]; break; - case 3: x3 = p[X]; y3 = p[Y]; break; -- default: abort(); -+ default: std::abort(); - } - } - }; -diff -Naur inkscape-0.45.1/src/libnr/nr-matrix.cpp inkscape-0.45.1-mp/src/libnr/nr-matrix.cpp ---- inkscape-0.45.1/src/libnr/nr-matrix.cpp 2007-01-16 03:46:04.000000000 +0100 -+++ inkscape-0.45.1-mp/src/libnr/nr-matrix.cpp 2007-11-09 23:20:19.000000000 +0100 -@@ -11,6 +11,7 @@ - * This code is in public domain - */ - -+#include - #include "nr-matrix.h" - - -@@ -605,7 +606,7 @@ - a[0], a[1], b[0], b[1], - a[2], a[3], b[2], b[3], - a[4], a[5], b[4], b[5]); -- abort(); -+ std::abort(); - } - } - -diff -Naur inkscape-0.45.1/src/libnr/nr-pixblock.cpp inkscape-0.45.1-mp/src/libnr/nr-pixblock.cpp ---- inkscape-0.45.1/src/libnr/nr-pixblock.cpp 2007-01-16 03:46:04.000000000 +0100 -+++ inkscape-0.45.1-mp/src/libnr/nr-pixblock.cpp 2007-11-10 00:20:38.000000000 +0100 -@@ -9,6 +9,9 @@ - * This code is in the Public Domain - */ - -+#include -+#include -+#include - #include - #include "nr-pixblock.h" - -diff -Naur inkscape-0.45.1/src/libnr/nr-pixops.h inkscape-0.45.1-mp/src/libnr/nr-pixops.h ---- inkscape-0.45.1/src/libnr/nr-pixops.h 2007-01-16 03:46:04.000000000 +0100 -+++ inkscape-0.45.1-mp/src/libnr/nr-pixops.h 2007-11-08 19:07:23.000000000 +0100 -@@ -19,8 +19,8 @@ - // FAST_DIVIDE assumes that 0<=num<=256*denom - // (this covers the case that num=255*denom+denom/2, which is used by DIV_ROUND) - template static inline unsigned int FAST_DIVIDE(unsigned int v) { return v/divisor; } --template<> static inline unsigned int FAST_DIVIDE<255>(unsigned int v) { return ((v+1)*0x101) >> 16; } --template<> static inline unsigned int FAST_DIVIDE<255*255>(unsigned int v) { v=(v+1)<<1; v=v+(v>>7)+((v*0x3)>>16)+(v>>22); return (v>>16)>>1; } -+template<> inline unsigned int FAST_DIVIDE<255>(unsigned int v) { return ((v+1)*0x101) >> 16; } -+template<> inline unsigned int FAST_DIVIDE<255*255>(unsigned int v) { v=(v+1)<<1; v=v+(v>>7)+((v*0x3)>>16)+(v>>22); return (v>>16)>>1; } - // FAST_DIV_ROUND assumes that 0<=num<=255*denom (DIV_ROUND should work upto num=2^32-1-(denom/2), - // but FAST_DIVIDE_BY_255 already fails at num=65790=258*255, which is not too far above 255.5*255) - template static inline unsigned int FAST_DIV_ROUND(unsigned int v) { return FAST_DIVIDE(v+(divisor)/2); } -diff -Naur inkscape-0.45.1/src/libvpsc/csolve_VPSC.cpp inkscape-0.45.1-mp/src/libvpsc/csolve_VPSC.cpp ---- inkscape-0.45.1/src/libvpsc/csolve_VPSC.cpp 2007-01-16 03:45:43.000000000 +0100 -+++ inkscape-0.45.1-mp/src/libvpsc/csolve_VPSC.cpp 2007-11-10 03:10:34.000000000 +0100 -@@ -10,6 +10,7 @@ - */ - #include - #include -+#include - #include "variable.h" - #include "constraint.h" - #include "generate-constraints.h" -@@ -73,7 +74,7 @@ - vpsc->satisfy(); - } catch(const char *e) { - std::cerr << e << std::endl; -- exit(1); -+ std::exit(1); - } - } - int getSplitCnt(IncSolver *vpsc) { -diff -Naur inkscape-0.45.1/src/libvpsc/generate-constraints.cpp inkscape-0.45.1-mp/src/libvpsc/generate-constraints.cpp ---- inkscape-0.45.1/src/libvpsc/generate-constraints.cpp 2007-01-16 03:45:43.000000000 +0100 -+++ inkscape-0.45.1-mp/src/libvpsc/generate-constraints.cpp 2007-11-10 02:36:04.000000000 +0100 -@@ -12,6 +12,7 @@ - - #include - #include -+#include - #include "generate-constraints.h" - #include "constraint.h" - -diff -Naur inkscape-0.45.1/src/livarot/BitLigne.cpp inkscape-0.45.1-mp/src/livarot/BitLigne.cpp ---- inkscape-0.45.1/src/livarot/BitLigne.cpp 2007-01-16 03:45:48.000000000 +0100 -+++ inkscape-0.45.1-mp/src/livarot/BitLigne.cpp 2007-11-10 04:48:57.000000000 +0100 -@@ -10,8 +10,11 @@ - #include "BitLigne.h" - - #include --#include --#include -+#include -+#include -+#include -+#include -+#include - #include - - BitLigne::BitLigne(int ist,int ien,float iScale) -diff -Naur inkscape-0.45.1/src/livarot/float-line.cpp inkscape-0.45.1-mp/src/livarot/float-line.cpp ---- inkscape-0.45.1/src/livarot/float-line.cpp 2007-01-16 03:45:48.000000000 +0100 -+++ inkscape-0.45.1-mp/src/livarot/float-line.cpp 2007-11-10 04:13:48.000000000 +0100 -@@ -14,6 +14,7 @@ - #endif - #include "livarot/float-line.h" - #include "livarot/int-line.h" -+#include - - FloatLigne::FloatLigne() - { -diff -Naur inkscape-0.45.1/src/livarot/int-line.cpp inkscape-0.45.1-mp/src/livarot/int-line.cpp ---- inkscape-0.45.1/src/livarot/int-line.cpp 2007-01-16 03:45:48.000000000 +0100 -+++ inkscape-0.45.1-mp/src/livarot/int-line.cpp 2007-11-10 04:49:33.000000000 +0100 -@@ -11,6 +11,10 @@ - - #include - #include -+#include -+#include -+#include -+#include - #include "livarot/int-line.h" - #include "livarot/float-line.h" - #include "livarot/BitLigne.h" -diff -Naur inkscape-0.45.1/src/livarot/PathCutting.cpp inkscape-0.45.1-mp/src/livarot/PathCutting.cpp ---- inkscape-0.45.1/src/livarot/PathCutting.cpp 2007-01-16 03:45:48.000000000 +0100 -+++ inkscape-0.45.1-mp/src/livarot/PathCutting.cpp 2007-11-10 04:50:33.000000000 +0100 -@@ -13,6 +13,9 @@ - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -+#include -+#include -+#include - #include "Path.h" - #include "style.h" - #include "livarot/path-description.h" -diff -Naur inkscape-0.45.1/src/livarot/Shape.cpp inkscape-0.45.1-mp/src/livarot/Shape.cpp ---- inkscape-0.45.1/src/livarot/Shape.cpp 2007-01-16 03:45:48.000000000 +0100 -+++ inkscape-0.45.1-mp/src/livarot/Shape.cpp 2007-11-10 04:51:14.000000000 +0100 -@@ -6,6 +6,8 @@ - * - */ - -+#include -+#include - #include - #include "Shape.h" - #include "livarot/sweep-event-queue.h" -diff -Naur inkscape-0.45.1/src/livarot/ShapeDraw.cpp inkscape-0.45.1-mp/src/livarot/ShapeDraw.cpp ---- inkscape-0.45.1/src/livarot/ShapeDraw.cpp 2007-01-16 03:45:48.000000000 +0100 -+++ inkscape-0.45.1-mp/src/livarot/ShapeDraw.cpp 2007-11-10 04:51:49.000000000 +0100 -@@ -6,6 +6,9 @@ - * - */ - -+#include -+#include -+#include - #include "Shape.h" - //#include - -diff -Naur inkscape-0.45.1/src/livarot/ShapeMisc.cpp inkscape-0.45.1-mp/src/livarot/ShapeMisc.cpp ---- inkscape-0.45.1/src/livarot/ShapeMisc.cpp 2007-01-16 03:45:48.000000000 +0100 -+++ inkscape-0.45.1-mp/src/livarot/ShapeMisc.cpp 2007-11-10 04:52:18.000000000 +0100 -@@ -11,6 +11,9 @@ - #include "livarot/Path.h" - #include "livarot/path-description.h" - #include -+#include -+#include -+#include - - /* - * polygon offset and polyline to path reassembling (when using back data) -diff -Naur inkscape-0.45.1/src/livarot/ShapeSweep.cpp inkscape-0.45.1-mp/src/livarot/ShapeSweep.cpp ---- inkscape-0.45.1/src/livarot/ShapeSweep.cpp 2007-01-16 03:45:48.000000000 +0100 -+++ inkscape-0.45.1-mp/src/livarot/ShapeSweep.cpp 2007-11-10 04:52:47.000000000 +0100 -@@ -6,6 +6,9 @@ - * - */ - -+#include -+#include -+#include - #include - #include "Shape.h" - #include "livarot/sweep-event-queue.h" -diff -Naur inkscape-0.45.1/src/main.cpp inkscape-0.45.1-mp/src/main.cpp ---- inkscape-0.45.1/src/main.cpp 2007-02-20 05:06:35.000000000 +0100 -+++ inkscape-0.45.1-mp/src/main.cpp 2007-11-10 09:52:59.000000000 +0100 -@@ -33,7 +33,8 @@ - #ifdef HAVE_IEEEFP_H - #include - #endif --#include -+#include -+#include - #include - - #include -diff -Naur inkscape-0.45.1/src/marker.cpp inkscape-0.45.1-mp/src/marker.cpp ---- inkscape-0.45.1/src/marker.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/marker.cpp 2007-11-10 09:53:34.000000000 +0100 -@@ -13,6 +13,9 @@ - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -+#include -+#include -+ - #include "config.h" - - -diff -Naur inkscape-0.45.1/src/message-stack.cpp inkscape-0.45.1-mp/src/message-stack.cpp ---- inkscape-0.45.1/src/message-stack.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/message-stack.cpp 2007-11-08 20:31:41.000000000 +0100 -@@ -10,6 +10,8 @@ - */ - - #include -+#include -+#include - #include "message-stack.h" - - namespace Inkscape { -diff -Naur inkscape-0.45.1/src/node-context.cpp inkscape-0.45.1-mp/src/node-context.cpp ---- inkscape-0.45.1/src/node-context.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/node-context.cpp 2007-11-10 09:53:53.000000000 +0100 -@@ -14,6 +14,8 @@ - #ifdef HAVE_CONFIG_H - # include "config.h" - #endif -+#include -+#include - #include - #include "macros.h" - #include -diff -Naur inkscape-0.45.1/src/nodepath.cpp inkscape-0.45.1-mp/src/nodepath.cpp ---- inkscape-0.45.1/src/nodepath.cpp 2007-01-26 03:05:31.000000000 +0100 -+++ inkscape-0.45.1-mp/src/nodepath.cpp 2007-11-10 09:54:36.000000000 +0100 -@@ -1,5 +1,4 @@ - #define __SP_NODEPATH_C__ -- - /** \file - * Path handler in node edit mode - * -@@ -44,6 +43,8 @@ - #include "display/bezier-utils.h" - #include - #include -+#include -+#include - - class NR::Matrix; - -diff -Naur inkscape-0.45.1/src/path-chemistry.cpp inkscape-0.45.1-mp/src/path-chemistry.cpp ---- inkscape-0.45.1/src/path-chemistry.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/path-chemistry.cpp 2007-11-10 09:55:07.000000000 +0100 -@@ -16,6 +16,8 @@ - #ifdef HAVE_CONFIG_H - # include - #endif -+#include -+#include - #include "xml/repr.h" - #include "svg/svg.h" - #include "display/curve.h" -diff -Naur inkscape-0.45.1/src/pedro/pedroconfig.cpp inkscape-0.45.1-mp/src/pedro/pedroconfig.cpp ---- inkscape-0.45.1/src/pedro/pedroconfig.cpp 2007-01-16 03:45:45.000000000 +0100 -+++ inkscape-0.45.1-mp/src/pedro/pedroconfig.cpp 2007-11-09 00:41:15.000000000 +0100 -@@ -49,6 +49,9 @@ - #include "pedrodom.h" - - #include -+#include -+#include -+#include - - namespace Pedro - { -diff -Naur inkscape-0.45.1/src/pedro/pedroxmpp.cpp inkscape-0.45.1-mp/src/pedro/pedroxmpp.cpp ---- inkscape-0.45.1/src/pedro/pedroxmpp.cpp 2007-03-13 19:06:21.000000000 +0100 -+++ inkscape-0.45.1-mp/src/pedro/pedroxmpp.cpp 2007-11-10 11:08:42.000000000 +0100 -@@ -21,8 +21,8 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -- --#include -+#include -+#include - #include - - #include -diff -Naur inkscape-0.45.1/src/pen-context.cpp inkscape-0.45.1-mp/src/pen-context.cpp ---- inkscape-0.45.1/src/pen-context.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/pen-context.cpp 2007-11-10 09:55:43.000000000 +0100 -@@ -16,7 +16,8 @@ - */ - - #include -- -+#include -+#include - #include "pen-context.h" - #include "sp-namedview.h" - #include "sp-metrics.h" -diff -Naur inkscape-0.45.1/src/prefix.cpp inkscape-0.45.1-mp/src/prefix.cpp ---- inkscape-0.45.1/src/prefix.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/prefix.cpp 2007-11-10 09:56:12.000000000 +0100 -@@ -39,10 +39,10 @@ - #include //for GThreads - #endif /* BR_THREADS */ - --#include --#include -+#include -+#include - #include --#include -+#include - #include "prefix.h" - - #ifdef __cplusplus -diff -Naur inkscape-0.45.1/src/rect-context.cpp inkscape-0.45.1-mp/src/rect-context.cpp ---- inkscape-0.45.1/src/rect-context.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/rect-context.cpp 2007-11-10 09:56:54.000000000 +0100 -@@ -17,6 +17,8 @@ - #include "config.h" - - #include -+#include -+#include - - #include "macros.h" - #include "display/sp-canvas.h" -diff -Naur inkscape-0.45.1/src/select-context.cpp inkscape-0.45.1-mp/src/select-context.cpp ---- inkscape-0.45.1/src/select-context.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/select-context.cpp 2007-11-10 09:57:30.000000000 +0100 -@@ -16,6 +16,8 @@ - #ifdef HAVE_CONFIG_H - # include "config.h" - #endif -+#include -+#include - #include - #include "macros.h" - #include "rubberband.h" -diff -Naur inkscape-0.45.1/src/selection-chemistry.cpp inkscape-0.45.1-mp/src/selection-chemistry.cpp ---- inkscape-0.45.1/src/selection-chemistry.cpp 2007-01-26 21:47:48.000000000 +0100 -+++ inkscape-0.45.1-mp/src/selection-chemistry.cpp 2007-11-10 09:58:04.000000000 +0100 -@@ -72,6 +72,9 @@ - #include "helper/units.h" - #include "sp-item.h" - #include "unit-constants.h" -+#include -+#include -+ - using NR::X; - using NR::Y; - -diff -Naur inkscape-0.45.1/src/seltrans.cpp inkscape-0.45.1-mp/src/seltrans.cpp ---- inkscape-0.45.1/src/seltrans.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/seltrans.cpp 2007-11-10 09:58:33.000000000 +0100 -@@ -44,6 +44,8 @@ - #include "display/sp-ctrlline.h" - #include "prefs-utils.h" - #include "xml/repr.h" -+#include -+#include - - #include "isnan.h" //temp fix. make sure included last - -diff -Naur inkscape-0.45.1/src/shortcuts.cpp inkscape-0.45.1-mp/src/shortcuts.cpp ---- inkscape-0.45.1/src/shortcuts.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/shortcuts.cpp 2007-11-10 10:01:09.000000000 +0100 -@@ -23,6 +23,8 @@ - #endif - - #include -+#include -+#include - - #include - #include -diff -Naur inkscape-0.45.1/src/sp-clippath.cpp inkscape-0.45.1-mp/src/sp-clippath.cpp ---- inkscape-0.45.1/src/sp-clippath.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/sp-clippath.cpp 2007-11-10 10:02:15.000000000 +0100 -@@ -13,7 +13,8 @@ - */ - - -- -+#include -+#include - #include "display/nr-arena.h" - #include "display/nr-arena-group.h" - #include "xml/repr.h" -diff -Naur inkscape-0.45.1/src/sp-conn-end.cpp inkscape-0.45.1-mp/src/sp-conn-end.cpp ---- inkscape-0.45.1/src/sp-conn-end.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/sp-conn-end.cpp 2007-11-10 10:15:07.000000000 +0100 -@@ -7,7 +7,8 @@ - #include "sp-path.h" - #include "uri.h" - #include "document.h" -- -+#include -+#include - - static void change_endpts(SPCurve *const curve, NR::Point const h2endPt[2]); - static NR::Point calc_bbox_conn_pt(NR::Rect const &bbox, NR::Point const &p); -diff -Naur inkscape-0.45.1/src/sp-conn-end-pair.cpp inkscape-0.45.1-mp/src/sp-conn-end-pair.cpp ---- inkscape-0.45.1/src/sp-conn-end-pair.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/sp-conn-end-pair.cpp 2007-11-10 10:02:52.000000000 +0100 -@@ -10,6 +10,8 @@ - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -+#include -+#include - #include "attributes.h" - #include "sp-conn-end.h" - #include "uri.h" -diff -Naur inkscape-0.45.1/src/sp-cursor.cpp inkscape-0.45.1-mp/src/sp-cursor.cpp ---- inkscape-0.45.1/src/sp-cursor.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/sp-cursor.cpp 2007-11-10 10:03:20.000000000 +0100 -@@ -13,7 +13,8 @@ - */ - - #include --#include -+#include -+#include - #include - #include "sp-cursor.h" - -diff -Naur inkscape-0.45.1/src/sp-filter.cpp inkscape-0.45.1-mp/src/sp-filter.cpp ---- inkscape-0.45.1/src/sp-filter.cpp 2007-02-28 04:21:17.000000000 +0100 -+++ inkscape-0.45.1-mp/src/sp-filter.cpp 2007-11-10 10:03:36.000000000 +0100 -@@ -22,6 +22,8 @@ - #include "sp-filter-reference.h" - #include "uri.h" - #include "xml/repr.h" -+#include -+#include - - #define SP_MACROS_SILENT - #include "macros.h" -diff -Naur inkscape-0.45.1/src/sp-flowtext.cpp inkscape-0.45.1-mp/src/sp-flowtext.cpp ---- inkscape-0.45.1/src/sp-flowtext.cpp 2007-03-11 18:24:00.000000000 +0100 -+++ inkscape-0.45.1-mp/src/sp-flowtext.cpp 2007-11-10 10:03:58.000000000 +0100 -@@ -31,7 +31,8 @@ - #include "livarot/Shape.h" - - #include "display/nr-arena-glyphs.h" -- -+#include -+#include - - static void sp_flowtext_class_init(SPFlowtextClass *klass); - static void sp_flowtext_init(SPFlowtext *group); -diff -Naur inkscape-0.45.1/src/sp-gradient.cpp inkscape-0.45.1-mp/src/sp-gradient.cpp ---- inkscape-0.45.1/src/sp-gradient.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/sp-gradient.cpp 2007-11-10 10:04:25.000000000 +0100 -@@ -18,7 +18,8 @@ - - #define noSP_GRADIENT_VERBOSE - -- -+#include -+#include - #include - #include - #include -diff -Naur inkscape-0.45.1/src/sp-guide.cpp inkscape-0.45.1-mp/src/sp-guide.cpp ---- inkscape-0.45.1/src/sp-guide.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/sp-guide.cpp 2007-11-10 11:05:29.000000000 +0100 -@@ -16,6 +16,8 @@ - #ifdef HAVE_CONFIG_H - # include - #endif -+ -+#include - #include "display/guideline.h" - #include "svg/svg.h" - #include "attributes.h" -@@ -26,6 +28,9 @@ - #include - #include - #include -+#include -+#include -+ - using std::vector; - - enum { -diff -Naur inkscape-0.45.1/src/sp-image.cpp inkscape-0.45.1-mp/src/sp-image.cpp ---- inkscape-0.45.1/src/sp-image.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/sp-image.cpp 2007-11-10 10:07:52.000000000 +0100 -@@ -26,6 +26,9 @@ - #include "enums.h" - #include "attributes.h" - -+#include -+#include -+ - #include "print.h" - #include "brokenimage.xpm" - #include "document.h" -diff -Naur inkscape-0.45.1/src/spiral-context.cpp inkscape-0.45.1-mp/src/spiral-context.cpp ---- inkscape-0.45.1/src/spiral-context.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/spiral-context.cpp 2007-11-10 10:08:08.000000000 +0100 -@@ -39,6 +39,8 @@ - #include "xml/node-event-vector.h" - #include "prefs-utils.h" - #include "context-fns.h" -+#include -+#include - - static void sp_spiral_context_class_init(SPSpiralContextClass * klass); - static void sp_spiral_context_init(SPSpiralContext *spiral_context); -diff -Naur inkscape-0.45.1/src/sp-item-group.cpp inkscape-0.45.1-mp/src/sp-item-group.cpp ---- inkscape-0.45.1/src/sp-item-group.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/sp-item-group.cpp 2007-11-10 10:08:28.000000000 +0100 -@@ -18,6 +18,8 @@ - # include "config.h" - #endif - -+#include -+#include - #include - - #include "display/nr-arena-group.h" -diff -Naur inkscape-0.45.1/src/sp-item-rm-unsatisfied-cns.cpp inkscape-0.45.1-mp/src/sp-item-rm-unsatisfied-cns.cpp ---- inkscape-0.45.1/src/sp-item-rm-unsatisfied-cns.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/sp-item-rm-unsatisfied-cns.cpp 2007-11-10 11:06:18.000000000 +0100 -@@ -4,6 +4,8 @@ - #include - #include - #include -+#include -+ - using std::vector; - - void sp_item_rm_unsatisfied_cns(SPItem &item) -diff -Naur inkscape-0.45.1/src/splivarot.cpp inkscape-0.45.1-mp/src/splivarot.cpp ---- inkscape-0.45.1/src/splivarot.cpp 2007-03-13 22:41:04.000000000 +0100 -+++ inkscape-0.45.1-mp/src/splivarot.cpp 2007-11-10 10:08:53.000000000 +0100 -@@ -17,6 +17,8 @@ - # include - #endif - -+#include -+#include - #include - #include - #include "xml/repr.h" -diff -Naur inkscape-0.45.1/src/sp-mask.cpp inkscape-0.45.1-mp/src/sp-mask.cpp ---- inkscape-0.45.1/src/sp-mask.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/sp-mask.cpp 2007-11-10 10:09:06.000000000 +0100 -@@ -15,6 +15,8 @@ - #include "display/nr-arena.h" - #include "display/nr-arena-group.h" - #include -+#include -+#include - - #include "enums.h" - #include "attributes.h" -diff -Naur inkscape-0.45.1/src/sp-namedview.cpp inkscape-0.45.1-mp/src/sp-namedview.cpp ---- inkscape-0.45.1/src/sp-namedview.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/sp-namedview.cpp 2007-11-10 10:09:26.000000000 +0100 -@@ -14,6 +14,8 @@ - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -+#include -+#include - #include "config.h" - - #include "display/canvas-grid.h" -diff -Naur inkscape-0.45.1/src/sp-object.cpp inkscape-0.45.1-mp/src/sp-object.cpp ---- inkscape-0.45.1/src/sp-object.cpp 2007-02-20 05:03:45.000000000 +0100 -+++ inkscape-0.45.1-mp/src/sp-object.cpp 2007-11-10 10:09:56.000000000 +0100 -@@ -31,7 +31,8 @@ - * dictionary and so on. Source: doc/architecture.txt - */ - -- -+#include -+#include - #include "helper/sp-marshal.h" - #include "xml/node-event-vector.h" - #include "attributes.h" -diff -Naur inkscape-0.45.1/src/sp-offset.cpp inkscape-0.45.1-mp/src/sp-offset.cpp ---- inkscape-0.45.1/src/sp-offset.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/sp-offset.cpp 2007-11-10 10:10:14.000000000 +0100 -@@ -19,7 +19,8 @@ - # include "config.h" - #endif - -- -+#include -+#include - #include "svg/svg.h" - #include "attributes.h" - #include "display/curve.h" -diff -Naur inkscape-0.45.1/src/sp-pattern.cpp inkscape-0.45.1-mp/src/sp-pattern.cpp ---- inkscape-0.45.1/src/sp-pattern.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/sp-pattern.cpp 2007-11-10 10:10:35.000000000 +0100 -@@ -14,6 +14,8 @@ - - #include "config.h" - -+#include -+#include - #include - #include "libnr/nr-matrix-fns.h" - #include -diff -Naur inkscape-0.45.1/src/sp-root.cpp inkscape-0.45.1-mp/src/sp-root.cpp ---- inkscape-0.45.1/src/sp-root.cpp 2007-02-20 05:03:45.000000000 +0100 -+++ inkscape-0.45.1-mp/src/sp-root.cpp 2007-11-10 10:10:57.000000000 +0100 -@@ -14,6 +14,8 @@ - */ - - #include "config.h" -+#include -+#include - - #include "svg/svg.h" - #include "display/nr-arena-group.h" -diff -Naur inkscape-0.45.1/src/sp-star.cpp inkscape-0.45.1-mp/src/sp-star.cpp ---- inkscape-0.45.1/src/sp-star.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/sp-star.cpp 2007-11-10 10:11:10.000000000 +0100 -@@ -17,6 +17,8 @@ - #include "config.h" - - #include -+#include -+#include - - #include "svg/svg.h" - #include "attributes.h" -diff -Naur inkscape-0.45.1/src/sp-symbol.cpp inkscape-0.45.1-mp/src/sp-symbol.cpp ---- inkscape-0.45.1/src/sp-symbol.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/sp-symbol.cpp 2007-11-08 22:52:01.000000000 +0100 -@@ -12,6 +12,8 @@ - */ - - #include "config.h" -+#include -+#include - - #include "libnr/nr-matrix-fns.h" - #include "libnr/nr-matrix-ops.h" -diff -Naur inkscape-0.45.1/src/sp-tspan.cpp inkscape-0.45.1-mp/src/sp-tspan.cpp ---- inkscape-0.45.1/src/sp-tspan.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/sp-tspan.cpp 2007-11-08 23:06:15.000000000 +0100 -@@ -37,7 +37,8 @@ - #include "style.h" - #include "libnr/nr-matrix-fns.h" - #include "xml/repr.h" -- -+#include -+#include - - /*##################################################### - # SPTSPAN -diff -Naur inkscape-0.45.1/src/sp-use.cpp inkscape-0.45.1-mp/src/sp-use.cpp ---- inkscape-0.45.1/src/sp-use.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/sp-use.cpp 2007-11-10 10:11:59.000000000 +0100 -@@ -33,6 +33,8 @@ - #include "sp-symbol.h" - #include "sp-use.h" - #include "sp-use-reference.h" -+#include -+#include - - /* fixme: */ - -diff -Naur inkscape-0.45.1/src/sp-use-reference.cpp inkscape-0.45.1-mp/src/sp-use-reference.cpp ---- inkscape-0.45.1/src/sp-use-reference.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/sp-use-reference.cpp 2007-11-08 23:17:35.000000000 +0100 -@@ -7,6 +7,9 @@ - * Released under GNU GPL, read the file 'COPYING' for more information. - */ - -+#include -+#include -+ - #include "enums.h" - #include "sp-use-reference.h" - -diff -Naur inkscape-0.45.1/src/star-context.cpp inkscape-0.45.1-mp/src/star-context.cpp ---- inkscape-0.45.1/src/star-context.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/star-context.cpp 2007-11-10 10:12:30.000000000 +0100 -@@ -38,6 +38,8 @@ - #include "xml/node-event-vector.h" - #include "object-edit.h" - #include "context-fns.h" -+#include -+#include - - #include "star-context.h" - -diff -Naur inkscape-0.45.1/src/streams-gzip.cpp inkscape-0.45.1-mp/src/streams-gzip.cpp ---- inkscape-0.45.1/src/streams-gzip.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/streams-gzip.cpp 2007-11-08 23:29:29.000000000 +0100 -@@ -10,6 +10,8 @@ - */ - - #include "streams-gzip.h" -+#include -+#include - - namespace Inkscape { - -diff -Naur inkscape-0.45.1/src/streams-zlib.cpp inkscape-0.45.1-mp/src/streams-zlib.cpp ---- inkscape-0.45.1/src/streams-zlib.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/streams-zlib.cpp 2007-11-08 23:40:30.000000000 +0100 -@@ -9,6 +9,8 @@ - * Released under GNU LGPL, read the file 'COPYING.LIB' for more information - */ - -+#include -+#include - #include - #include "streams-zlib.h" - -diff -Naur inkscape-0.45.1/src/streq.h inkscape-0.45.1-mp/src/streq.h ---- inkscape-0.45.1/src/streq.h 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/streq.h 2007-11-10 10:12:59.000000000 +0100 -@@ -1,6 +1,7 @@ - #ifndef INKSCAPE_STREQ_H - #define INKSCAPE_STREQ_H - -+#include - #include - - /** Convenience/readability wrapper for strcmp(a,b)==0. */ -diff -Naur inkscape-0.45.1/src/style.cpp inkscape-0.45.1-mp/src/style.cpp ---- inkscape-0.45.1/src/style.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/style.cpp 2007-11-10 10:13:43.000000000 +0100 -@@ -40,6 +40,8 @@ - #include "unit-constants.h" - #include "isnan.h" - -+#include -+#include - #include - #include - -diff -Naur inkscape-0.45.1/src/svg/gnome-canvas-bpath-util.cpp inkscape-0.45.1-mp/src/svg/gnome-canvas-bpath-util.cpp ---- inkscape-0.45.1/src/svg/gnome-canvas-bpath-util.cpp 2007-01-16 03:45:33.000000000 +0100 -+++ inkscape-0.45.1-mp/src/svg/gnome-canvas-bpath-util.cpp 2007-11-10 05:56:52.000000000 +0100 -@@ -10,6 +10,10 @@ - * Raph Levien - */ - -+#include -+#include -+#include -+#include - #include - #include - -diff -Naur inkscape-0.45.1/src/svg/itos.cpp inkscape-0.45.1-mp/src/svg/itos.cpp ---- inkscape-0.45.1/src/svg/itos.cpp 2007-01-16 03:45:33.000000000 +0100 -+++ inkscape-0.45.1-mp/src/svg/itos.cpp 2007-11-10 05:57:14.000000000 +0100 -@@ -15,6 +15,7 @@ - - // Standard include files - #include // for string -+#include - - using namespace std; - -diff -Naur inkscape-0.45.1/src/svg/strip-trailing-zeros.cpp inkscape-0.45.1-mp/src/svg/strip-trailing-zeros.cpp ---- inkscape-0.45.1/src/svg/strip-trailing-zeros.cpp 2007-01-16 03:45:33.000000000 +0100 -+++ inkscape-0.45.1-mp/src/svg/strip-trailing-zeros.cpp 2007-11-10 05:58:08.000000000 +0100 -@@ -1,3 +1,5 @@ -+#include -+#include - #include "svg/strip-trailing-zeros.h" - #include - using std::string; -diff -Naur inkscape-0.45.1/src/svg/svg-affine.cpp inkscape-0.45.1-mp/src/svg/svg-affine.cpp ---- inkscape-0.45.1/src/svg/svg-affine.cpp 2007-01-16 03:45:33.000000000 +0100 -+++ inkscape-0.45.1-mp/src/svg/svg-affine.cpp 2007-11-10 05:58:51.000000000 +0100 -@@ -17,6 +17,10 @@ - # include "config.h" - #endif - -+#include -+#include -+#include -+#include - #include - #include - #include -diff -Naur inkscape-0.45.1/src/svg/svg-color.cpp inkscape-0.45.1-mp/src/svg/svg-color.cpp ---- inkscape-0.45.1/src/svg/svg-color.cpp 2007-01-16 03:45:33.000000000 +0100 -+++ inkscape-0.45.1-mp/src/svg/svg-color.cpp 2007-11-10 05:59:19.000000000 +0100 -@@ -28,6 +28,9 @@ - #include - #include - #include // sprintf -+#include -+#include -+#include - #include - #include "strneq.h" - using std::sprintf; -diff -Naur inkscape-0.45.1/src/svg/svg.h inkscape-0.45.1-mp/src/svg/svg.h ---- inkscape-0.45.1/src/svg/svg.h 2007-01-16 03:45:33.000000000 +0100 -+++ inkscape-0.45.1-mp/src/svg/svg.h 2007-11-08 19:22:10.000000000 +0100 -@@ -14,6 +14,9 @@ - #include - #include "svg/svg-length.h" - #include -+#include -+#include -+ - - struct NArtBpath; - struct NRMatrix; -diff -Naur inkscape-0.45.1/src/svg/svg-length.cpp inkscape-0.45.1-mp/src/svg/svg-length.cpp ---- inkscape-0.45.1/src/svg/svg-length.cpp 2007-01-16 03:45:33.000000000 +0100 -+++ inkscape-0.45.1-mp/src/svg/svg-length.cpp 2007-11-10 06:00:12.000000000 +0100 -@@ -21,6 +21,8 @@ - #include "svg.h" - #include "stringstream.h" - #include "../unit-constants.h" -+#include -+#include - - - static unsigned sp_svg_length_read_lff(gchar const *str, SVGLength::Unit *unit, float *val, float *computed, char **next); -diff -Naur inkscape-0.45.1/src/svg/svg-path.cpp inkscape-0.45.1-mp/src/svg/svg-path.cpp ---- inkscape-0.45.1/src/svg/svg-path.cpp 2007-01-16 03:45:33.000000000 +0100 -+++ inkscape-0.45.1-mp/src/svg/svg-path.cpp 2007-11-10 06:00:30.000000000 +0100 -@@ -30,6 +30,8 @@ - #include - #include - #include -+#include -+#include - - #include "libnr/n-art-bpath.h" - #include "gnome-canvas-bpath-util.h" -diff -Naur inkscape-0.45.1/src/text-chemistry.cpp inkscape-0.45.1-mp/src/text-chemistry.cpp ---- inkscape-0.45.1/src/text-chemistry.cpp 2007-01-26 03:05:31.000000000 +0100 -+++ inkscape-0.45.1-mp/src/text-chemistry.cpp 2007-11-10 10:14:02.000000000 +0100 -@@ -30,6 +30,8 @@ - #include "sp-flowtext.h" - #include "sp-flowregion.h" - #include "sp-flowdiv.h" -+#include -+#include - - - SPItem * -diff -Naur inkscape-0.45.1/src/text-editing.cpp inkscape-0.45.1-mp/src/text-editing.cpp ---- inkscape-0.45.1/src/text-editing.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/text-editing.cpp 2007-11-10 10:14:14.000000000 +0100 -@@ -14,6 +14,8 @@ - # include "config.h" - #endif - -+#include -+#include - #include "desktop.h" - #include "style.h" - #include "unit-constants.h" -diff -Naur inkscape-0.45.1/src/tools-switch.cpp inkscape-0.45.1-mp/src/tools-switch.cpp ---- inkscape-0.45.1/src/tools-switch.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/tools-switch.cpp 2007-11-08 23:53:11.000000000 +0100 -@@ -18,6 +18,8 @@ - #include "desktop.h" - #include "desktop-handles.h" - #include -+#include -+#include - - #include - -diff -Naur inkscape-0.45.1/src/ui/widget/style-swatch.cpp inkscape-0.45.1-mp/src/ui/widget/style-swatch.cpp ---- inkscape-0.45.1/src/ui/widget/style-swatch.cpp 2007-01-19 04:02:25.000000000 +0100 -+++ inkscape-0.45.1-mp/src/ui/widget/style-swatch.cpp 2007-11-09 20:43:15.000000000 +0100 -@@ -13,6 +13,9 @@ - # include - #endif - -+#include -+#include -+ - #include "style-swatch.h" - - #include "widgets/spw-utilities.h" -diff -Naur inkscape-0.45.1/src/uri-references.cpp inkscape-0.45.1-mp/src/uri-references.cpp ---- inkscape-0.45.1/src/uri-references.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/uri-references.cpp 2007-11-10 10:14:39.000000000 +0100 -@@ -12,6 +12,8 @@ - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -+#include -+#include - #include "document.h" - #include "sp-object.h" - #include "uri.h" -diff -Naur inkscape-0.45.1/src/verbs.cpp inkscape-0.45.1-mp/src/verbs.cpp ---- inkscape-0.45.1/src/verbs.cpp 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/verbs.cpp 2007-11-08 02:32:49.000000000 +0100 -@@ -26,6 +26,7 @@ - - - #include -+#include - - #ifdef HAVE_CONFIG_H - # include "config.h" -diff -Naur inkscape-0.45.1/src/verbs.h inkscape-0.45.1-mp/src/verbs.h ---- inkscape-0.45.1/src/verbs.h 2007-01-16 03:46:08.000000000 +0100 -+++ inkscape-0.45.1-mp/src/verbs.h 2007-11-10 10:15:03.000000000 +0100 -@@ -20,6 +20,8 @@ - #include "helper/helper-forward.h" - #include "forward.h" - #include -+#include -+#include - - /** \brief This anonymous enum is used to provide a list of the Verbs - which are defined staticly in the verb files. There may be -diff -Naur inkscape-0.45.1/src/widgets/dash-selector.cpp inkscape-0.45.1-mp/src/widgets/dash-selector.cpp ---- inkscape-0.45.1/src/widgets/dash-selector.cpp 2007-01-16 03:45:18.000000000 +0100 -+++ inkscape-0.45.1-mp/src/widgets/dash-selector.cpp 2007-11-10 06:38:02.000000000 +0100 -@@ -20,6 +20,8 @@ - #endif - #include - #include -+#include -+#include - - #include - #include "../style.h" -diff -Naur inkscape-0.45.1/src/widgets/icon.cpp inkscape-0.45.1-mp/src/widgets/icon.cpp ---- inkscape-0.45.1/src/widgets/icon.cpp 2007-01-16 03:45:18.000000000 +0100 -+++ inkscape-0.45.1-mp/src/widgets/icon.cpp 2007-11-10 07:15:24.000000000 +0100 -@@ -18,6 +18,7 @@ - - - -+#include - #include - #include - #include -diff -Naur inkscape-0.45.1/src/widgets/layer-selector.cpp inkscape-0.45.1-mp/src/widgets/layer-selector.cpp ---- inkscape-0.45.1/src/widgets/layer-selector.cpp 2007-01-16 03:45:18.000000000 +0100 -+++ inkscape-0.45.1-mp/src/widgets/layer-selector.cpp 2007-11-10 06:38:19.000000000 +0100 -@@ -14,6 +14,8 @@ - #endif - - #include -+#include -+#include - - #include "desktop-handles.h" - -diff -Naur inkscape-0.45.1/src/widgets/paint-selector.cpp inkscape-0.45.1-mp/src/widgets/paint-selector.cpp ---- inkscape-0.45.1/src/widgets/paint-selector.cpp 2007-01-16 03:45:18.000000000 +0100 -+++ inkscape-0.45.1-mp/src/widgets/paint-selector.cpp 2007-11-10 06:38:36.000000000 +0100 -@@ -16,7 +16,8 @@ - #endif - - -- -+#include -+#include - #include - #include - #include -diff -Naur inkscape-0.45.1/src/widgets/ruler.cpp inkscape-0.45.1-mp/src/widgets/ruler.cpp ---- inkscape-0.45.1/src/widgets/ruler.cpp 2007-01-16 03:45:18.000000000 +0100 -+++ inkscape-0.45.1-mp/src/widgets/ruler.cpp 2007-11-10 07:48:02.000000000 +0100 -@@ -15,7 +15,7 @@ - - #include - #include --#include -+#include - #include "widget-sizes.h" - #include "ruler.h" - #include "unit-constants.h" -diff -Naur inkscape-0.45.1/src/widgets/sp-color-notebook.cpp inkscape-0.45.1-mp/src/widgets/sp-color-notebook.cpp ---- inkscape-0.45.1/src/widgets/sp-color-notebook.cpp 2007-01-16 03:45:18.000000000 +0100 -+++ inkscape-0.45.1-mp/src/widgets/sp-color-notebook.cpp 2007-11-10 06:39:44.000000000 +0100 -@@ -17,8 +17,9 @@ - #ifdef HAVE_CONFIG_H - # include "config.h" - #endif --#include --#include -+#include -+#include -+#include - #include - #include - #include "../dialogs/dialog-events.h" -diff -Naur inkscape-0.45.1/src/widgets/sp-color-wheel.cpp inkscape-0.45.1-mp/src/widgets/sp-color-wheel.cpp ---- inkscape-0.45.1/src/widgets/sp-color-wheel.cpp 2007-01-16 03:45:18.000000000 +0100 -+++ inkscape-0.45.1-mp/src/widgets/sp-color-wheel.cpp 2007-11-10 07:14:42.000000000 +0100 -@@ -14,6 +14,8 @@ - */ - - #include -+#include -+#include - #include "sp-color-wheel.h" - - #include "libnr/nr-rotate-ops.h" -diff -Naur inkscape-0.45.1/src/widgets/spw-utilities.cpp inkscape-0.45.1-mp/src/widgets/spw-utilities.cpp ---- inkscape-0.45.1/src/widgets/spw-utilities.cpp 2007-01-16 03:45:18.000000000 +0100 -+++ inkscape-0.45.1-mp/src/widgets/spw-utilities.cpp 2007-11-10 06:38:52.000000000 +0100 -@@ -18,6 +18,8 @@ - - - #include -+#include -+#include - - #include "selection.h" - -diff -Naur inkscape-0.45.1/src/widgets/sp-xmlview-attr-list.cpp inkscape-0.45.1-mp/src/widgets/sp-xmlview-attr-list.cpp ---- inkscape-0.45.1/src/widgets/sp-xmlview-attr-list.cpp 2007-01-16 03:45:18.000000000 +0100 -+++ inkscape-0.45.1-mp/src/widgets/sp-xmlview-attr-list.cpp 2007-11-10 07:47:06.000000000 +0100 -@@ -14,6 +14,7 @@ - #ifdef HAVE_CONFIG_H - # include - #endif -+#include - #include "helper/sp-marshal.h" - #include - #include "../xml/node-event-vector.h" -diff -Naur inkscape-0.45.1/src/widgets/sp-xmlview-content.cpp inkscape-0.45.1-mp/src/widgets/sp-xmlview-content.cpp ---- inkscape-0.45.1/src/widgets/sp-xmlview-content.cpp 2007-01-16 03:45:18.000000000 +0100 -+++ inkscape-0.45.1-mp/src/widgets/sp-xmlview-content.cpp 2007-11-10 07:48:11.000000000 +0100 -@@ -11,7 +11,7 @@ - * Released under the GNU GPL; see COPYING for details - */ - -- -+#include - #include "xml/node-event-vector.h" - #include "sp-xmlview-content.h" - #include "desktop-handles.h" -diff -Naur inkscape-0.45.1/src/widgets/sp-xmlview-tree.cpp inkscape-0.45.1-mp/src/widgets/sp-xmlview-tree.cpp ---- inkscape-0.45.1/src/widgets/sp-xmlview-tree.cpp 2007-01-16 03:45:18.000000000 +0100 -+++ inkscape-0.45.1-mp/src/widgets/sp-xmlview-tree.cpp 2007-11-10 06:40:26.000000000 +0100 -@@ -13,6 +13,8 @@ - - #include "../xml/node-event-vector.h" - #include "sp-xmlview-tree.h" -+#include -+#include - - struct NodeData { - SPXMLViewTree * tree; -diff -Naur inkscape-0.45.1/src/widgets/toolbox.cpp inkscape-0.45.1-mp/src/widgets/toolbox.cpp ---- inkscape-0.45.1/src/widgets/toolbox.cpp 2007-02-20 05:00:01.000000000 +0100 -+++ inkscape-0.45.1-mp/src/widgets/toolbox.cpp 2007-11-10 06:39:07.000000000 +0100 -@@ -33,6 +33,8 @@ - #include - #include - #include -+#include -+#include - - #include "widgets/button.h" - #include "widgets/widget-sizes.h" -diff -Naur inkscape-0.45.1/src/xml/composite-node-observer.cpp inkscape-0.45.1-mp/src/xml/composite-node-observer.cpp ---- inkscape-0.45.1/src/xml/composite-node-observer.cpp 2007-01-16 03:45:36.000000000 +0100 -+++ inkscape-0.45.1-mp/src/xml/composite-node-observer.cpp 2007-11-10 08:25:00.000000000 +0100 -@@ -12,6 +12,7 @@ - * - */ - -+#include - #include "algorithms/find-if-before.h" - #include "xml/composite-node-observer.h" - #include "xml/node-event-vector.h" -diff -Naur inkscape-0.45.1/src/xml/croco-node-iface.cpp inkscape-0.45.1-mp/src/xml/croco-node-iface.cpp ---- inkscape-0.45.1/src/xml/croco-node-iface.cpp 2007-01-16 03:45:36.000000000 +0100 -+++ inkscape-0.45.1-mp/src/xml/croco-node-iface.cpp 2007-11-10 09:06:02.000000000 +0100 -@@ -1,6 +1,8 @@ - #include "xml/croco-node-iface.h" - #include "xml/node.h" - #include -+#include -+#include - - static char const * - local_part(char const *const qname) -diff -Naur inkscape-0.45.1/src/xml/node-fns.cpp inkscape-0.45.1-mp/src/xml/node-fns.cpp ---- inkscape-0.45.1/src/xml/node-fns.cpp 2007-01-16 03:45:36.000000000 +0100 -+++ inkscape-0.45.1-mp/src/xml/node-fns.cpp 2007-11-10 08:27:13.000000000 +0100 -@@ -3,7 +3,8 @@ - #endif - - #include -- -+#include -+#include - #include "xml/node-iterators.h" - #include "algorithms/find-if-before.h" - -diff -Naur inkscape-0.45.1/src/xml/quote.cpp inkscape-0.45.1-mp/src/xml/quote.cpp ---- inkscape-0.45.1/src/xml/quote.cpp 2007-01-16 03:45:36.000000000 +0100 -+++ inkscape-0.45.1-mp/src/xml/quote.cpp 2007-11-10 08:27:27.000000000 +0100 -@@ -11,7 +11,7 @@ - * of the GNU General Public License: see the file `COPYING'. - */ - --#include -+#include - #include - - -diff -Naur inkscape-0.45.1/src/xml/quote-test.cpp inkscape-0.45.1-mp/src/xml/quote-test.cpp ---- inkscape-0.45.1/src/xml/quote-test.cpp 2007-01-16 03:45:36.000000000 +0100 -+++ inkscape-0.45.1-mp/src/xml/quote-test.cpp 2007-11-10 08:27:49.000000000 +0100 -@@ -1,6 +1,7 @@ - /* Initial author: Peter Moulder. - Hereby released into the Public Domain. */ - -+#include - #include - #include "utest/test-1ary-cases.h" - -diff -Naur inkscape-0.45.1/src/xml/repr-action-test.cpp inkscape-0.45.1-mp/src/xml/repr-action-test.cpp ---- inkscape-0.45.1/src/xml/repr-action-test.cpp 2007-01-16 03:45:36.000000000 +0100 -+++ inkscape-0.45.1-mp/src/xml/repr-action-test.cpp 2007-11-10 08:28:14.000000000 +0100 -@@ -1,4 +1,4 @@ --#include -+#include - #include - #include "../utest/utest.h" - -diff -Naur inkscape-0.45.1/src/xml/repr.cpp inkscape-0.45.1-mp/src/xml/repr.cpp ---- inkscape-0.45.1/src/xml/repr.cpp 2007-01-16 03:45:36.000000000 +0100 -+++ inkscape-0.45.1-mp/src/xml/repr.cpp 2007-11-10 08:28:38.000000000 +0100 -@@ -22,6 +22,7 @@ - # include "config.h" - #endif - -+#include - #include "xml/repr.h" - #include "xml/text-node.h" - #include "xml/element-node.h" -diff -Naur inkscape-0.45.1/src/xml/repr-css.cpp inkscape-0.45.1-mp/src/xml/repr-css.cpp ---- inkscape-0.45.1/src/xml/repr-css.cpp 2007-03-13 19:06:21.000000000 +0100 -+++ inkscape-0.45.1-mp/src/xml/repr-css.cpp 2007-11-10 08:29:02.000000000 +0100 -@@ -6,7 +6,7 @@ - - - #include -- -+#include - #include "xml/repr.h" - #include "xml/simple-node.h" - -diff -Naur inkscape-0.45.1/src/xml/repr-io.cpp inkscape-0.45.1-mp/src/xml/repr-io.cpp ---- inkscape-0.45.1/src/xml/repr-io.cpp 2007-01-16 03:45:36.000000000 +0100 -+++ inkscape-0.45.1-mp/src/xml/repr-io.cpp 2007-11-10 08:29:40.000000000 +0100 -@@ -17,6 +17,8 @@ - #endif - - #include -+#include -+#include - - #include "xml/repr.h" - #include "xml/attribute-record.h" -diff -Naur inkscape-0.45.1/src/xml/repr-util.cpp inkscape-0.45.1-mp/src/xml/repr-util.cpp ---- inkscape-0.45.1/src/xml/repr-util.cpp 2007-01-16 03:45:36.000000000 +0100 -+++ inkscape-0.45.1-mp/src/xml/repr-util.cpp 2007-11-10 08:30:08.000000000 +0100 -@@ -20,11 +20,11 @@ - #include - - #if HAVE_STRING_H --# include -+# include - #endif - - #if HAVE_STDLIB_H --# include -+# include - #endif - - -diff -Naur inkscape-0.45.1/src/xml/simple-node.cpp inkscape-0.45.1-mp/src/xml/simple-node.cpp ---- inkscape-0.45.1/src/xml/simple-node.cpp 2007-01-16 03:45:36.000000000 +0100 -+++ inkscape-0.45.1-mp/src/xml/simple-node.cpp 2007-11-10 08:31:03.000000000 +0100 -@@ -15,6 +15,8 @@ - * - */ - -+#include -+#include - #include - #include "xml/simple-node.h" - #include "xml/node-event-vector.h" -Index: src/remove-last.h -=================================================================== ---- inkscape-0.45.1/src/remove-last.h (Revision 14522) -+++ inkscape-0.45.1/src/remove-last.h (Revision 14523) -@@ -1,6 +1,7 @@ - #ifndef __REMOVE_LAST_H__ - #define __REMOVE_LAST_H__ - -+#include - #include - #include - -Index: src/libnrtype/Layout-TNG.h -=================================================================== ---- inkscape-0.45.1/src/libnrtype/Layout-TNG.h (Revision 14522) -+++ inkscape-0.45.1/src/libnrtype/Layout-TNG.h (Revision 14523) -@@ -17,6 +17,7 @@ - #include "libnr/nr-rotate-ops.h" - #include - #include -+#include - #include - - #ifdef HAVE_CAIRO_PDF -Index: src/composite-undo-stack-observer.cpp -=================================================================== ---- inkscape-0.45.1/src/composite-undo-stack-observer.cpp (Revision 14522) -+++ inkscape-0.45.1/src/composite-undo-stack-observer.cpp (Revision 14523) -@@ -11,6 +11,7 @@ - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -+#include - - #include "composite-undo-stack-observer.h" - #include "xml/event.h" -Index: src/svg/itos.cpp -=================================================================== ---- inkscape-0.45.1/src/svg/itos.cpp (Revision 14522) -+++ inkscape-0.45.1/src/svg/itos.cpp (Revision 14523) -@@ -14,6 +14,7 @@ - ///////////////////////////////////////////////////////////////////////// - - // Standard include files -+#include - #include // for string - - using namespace std; -Index: src/debug/demangle.cpp -=================================================================== ---- inkscape-0.45.1/src/debug/demangle.cpp (Revision 14522) -+++ inkscape-0.45.1/src/debug/demangle.cpp (Revision 14523) -@@ -40,8 +40,8 @@ - } - - struct string_less_than { -- bool operator()(char const *a, char const *b) { -+ bool operator()(char const *a, char const *b) const { - return ( strcmp(a, b) < 0 ); - } - }; - -Index: sp-item-update-cns.cpp -=================================================================== ---- inkscape-0.45.1/src/sp-item-update-cns.cpp (Revision 14522) -+++ inkscape-0.45.1/src/sp-item-update-cns.cpp (Revision 14523) -@@ -3,6 +3,7 @@ - #include "sp-guide-constraint.h" - #include - #include -+#include - using std::find; - using std::vector; - -Index: makepath.cpp -=================================================================== ---- inkscape-0.45.1/src/libavoid/makepath.cpp (Revision 14522) -+++ inkscape-0.45.1/src/libavoid/makepath.cpp (Revision 14523) -@@ -31,7 +31,9 @@ - #include "libavoid/connector.h" - #include "libavoid/graph.h" - #include "libavoid/router.h" -+#include - #include -+#include - #include - - namespace Avoid { diff --git a/inkscape-0.45.1.tar.bz2 b/inkscape-0.45.1.tar.bz2 deleted file mode 100644 index 3cfc45b..0000000 --- a/inkscape-0.45.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:859068d81173c57f812c6679cac8ac6ced196e4e6232f29008282a6fa9beaabd -size 8834980 diff --git a/inkscape-0.46.tar.bz2 b/inkscape-0.46.tar.bz2 new file mode 100644 index 0000000..d4e3ffb --- /dev/null +++ b/inkscape-0.46.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d50f940064da47c967109d95871128e609abaeb8f0f8f11204304e3f476c4f6 +size 13371001 diff --git a/inkscape-bug-189159.patch b/inkscape-bug-189159.patch index a680ec4..066b2bd 100644 --- a/inkscape-bug-189159.patch +++ b/inkscape-bug-189159.patch @@ -1,9 +1,11 @@ ---- src/desktop-style.cpp +Index: src/desktop-style.cpp +=================================================================== +--- src/desktop-style.cpp.orig +++ src/desktop-style.cpp -@@ -474,7 +474,7 @@ - - if (paint_res->set && paint_effectively_set && paint->type == SP_PAINT_TYPE_COLOR) { +@@ -500,7 +500,7 @@ objects_query_fillstroke (GSList *object + // 2. Sum color, copy server from paint to paint_res + if (paint_res->set && paint_effectively_set && paint->isColor()) { - gfloat d[3]; + gfloat d[4]; sp_color_get_rgb_floatv (&paint->value.color, d); diff --git a/inkscape-g_assert.patch b/inkscape-g_assert.patch deleted file mode 100644 index e7bc0f1..0000000 --- a/inkscape-g_assert.patch +++ /dev/null @@ -1,318 +0,0 @@ -=== modified file 'src/attributes.cpp' ---- src/attributes.cpp 2008-01-28 23:20:47 +0000 -+++ src/attributes.cpp 2008-01-28 23:21:23 +0000 -@@ -17,6 +17,7 @@ - # include "config.h" - #endif - -+#include - #include - #include "attributes.h" - - -=== modified file 'src/color-rgba.h' ---- src/color-rgba.h 2008-01-28 23:20:47 +0000 -+++ src/color-rgba.h 2008-01-28 23:35:51 +0000 -@@ -12,6 +12,7 @@ - #ifndef SEEN_COLOR_RGBA_H - #define SEEN_COLOR_RGBA_H - -+#include - #include - #include "libnr/nr-pixops.h" - #include "decimal-round.h" - -=== modified file 'src/display/bezier-utils.cpp' ---- src/display/bezier-utils.cpp 2008-01-28 23:20:47 +0000 -+++ src/display/bezier-utils.cpp 2008-01-28 23:33:40 +0000 -@@ -33,6 +33,7 @@ - # include - #endif - -+#include - #include - #include - #include "bezier-utils.h" - -=== modified file 'src/helper/sp-marshal.cpp' ---- src/helper/sp-marshal.cpp 2008-01-28 23:20:47 +0000 -+++ src/helper/sp-marshal.cpp 2008-01-28 23:37:47 +0000 -@@ -57,10 +57,10 @@ - /* NONE:POINTER,BOOLEAN (./helper/sp-marshal.list:5) */ - void - sp_marshal_VOID__POINTER_BOOLEAN (GClosure *closure, -- GValue *return_value, -+ GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, -- gpointer invocation_hint, -+ gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) - { - typedef void (*GMarshalFunc_VOID__POINTER_BOOLEAN) (gpointer data1, -@@ -94,10 +94,10 @@ - /* NONE:POINTER,UINT (./helper/sp-marshal.list:6) */ - void - sp_marshal_VOID__POINTER_UINT (GClosure *closure, -- GValue *return_value, -+ GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, -- gpointer invocation_hint, -+ gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) - { - typedef void (*GMarshalFunc_VOID__POINTER_UINT) (gpointer data1, -@@ -131,10 +131,10 @@ - /* NONE:POINTER,DOUBLE (./helper/sp-marshal.list:7) */ - void - sp_marshal_VOID__POINTER_DOUBLE (GClosure *closure, -- GValue *return_value, -+ GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, -- gpointer invocation_hint, -+ gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) - { - typedef void (*GMarshalFunc_VOID__POINTER_DOUBLE) (gpointer data1, -@@ -168,10 +168,10 @@ - /* NONE:DOUBLE,DOUBLE (./helper/sp-marshal.list:8) */ - void - sp_marshal_VOID__DOUBLE_DOUBLE (GClosure *closure, -- GValue *return_value, -+ GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, -- gpointer invocation_hint, -+ gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) - { - typedef void (*GMarshalFunc_VOID__DOUBLE_DOUBLE) (gpointer data1, -@@ -205,10 +205,10 @@ - /* NONE:STRING,BOOL (./helper/sp-marshal.list:9) */ - void - sp_marshal_VOID__STRING_BOOLEAN (GClosure *closure, -- GValue *return_value, -+ GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, -- gpointer invocation_hint, -+ gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) - { - typedef void (*GMarshalFunc_VOID__STRING_BOOLEAN) (gpointer data1, -@@ -242,10 +242,10 @@ - /* BOOLEAN:NONE (./helper/sp-marshal.list:10) */ - void - sp_marshal_BOOLEAN__VOID (GClosure *closure, -- GValue *return_value, -+ GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, -- gpointer invocation_hint, -+ gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) - { - typedef gboolean (*GMarshalFunc_BOOLEAN__VOID) (gpointer data1, -@@ -279,10 +279,10 @@ - /* BOOLEAN:UINT (./helper/sp-marshal.list:11) */ - void - sp_marshal_BOOLEAN__UINT (GClosure *closure, -- GValue *return_value, -+ GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, -- gpointer invocation_hint, -+ gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) - { - typedef gboolean (*GMarshalFunc_BOOLEAN__UINT) (gpointer data1, -@@ -318,10 +318,10 @@ - /* BOOLEAN:POINTER (./helper/sp-marshal.list:12) */ - void - sp_marshal_BOOLEAN__POINTER (GClosure *closure, -- GValue *return_value, -+ GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, -- gpointer invocation_hint, -+ gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) - { - typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER) (gpointer data1, -@@ -357,10 +357,10 @@ - /* BOOLEAN:POINTER,UINT (./helper/sp-marshal.list:13) */ - void - sp_marshal_BOOLEAN__POINTER_UINT (GClosure *closure, -- GValue *return_value, -+ GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, -- gpointer invocation_hint, -+ gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) - { - typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER_UINT) (gpointer data1, -@@ -398,10 +398,10 @@ - /* BOOLEAN:POINTER,POINTER (./helper/sp-marshal.list:14) */ - void - sp_marshal_BOOLEAN__POINTER_POINTER (GClosure *closure, -- GValue *return_value, -+ GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, -- gpointer invocation_hint, -+ gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) - { - typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER_POINTER) (gpointer data1, -@@ -439,10 +439,10 @@ - /* INT:POINTER,POINTER (./helper/sp-marshal.list:15) */ - void - sp_marshal_INT__POINTER_POINTER (GClosure *closure, -- GValue *return_value, -+ GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, -- gpointer invocation_hint, -+ gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) - { - typedef gint (*GMarshalFunc_INT__POINTER_POINTER) (gpointer data1, -@@ -480,10 +480,10 @@ - /* DOUBLE:POINTER,UINT (./helper/sp-marshal.list:16) */ - void - sp_marshal_DOUBLE__POINTER_UINT (GClosure *closure, -- GValue *return_value, -+ GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, -- gpointer invocation_hint, -+ gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) - { - typedef gdouble (*GMarshalFunc_DOUBLE__POINTER_UINT) (gpointer data1, - -=== modified file 'src/helper/units.cpp' ---- src/helper/units.cpp 2008-01-28 23:20:47 +0000 -+++ src/helper/units.cpp 2008-01-28 23:38:40 +0000 -@@ -19,6 +19,7 @@ - # include "config.h" - #endif - -+#include - #include "helper/units.h" - #include - #include "unit-constants.h" - -=== modified file 'src/io/resource.cpp' ---- src/io/resource.cpp 2008-01-28 23:20:47 +0000 -+++ src/io/resource.cpp 2008-01-28 23:40:15 +0000 -@@ -16,6 +16,8 @@ - #include "config.h" - #endif - -+#include -+ - #include - #include - #include - -=== modified file 'src/libnr/nr-matrix.h' ---- src/libnr/nr-matrix.h 2008-01-28 23:20:47 +0000 -+++ src/libnr/nr-matrix.h 2008-01-28 23:26:28 +0000 -@@ -17,6 +17,7 @@ - * This code is in public domain. - */ - -+#include - #include - - #include "libnr/nr-coord.h" - -=== modified file 'src/svg/svg-color.cpp' ---- src/svg/svg-color.cpp 2008-01-28 23:20:47 +0000 -+++ src/svg/svg-color.cpp 2008-01-28 23:49:06 +0000 -@@ -22,6 +22,7 @@ - #include "svg-icc-color.h" - #include - #include -+#include - #include - #include - #include - -=== modified file 'src/svg/svg-path.cpp' ---- src/svg/svg-path.cpp 2008-01-28 23:20:47 +0000 -+++ src/svg/svg-path.cpp 2008-01-28 23:49:27 +0000 -@@ -27,6 +27,7 @@ - */ - - #include -+#include - #include - #include - #include - -=== modified file 'src/xml/composite-node-observer.cpp' ---- src/xml/composite-node-observer.cpp 2008-01-28 23:20:47 +0000 -+++ src/xml/composite-node-observer.cpp 2008-01-28 23:49:50 +0000 -@@ -12,6 +12,7 @@ - * - */ - -+#include - #include - #include "algorithms/find-if-before.h" - #include "xml/composite-node-observer.h" - -=== modified file 'src/xml/event.cpp' ---- src/xml/event.cpp 2008-01-28 23:20:47 +0000 -+++ src/xml/event.cpp 2008-01-28 23:52:19 +0000 -@@ -13,6 +13,7 @@ - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -+#include - #include "event.h" - #include "event-fns.h" - #include "util/reverse-list.h" - -=== modified file 'src/xml/node-fns.cpp' ---- src/xml/node-fns.cpp 2008-01-28 23:20:47 +0000 -+++ src/xml/node-fns.cpp 2008-01-28 23:50:19 +0000 -@@ -2,6 +2,7 @@ - # include "config.h" - #endif - -+#include - #include - #include - #include - -=== modified file 'src/xml/repr-css.cpp' ---- src/xml/repr-css.cpp 2008-01-28 23:20:47 +0000 -+++ src/xml/repr-css.cpp 2008-01-28 23:50:05 +0000 -@@ -4,7 +4,7 @@ - - #define SP_REPR_CSS_C - -- -+#include - #include - #include - #include "xml/repr.h" - -=== modified file 'src/xml/simple-node.h' ---- src/xml/simple-node.h 2008-01-28 23:20:47 +0000 -+++ src/xml/simple-node.h 2008-01-28 23:50:38 +0000 -@@ -15,6 +15,7 @@ - #ifndef SEEN_INKSCAPE_XML_SIMPLE_NODE_H - #define SEEN_INKSCAPE_XML_SIMPLE_NODE_H - -+#include - #include "xml/node.h" - #include "xml/attribute-record.h" - #include "xml/transaction-logger.h" - diff --git a/inkscape-invalid-conversion.patch b/inkscape-invalid-conversion.patch deleted file mode 100644 index 7df997e..0000000 --- a/inkscape-invalid-conversion.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- src/extension/script/inkscape_py_wrap.cpp -+++ src/extension/script/inkscape_py_wrap.cpp -@@ -802,7 +802,7 @@ - obj = pyobj; - if (PyCFunction_Check(obj)) { - /* here we get the method pointer for callbacks */ -- char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); -+ const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); - c = doc ? strstr(doc, "swig_ptr: ") : 0; - if (c) { - c += 10; -@@ -977,11 +977,11 @@ - swig_type_info **types_initial) { - int i; - for (i = 0; methods[i].ml_name; ++i) { -- char *c = methods[i].ml_doc; -+ const char *c = methods[i].ml_doc; - if (c && (c = strstr(c, "swig_ptr: "))) { - int j; - swig_const_info *ci = 0; -- char *name = c + 10; -+ const char *name = c + 10; - for (j = 0; const_table[j].type; j++) { - if (strncmp(const_table[j].name, name, - strlen(const_table[j].name)) == 0) { diff --git a/inkscape-warnings.patch b/inkscape-warnings.patch new file mode 100644 index 0000000..318a0d0 --- /dev/null +++ b/inkscape-warnings.patch @@ -0,0 +1,116 @@ +=== modified file 'src/display/nr-filter-specularlighting.cpp' +--- src/display/nr-filter-specularlighting.cpp 2008-03-28 20:56:04 +0000 ++++ src/display/nr-filter-specularlighting.cpp 2008-03-28 20:58:43 +0000 +@@ -108,8 +108,9 @@ + data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_RED]); + data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_GREEN]); + data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_BLUE]); +- data_o[j++] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]); +- } ++ data_o[j] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]); ++ j++; ++ } + out->empty = FALSE; + delete dl; + } +@@ -135,7 +136,8 @@ + data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_RED]); + data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_GREEN]); + data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_BLUE]); +- data_o[j++] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]); ++ data_o[j] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]); ++ j++; + } + out->empty = FALSE; + delete pl; +@@ -162,7 +164,8 @@ + data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_RED]); + data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_GREEN]); + data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_BLUE]); +- data_o[j++] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]); ++ data_o[j] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]); ++ j++; + } + out->empty = FALSE; + delete sl; + +=== modified file 'src/extension/internal/pov-out.cpp' +--- src/extension/internal/pov-out.cpp 2008-03-28 20:56:04 +0000 ++++ src/extension/internal/pov-out.cpp 2008-03-28 20:58:43 +0000 +@@ -133,9 +133,9 @@ + void PovOutput::vec2(double a, double b) + { + out("<"); +- out(dstr(a).c_str()); ++ out("%s", dstr(a).c_str()); + out(", "); +- out(dstr(b).c_str()); ++ out("%s", dstr(b).c_str()); + out(">"); + } + +@@ -147,11 +147,11 @@ + void PovOutput::vec3(double a, double b, double c) + { + out("<"); +- out(dstr(a).c_str()); +- out(", "); +- out(dstr(b).c_str()); +- out(", "); +- out(dstr(c).c_str()); ++ out("%s", dstr(a).c_str()); ++ out(", "); ++ out("%s", dstr(b).c_str()); ++ out(", "); ++ out("%s", dstr(c).c_str()); + out(">"); + } + +@@ -163,13 +163,13 @@ + void PovOutput::vec4(double a, double b, double c, double d) + { + out("<"); +- out(dstr(a).c_str()); +- out(", "); +- out(dstr(b).c_str()); +- out(", "); +- out(dstr(c).c_str()); +- out(", "); +- out(dstr(d).c_str()); ++ out("%s", dstr(a).c_str()); ++ out(", "); ++ out("%s", dstr(b).c_str()); ++ out(", "); ++ out("%s", dstr(c).c_str()); ++ out(", "); ++ out("%s", dstr(d).c_str()); + out(">"); + } + + +=== modified file 'src/libgdl/gdl-dock-placeholder.c' +--- src/libgdl/gdl-dock-placeholder.c 2008-03-28 20:56:04 +0000 ++++ src/libgdl/gdl-dock-placeholder.c 2008-03-28 21:19:25 +0000 +@@ -491,7 +491,7 @@ + GdlDockObject *toplevel; + + if (!gdl_dock_object_is_bound (GDL_DOCK_OBJECT (ph))) { +- g_warning (_("Attempt to dock a dock object to an unbound placeholder")); ++ g_warning ("%s", _("Attempt to dock a dock object to an unbound placeholder")); + return; + } + + +=== modified file 'src/libgdl/gdl-stock.c' +--- src/libgdl/gdl-stock.c 2008-03-28 20:56:04 +0000 ++++ src/libgdl/gdl-stock.c 2008-03-28 20:58:43 +0000 +@@ -60,7 +60,7 @@ + + pixbuf = gdk_pixbuf_new_from_inline (data_size, icon_data, FALSE, &err); + if (err) { +- g_warning (err->message); ++ g_warning ("%s", err->message); + g_error_free (err); + err = NULL; + g_object_unref (source); + diff --git a/inkscape.changes b/inkscape.changes index aa07b5e..2ed5581 100644 --- a/inkscape.changes +++ b/inkscape.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Mar 28 23:18:56 CET 2008 - maw@suse.de + +- Update to version 0.46: + + Many new features and bugfeatures + + For a detailed account of what's new, see the NEWS file +- Remove stale patches: inkscape-invalid-conversion.patch, + inkscape-0.45.1-gcc43.patch, inkscape-g_assert.patch +- Respin inkscape-bug-189159.patch +- Add inkscape-warnings.patch +- Rename sr@latin to sr@Latn. + ------------------------------------------------------------------- Thu Mar 6 19:27:48 CET 2008 - maw@suse.de diff --git a/inkscape.spec b/inkscape.spec index 9b56b1c..beaf43f 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,5 +1,5 @@ # -# spec file for package inkscape (Version 0.45.1) +# spec file for package inkscape (Version 0.46) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,14 +12,14 @@ Name: inkscape -BuildRequires: cairomm docbook-toys fdupes gcc-c++ gtkmm24-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel liblcms-devel libwnck-devel libxslt-devel loudmouth-devel perl python-devel python-gtk-devel sgml-skel update-desktop-files +BuildRequires: boost-devel cairomm docbook-toys fdupes gcc-c++ gtkmm24-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel liblcms-devel libwnck-devel libxslt-devel loudmouth-devel perl python-devel python-gtk-devel sgml-skel update-desktop-files License: GPL v2 or later Group: Productivity/Graphics/Vector Editors Requires: cairomm ghostscript-fonts-std python-gtk python-numeric pstoedit libwmf gzip skencil /usr/bin/gs AutoReqProv: on Summary: Inkscape Vector Illustration Program -Version: 0.45.1 -Release: 148 +Version: 0.46 +Release: 1 Provides: sodipodi Obsoletes: sodipodi PreReq: /bin/rm /bin/ln /bin/sh /usr/bin/perl @@ -28,14 +28,13 @@ Source: %{name}-%{version}.tar.bz2 Source1: gc6.4.tar.bz2 Patch: %{name}-boehm-gc.patch Patch4: %{name}-swigfix.patch -Patch6: %{name}-invalid-conversion.patch Patch7: %{name}-bug-189159.patch Patch8: %{name}-configure.patch Patch10: gc6.4.patch Patch13: %{name}-polyutil-newpoly.patch Patch14: %{name}-buffer-overrun.patch -Patch15: inkscape-0.45.1-gcc43.patch -Patch16: inkscape-g_assert.patch +# PATCH-FIX-UPSTREAM inkscape-warnings.patch +Patch15: inkscape-warnings.patch Url: http://www.inkscape.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -95,13 +94,11 @@ Authors: %setup -q -b 1 %patch %patch4 -%patch6 %patch7 %patch8 %patch13 %patch14 -p1 -%patch15 -p1 -%patch16 +%patch15 -p0 pushd ../gc* %patch10 popd @@ -112,6 +109,9 @@ patch <