tags 624770 + pending
tags 628226 + patch
tags 628226 + pending
thanks
Dear maintainer,
An ImageMagick transition is happening. It needs inkscape to be
up-to-date and building in sid. Therefore, I've prepared an NMU for
it (versioned as 0.48.1-2.1) and uploaded it to DELAYED/2. Please feel
free to tell me if I should delay it longer (or if I can upload
without delay).
Regards.
--
Mehdi Dogguy
diff -u inkscape-0.48.1/debian/changelog inkscape-0.48.1/debian/changelog
--- inkscape-0.48.1/debian/changelog
+++ inkscape-0.48.1/debian/changelog
@@ -1,3 +1,15 @@
+inkscape (0.48.1-2.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Fix FTBFS with gcc 4.6 (Closes: #624770), Thanks to Alex Valavanis
+ for the patch.
+ - added 04-fix-build-with-gcc4.6.dpatch
+ * Fix build issues due to missing includes (Closes: #628226), patch
+ taken from upstream.
+ - added 05-add-missing-includes.dpatch
+
+ -- Mehdi Dogguy <me...@debian.org> Mon, 30 May 2011 17:07:11 +0200
+
inkscape (0.48.1-2) unstable; urgency=low
* upload to unstable (closes: #611626)
diff -u inkscape-0.48.1/debian/patches/00list inkscape-0.48.1/debian/patches/00list
--- inkscape-0.48.1/debian/patches/00list
+++ inkscape-0.48.1/debian/patches/00list
@@ -4 +4,2 @@
-
+04-fix-build-with-gcc4.6.dpatch
+05-add-missing-includes.dpatch
only in patch2:
unchanged:
--- inkscape-0.48.1.orig/debian/patches/04-fix-build-with-gcc4.6.dpatch
+++ inkscape-0.48.1/debian/patches/04-fix-build-with-gcc4.6.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04-fix-build-with-gcc4.6.dpatch by Mehdi Dogguy <me...@debian.org>
+##
+## DP: #624770
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/Makefile.am inkscape-0.48.1/src/Makefile.am
+--- inkscape-0.48.1~/src/Makefile.am 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/Makefile.am 2011-05-30 16:36:29.000000000 +0200
+@@ -205,7 +205,7 @@
+
+ inkscape_SOURCES += main.cpp $(win32_sources)
+ inkscape_LDADD = $(all_libs)
+-inkscape_LDFLAGS = --export-dynamic $(kdeldflags) $(mwindows)
++inkscape_LDFLAGS = -Wl,--export-dynamic $(kdeldflags) $(mwindows)
+
+ inkview_SOURCES += inkview.cpp $(win32_sources)
+ inkview_LDADD = $(all_libs)
only in patch2:
unchanged:
--- inkscape-0.48.1.orig/debian/patches/05-add-missing-includes.dpatch
+++ inkscape-0.48.1/debian/patches/05-add-missing-includes.dpatch
@@ -0,0 +1,799 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05-add-missing-includes.dpatch by Mehdi Dogguy <me...@debian.org>
+##
+## DP: #628226.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/2geom/utils.h inkscape-0.48.1/src/2geom/utils.h
+--- inkscape-0.48.1~/src/2geom/utils.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/2geom/utils.h 2011-05-30 17:48:28.000000000 +0200
+@@ -35,6 +35,7 @@
+
+ #include <cmath>
+ #include <vector>
++#include <stddef.h>
+
+ namespace Geom {
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/arc-context.h inkscape-0.48.1/src/arc-context.h
+--- inkscape-0.48.1~/src/arc-context.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/arc-context.h 2011-05-30 17:47:12.000000000 +0200
+@@ -15,6 +15,7 @@
+ * Released under GNU GPL, read the file 'COPYING' for more information
+ */
+
++#include <stddef.h>
+ #include <sigc++/connection.h>
+
+ #include <2geom/point.h>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/box3d-context.h inkscape-0.48.1/src/box3d-context.h
+--- inkscape-0.48.1~/src/box3d-context.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/box3d-context.h 2011-05-30 17:47:12.000000000 +0200
+@@ -15,6 +15,7 @@
+ * Released under GNU GPL
+ */
+
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "event-context.h"
+ #include "proj_pt.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/conn-avoid-ref.h inkscape-0.48.1/src/conn-avoid-ref.h
+--- inkscape-0.48.1~/src/conn-avoid-ref.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/conn-avoid-ref.h 2011-05-30 17:47:12.000000000 +0200
+@@ -14,6 +14,7 @@
+ */
+
+ #include <glib/gslist.h>
++#include <stddef.h>
+ #include <sigc++/connection.h>
+
+ struct SPDesktop;
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/connection-pool.h inkscape-0.48.1/src/connection-pool.h
+--- inkscape-0.48.1~/src/connection-pool.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/connection-pool.h 2011-05-30 17:47:12.000000000 +0200
+@@ -3,6 +3,7 @@
+
+ #include <glib-object.h>
+ #include <gtkmm.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+
+ namespace Inkscape
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/connector-context.h inkscape-0.48.1/src/connector-context.h
+--- inkscape-0.48.1~/src/connector-context.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/connector-context.h 2011-05-30 17:47:12.000000000 +0200
+@@ -12,6 +12,7 @@
+ * Released under GNU GPL, read the file 'COPYING' for more information
+ */
+
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <sigc++/connection.h>
+ #include "event-context.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/desktop.h inkscape-0.48.1/src/desktop.h
+--- inkscape-0.48.1~/src/desktop.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/desktop.h 2011-05-30 17:47:12.000000000 +0200
+@@ -27,6 +27,7 @@
+
+ #include <gdk/gdkevents.h>
+ #include <gtk/gtktypeutils.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+
+ #include <2geom/matrix.h>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/display/canvas-temporary-item.h inkscape-0.48.1/src/display/canvas-temporary-item.h
+--- inkscape-0.48.1~/src/display/canvas-temporary-item.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/display/canvas-temporary-item.h 2011-05-30 17:47:12.000000000 +0200
+@@ -12,6 +12,7 @@
+ * Released under GNU GPL, read the file 'COPYING' for more information
+ */
+
++#include <stddef.h>
+ #include "display/display-forward.h"
+
+ #include <sigc++/sigc++.h>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/document-private.h inkscape-0.48.1/src/document-private.h
+--- inkscape-0.48.1~/src/document-private.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/document-private.h 2011-05-30 17:47:12.000000000 +0200
+@@ -14,6 +14,7 @@
+ */
+
+ #include <map>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "xml/event-fns.h"
+ #include "sp-defs.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/document-subset.h inkscape-0.48.1/src/document-subset.h
+--- inkscape-0.48.1~/src/document-subset.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/document-subset.h 2011-05-30 17:47:12.000000000 +0200
+@@ -10,6 +10,7 @@
+ #ifndef SEEN_INKSCAPE_DOCUMENT_SUBSET_H
+ #define SEEN_INKSCAPE_DOCUMENT_SUBSET_H
+
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include <sigc++/functors/slot.h>
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/document.h inkscape-0.48.1/src/document.h
+--- inkscape-0.48.1~/src/document.h 2010-08-04 18:45:00.000000000 +0200
++++ inkscape-0.48.1/src/document.h 2011-05-30 17:47:12.000000000 +0200
+@@ -17,6 +17,7 @@
+
+ #include <glib-object.h>
+ #include <gtk/gtksignal.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <sigc++/class_slot.h>
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/draw-context.h inkscape-0.48.1/src/draw-context.h
+--- inkscape-0.48.1~/src/draw-context.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/draw-context.h 2011-05-30 17:47:12.000000000 +0200
+@@ -14,6 +14,7 @@
+ * Released under GNU GPL
+ */
+
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "event-context.h"
+ #include <forward.h>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/extension/timer.h inkscape-0.48.1/src/extension/timer.h
+--- inkscape-0.48.1~/src/extension/timer.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/extension/timer.h 2011-05-30 17:47:12.000000000 +0200
+@@ -13,6 +13,7 @@
+ #ifndef INKSCAPE_EXTENSION_TIMER_H__
+ #define INKSCAPE_EXTENSION_TIMER_H__
+
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <glibmm/timeval.h>
+ #include "extension-forward.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/flood-context.h inkscape-0.48.1/src/flood-context.h
+--- inkscape-0.48.1~/src/flood-context.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/flood-context.h 2011-05-30 17:47:12.000000000 +0200
+@@ -11,6 +11,7 @@
+ * Released under GNU GPL
+ */
+
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <gtk/gtk.h>
+ #include "event-context.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/gc-alloc.h inkscape-0.48.1/src/gc-alloc.h
+--- inkscape-0.48.1~/src/gc-alloc.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/gc-alloc.h 2011-05-30 17:47:12.000000000 +0200
+@@ -16,6 +16,7 @@
+ #define SEEN_INKSCAPE_GC_ALLOC_H
+
+ #include <limits>
++#include <stddef.h>
+ #include "gc-core.h"
+
+ namespace Inkscape {
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/gc.cpp inkscape-0.48.1/src/gc.cpp
+--- inkscape-0.48.1~/src/gc.cpp 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/gc.cpp 2011-05-30 17:47:12.000000000 +0200
+@@ -16,6 +16,7 @@
+ #include <glib/gmessages.h>
+ #include <sigc++/functors/ptr_fun.h>
+ #include <glibmm/main.h>
++#include <stddef.h>
+
+ namespace Inkscape {
+ namespace GC {
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/gradient-context.h inkscape-0.48.1/src/gradient-context.h
+--- inkscape-0.48.1~/src/gradient-context.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/gradient-context.h 2011-05-30 17:47:12.000000000 +0200
+@@ -15,6 +15,7 @@
+ * Released under GNU GPL
+ */
+
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "event-context.h"
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/gradient-drag.h inkscape-0.48.1/src/gradient-drag.h
+--- inkscape-0.48.1~/src/gradient-drag.h 2010-08-04 18:45:00.000000000 +0200
++++ inkscape-0.48.1/src/gradient-drag.h 2011-05-30 17:47:12.000000000 +0200
+@@ -15,6 +15,7 @@
+ */
+
+ #include <glib/gslist.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <vector>
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/knot.h inkscape-0.48.1/src/knot.h
+--- inkscape-0.48.1~/src/knot.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/knot.h 2011-05-30 17:47:12.000000000 +0200
+@@ -20,6 +20,7 @@
+ #include "forward.h"
+ #include <2geom/point.h>
+ #include "knot-enums.h"
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+
+ class SPKnot;
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/libavoid/geomtypes.h inkscape-0.48.1/src/libavoid/geomtypes.h
+--- inkscape-0.48.1~/src/libavoid/geomtypes.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/libavoid/geomtypes.h 2011-05-30 17:47:12.000000000 +0200
+@@ -29,6 +29,7 @@
+ #ifndef AVOID_GEOMTYPES_H
+ #define AVOID_GEOMTYPES_H
+
++#include <stddef.h>
+ #include <vector>
+ #include <utility>
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/live_effects/lpeobject-reference.h inkscape-0.48.1/src/live_effects/lpeobject-reference.h
+--- inkscape-0.48.1~/src/live_effects/lpeobject-reference.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/live_effects/lpeobject-reference.h 2011-05-30 17:47:12.000000000 +0200
+@@ -11,6 +11,7 @@
+
+ #include <forward.h>
+ #include <uri-references.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+
+ namespace Inkscape {
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/live_effects/parameter/path-reference.h inkscape-0.48.1/src/live_effects/parameter/path-reference.h
+--- inkscape-0.48.1~/src/live_effects/parameter/path-reference.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/live_effects/parameter/path-reference.h 2011-05-30 17:47:12.000000000 +0200
+@@ -11,6 +11,7 @@
+
+ #include <forward.h>
+ #include <uri-references.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+
+ class Path;
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/live_effects/parameter/path.h inkscape-0.48.1/src/live_effects/parameter/path.h
+--- inkscape-0.48.1~/src/live_effects/parameter/path.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/live_effects/parameter/path.h 2011-05-30 17:47:12.000000000 +0200
+@@ -16,6 +16,7 @@
+
+ #include "live_effects/parameter/parameter.h"
+ #include "live_effects/parameter/path-reference.h"
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+
+ namespace Inkscape {
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/message-stack.h inkscape-0.48.1/src/message-stack.h
+--- inkscape-0.48.1~/src/message-stack.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/message-stack.h 2011-05-30 17:47:12.000000000 +0200
+@@ -14,6 +14,7 @@
+ #ifndef SEEN_INKSCAPE_MESSAGE_STACK_H
+ #define SEEN_INKSCAPE_MESSAGE_STACK_H
+
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <glib.h>
+ #include <stdarg.h>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/object-hierarchy.h inkscape-0.48.1/src/object-hierarchy.h
+--- inkscape-0.48.1~/src/object-hierarchy.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/object-hierarchy.h 2011-05-30 17:47:12.000000000 +0200
+@@ -14,6 +14,7 @@
+
+ #include <exception>
+ #include <list>
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include <sigc++/signal.h>
+ #include <glib/gmessages.h>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/persp3d-reference.h inkscape-0.48.1/src/persp3d-reference.h
+--- inkscape-0.48.1~/src/persp3d-reference.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/persp3d-reference.h 2011-05-30 17:47:12.000000000 +0200
+@@ -11,6 +11,7 @@
+ */
+
+ #include "uri-references.h"
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "persp3d.h"
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/rect-context.h inkscape-0.48.1/src/rect-context.h
+--- inkscape-0.48.1~/src/rect-context.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/rect-context.h 2011-05-30 17:47:12.000000000 +0200
+@@ -14,6 +14,7 @@
+ * Released under GNU GPL
+ */
+
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "event-context.h"
+ #include "libnr/nr-point.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/selcue.h inkscape-0.48.1/src/selcue.h
+--- inkscape-0.48.1~/src/selcue.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/selcue.h 2011-05-30 17:47:12.000000000 +0200
+@@ -14,6 +14,7 @@
+ */
+
+ #include <list>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+
+ class SPDesktop;
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/selection-describer.h inkscape-0.48.1/src/selection-describer.h
+--- inkscape-0.48.1~/src/selection-describer.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/selection-describer.h 2011-05-30 17:47:12.000000000 +0200
+@@ -12,6 +12,7 @@
+ #ifndef SEEN_INKSCAPE_SELECTION_DESCRIPTION_HANDLER_H
+ #define SEEN_INKSCAPE_SELECTION_DESCRIPTION_HANDLER_H
+
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "message-context.h"
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/selection.h inkscape-0.48.1/src/selection.h
+--- inkscape-0.48.1~/src/selection.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/selection.h 2011-05-30 17:47:12.000000000 +0200
+@@ -19,6 +19,7 @@
+ #include <vector>
+ #include <map>
+ #include <list>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+
+ //#include "libnr/nr-rect.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/seltrans.h inkscape-0.48.1/src/seltrans.h
+--- inkscape-0.48.1~/src/seltrans.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/seltrans.h 2011-05-30 17:47:12.000000000 +0200
+@@ -15,6 +15,7 @@
+ * Released under GNU GPL, read the file 'COPYING' for more information
+ */
+
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <2geom/point.h>
+ #include <2geom/matrix.h>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-conn-end-pair.h inkscape-0.48.1/src/sp-conn-end-pair.h
+--- inkscape-0.48.1~/src/sp-conn-end-pair.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/sp-conn-end-pair.h 2011-05-30 17:47:12.000000000 +0200
+@@ -15,6 +15,7 @@
+
+ #include "forward.h"
+ #include "libnr/nr-point.h"
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include <sigc++/functors/slot.h>
+ #include <sigc++/signal.h>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-conn-end.h inkscape-0.48.1/src/sp-conn-end.h
+--- inkscape-0.48.1~/src/sp-conn-end.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/sp-conn-end.h 2011-05-30 17:47:12.000000000 +0200
+@@ -2,6 +2,7 @@
+ #define SEEN_SP_CONN_END
+
+ #include <glib/gtypes.h>
++#include <stddef.h>
+ #include <sigc++/connection.h>
+
+ #include "sp-use-reference.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-gradient.h inkscape-0.48.1/src/sp-gradient.h
+--- inkscape-0.48.1~/src/sp-gradient.h 2010-08-04 18:45:00.000000000 +0200
++++ inkscape-0.48.1/src/sp-gradient.h 2011-05-30 17:47:12.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include "sp-gradient-units.h"
+ #include "sp-gradient-vector.h"
+
++#include <stddef.h>
+ #include <sigc++/connection.h>
+
+ struct SPGradientReference;
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-object.h inkscape-0.48.1/src/sp-object.h
+--- inkscape-0.48.1~/src/sp-object.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/sp-object.h 2011-05-30 17:47:12.000000000 +0200
+@@ -56,6 +56,7 @@
+
+
+ #include <glib-object.h>
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include <sigc++/functors/slot.h>
+ #include <sigc++/signal.h>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-offset.h inkscape-0.48.1/src/sp-offset.h
+--- inkscape-0.48.1~/src/sp-offset.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/sp-offset.h 2011-05-30 17:47:12.000000000 +0200
+@@ -16,6 +16,7 @@
+
+ #include "sp-shape.h"
+
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+
+ #define SP_TYPE_OFFSET (sp_offset_get_type ())
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-pattern.h inkscape-0.48.1/src/sp-pattern.h
+--- inkscape-0.48.1~/src/sp-pattern.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/sp-pattern.h 2011-05-30 17:47:12.000000000 +0200
+@@ -32,6 +32,7 @@
+ #include "sp-paint-server.h"
+ #include "uri-references.h"
+
++#include <stddef.h>
+ #include <sigc++/connection.h>
+
+ class SPPatternReference : public Inkscape::URIReference {
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-shape.h inkscape-0.48.1/src/sp-shape.h
+--- inkscape-0.48.1~/src/sp-shape.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/sp-shape.h 2011-05-30 17:47:12.000000000 +0200
+@@ -19,6 +19,7 @@
+ #include "sp-marker-loc.h"
+ #include <2geom/forward.h>
+
++#include <stddef.h>
+ #include <sigc++/connection.h>
+
+ #define SP_TYPE_SHAPE (sp_shape_get_type ())
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-switch.h inkscape-0.48.1/src/sp-switch.h
+--- inkscape-0.48.1~/src/sp-switch.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/sp-switch.h 2011-05-30 17:47:12.000000000 +0200
+@@ -14,6 +14,7 @@
+
+ #include "sp-item-group.h"
+
++#include <stddef.h>
+ #include <sigc++/connection.h>
+
+ #define SP_TYPE_SWITCH (CSwitch::getType())
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-text.h inkscape-0.48.1/src/sp-text.h
+--- inkscape-0.48.1~/src/sp-text.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/sp-text.h 2011-05-30 17:47:12.000000000 +0200
+@@ -14,6 +14,7 @@
+ */
+
+ #include <glib/gtypes.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "sp-item.h"
+ #include "sp-string.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-tref-reference.h inkscape-0.48.1/src/sp-tref-reference.h
+--- inkscape-0.48.1~/src/sp-tref-reference.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/sp-tref-reference.h 2011-05-30 17:47:12.000000000 +0200
+@@ -13,6 +13,7 @@
+
+ #include <forward.h>
+ #include <uri-references.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+
+ #include "util/share.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-use.h inkscape-0.48.1/src/sp-use.h
+--- inkscape-0.48.1~/src/sp-use.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/sp-use.h 2011-05-30 17:47:12.000000000 +0200
+@@ -13,6 +13,7 @@
+ * Released under GNU GPL, read the file 'COPYING' for more information
+ */
+
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "svg/svg-length.h"
+ #include "sp-item.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/spiral-context.h inkscape-0.48.1/src/spiral-context.h
+--- inkscape-0.48.1~/src/spiral-context.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/spiral-context.h 2011-05-30 17:47:12.000000000 +0200
+@@ -16,6 +16,7 @@
+ */
+
+ #include <gtk/gtktypeutils.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "event-context.h"
+ #include "libnr/nr-point.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/star-context.h inkscape-0.48.1/src/star-context.h
+--- inkscape-0.48.1~/src/star-context.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/star-context.h 2011-05-30 17:47:12.000000000 +0200
+@@ -14,6 +14,7 @@
+ * Released under GNU GPL, read the file 'COPYING' for more information
+ */
+
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "event-context.h"
+ #include "libnr/nr-point.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/strneq.h inkscape-0.48.1/src/strneq.h
+--- inkscape-0.48.1~/src/strneq.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/strneq.h 2011-05-30 17:48:50.000000000 +0200
+@@ -2,6 +2,7 @@
+ #define INKSCAPE_STRNEQ_H
+
+ #include <cstring>
++#include <stddef.h>
+
+ /** Convenience/readability wrapper for strncmp(a,b,n)==0. */
+ inline bool
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/style.h inkscape-0.48.1/src/style.h
+--- inkscape-0.48.1~/src/style.h 2010-08-04 18:45:00.000000000 +0200
++++ inkscape-0.48.1/src/style.h 2011-05-30 17:47:12.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include "uri.h"
+ #include "sp-paint-server.h"
+
++#include <stddef.h>
+ #include <sigc++/connection.h>
+
+ namespace Inkscape {
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/text-context.h inkscape-0.48.1/src/text-context.h
+--- inkscape-0.48.1~/src/text-context.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/text-context.h 2011-05-30 17:47:12.000000000 +0200
+@@ -15,6 +15,7 @@
+ */
+
+ /* #include <gdk/gdkic.h> */
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <gtk/gtkimcontext.h>
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/dialog/desktop-tracker.h inkscape-0.48.1/src/ui/dialog/desktop-tracker.h
+--- inkscape-0.48.1~/src/ui/dialog/desktop-tracker.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/ui/dialog/desktop-tracker.h 2011-05-30 17:47:12.000000000 +0200
+@@ -11,6 +11,7 @@
+ #ifndef SEEN_DIALOG_DESKTOP_TRACKER
+ #define SEEN_DIALOG_DESKTOP_TRACKER
+
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include <glib/gtypes.h>
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/dialog/document-metadata.h inkscape-0.48.1/src/ui/dialog/document-metadata.h
+--- inkscape-0.48.1~/src/ui/dialog/document-metadata.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/ui/dialog/document-metadata.h 2011-05-30 17:47:12.000000000 +0200
+@@ -14,6 +14,7 @@
+ #define INKSCAPE_UI_DIALOG_DOCUMENT_METADATA_H
+
+ #include <list>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <gtkmm/notebook.h>
+ #include <glibmm/i18n.h>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/dialog/document-properties.h inkscape-0.48.1/src/ui/dialog/document-properties.h
+--- inkscape-0.48.1~/src/ui/dialog/document-properties.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/ui/dialog/document-properties.h 2011-05-30 17:47:12.000000000 +0200
+@@ -15,6 +15,7 @@
+ #define INKSCAPE_UI_DIALOG_DOCUMENT_PREFERENCES_H
+
+ #include <list>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>//
+ #include <gtkmm/notebook.h>
+ #include <glibmm/i18n.h>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/dialog/inkscape-preferences.h inkscape-0.48.1/src/ui/dialog/inkscape-preferences.h
+--- inkscape-0.48.1~/src/ui/dialog/inkscape-preferences.h 2010-11-06 19:47:19.000000000 +0100
++++ inkscape-0.48.1/src/ui/dialog/inkscape-preferences.h 2011-05-30 17:47:12.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include <gtkmm/frame.h>
+ #include <gtkmm/notebook.h>
+ #include "ui/widget/preferences-widget.h"
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <glibmm/i18n.h>
+ #include <gtkmm/textview.h>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/tool/control-point-selection.h inkscape-0.48.1/src/ui/tool/control-point-selection.h
+--- inkscape-0.48.1~/src/ui/tool/control-point-selection.h 2010-08-04 18:45:00.000000000 +0200
++++ inkscape-0.48.1/src/ui/tool/control-point-selection.h 2011-05-30 17:47:12.000000000 +0200
+@@ -14,6 +14,7 @@
+
+ #include <memory>
+ #include <boost/optional.hpp>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <2geom/forward.h>
+ #include <2geom/point.h>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/tool/control-point.h inkscape-0.48.1/src/ui/tool/control-point.h
+--- inkscape-0.48.1~/src/ui/tool/control-point.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/ui/tool/control-point.h 2011-05-30 17:47:12.000000000 +0200
+@@ -12,6 +12,7 @@
+ #define SEEN_UI_TOOL_CONTROL_POINT_H
+
+ #include <boost/utility.hpp>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <gdkmm.h>
+ #include <gtkmm.h>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/tool/manipulator.h inkscape-0.48.1/src/ui/tool/manipulator.h
+--- inkscape-0.48.1~/src/ui/tool/manipulator.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/ui/tool/manipulator.h 2011-05-30 17:47:12.000000000 +0200
+@@ -13,6 +13,7 @@
+
+ #include <set>
+ #include <map>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <glib.h>
+ #include <gdk/gdk.h>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/tool/multi-path-manipulator.h inkscape-0.48.1/src/ui/tool/multi-path-manipulator.h
+--- inkscape-0.48.1~/src/ui/tool/multi-path-manipulator.h 2010-11-06 19:47:19.000000000 +0100
++++ inkscape-0.48.1/src/ui/tool/multi-path-manipulator.h 2011-05-30 17:47:12.000000000 +0200
+@@ -11,6 +11,7 @@
+ #ifndef SEEN_UI_TOOL_MULTI_PATH_MANIPULATOR_H
+ #define SEEN_UI_TOOL_MULTI_PATH_MANIPULATOR_H
+
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include "display/display-forward.h"
+ #include "forward.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/tool/node-tool.h inkscape-0.48.1/src/ui/tool/node-tool.h
+--- inkscape-0.48.1~/src/ui/tool/node-tool.h 2010-11-06 19:47:19.000000000 +0100
++++ inkscape-0.48.1/src/ui/tool/node-tool.h 2011-05-30 17:47:12.000000000 +0200
+@@ -14,6 +14,7 @@
+ #include <memory>
+ #include <boost/ptr_container/ptr_map.hpp>
+ #include <glib.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "event-context.h"
+ #include "forward.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/tool/node.h inkscape-0.48.1/src/ui/tool/node.h
+--- inkscape-0.48.1~/src/ui/tool/node.h 2011-01-02 05:34:09.000000000 +0100
++++ inkscape-0.48.1/src/ui/tool/node.h 2011-05-30 17:47:12.000000000 +0200
+@@ -15,6 +15,7 @@
+ #include <iterator>
+ #include <iosfwd>
+ #include <stdexcept>
++#include <stddef.h>
+ #include <tr1/functional>
+ #include <boost/utility.hpp>
+ #include <boost/shared_ptr.hpp>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/view/view.h inkscape-0.48.1/src/ui/view/view.h
+--- inkscape-0.48.1~/src/ui/view/view.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/ui/view/view.h 2011-05-30 17:47:12.000000000 +0200
+@@ -15,6 +15,7 @@
+ */
+
+ #include <gdk/gdktypes.h>
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include "message.h"
+ #include "gc-managed.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/widget/color-picker.h inkscape-0.48.1/src/ui/widget/color-picker.h
+--- inkscape-0.48.1~/src/ui/widget/color-picker.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/ui/widget/color-picker.h 2011-05-30 17:47:12.000000000 +0200
+@@ -13,6 +13,7 @@
+ #ifndef __COLOR_PICKER_H__
+ #define __COLOR_PICKER_H__
+
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <gtkmm/button.h>
+ #include <gtkmm/dialog.h>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/widget/page-sizer.h inkscape-0.48.1/src/ui/widget/page-sizer.h
+--- inkscape-0.48.1~/src/ui/widget/page-sizer.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/ui/widget/page-sizer.h 2011-05-30 17:47:12.000000000 +0200
+@@ -13,6 +13,7 @@
+ #define INKSCAPE_UI_WIDGET_PAGE_SIZER__H
+
+ #include <gtkmm.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+
+ #include "helper/units.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/widget/preferences-widget.h inkscape-0.48.1/src/ui/widget/preferences-widget.h
+--- inkscape-0.48.1~/src/ui/widget/preferences-widget.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/ui/widget/preferences-widget.h 2011-05-30 17:47:12.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include <gtkmm/drawingarea.h>
+ #include <gtkmm/frame.h>
+ #include <gtkmm/filechooserbutton.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <glibmm/i18n.h>
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/widget/selected-style.h inkscape-0.48.1/src/ui/widget/selected-style.h
+--- inkscape-0.48.1~/src/ui/widget/selected-style.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/ui/widget/selected-style.h 2011-05-30 17:47:12.000000000 +0200
+@@ -23,6 +23,7 @@
+ #include <gtkmm/adjustment.h>
+ #include <gtkmm/spinbutton.h>
+
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+
+ #include <glibmm/i18n.h>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/widget/style-subject.h inkscape-0.48.1/src/ui/widget/style-subject.h
+--- inkscape-0.48.1~/src/ui/widget/style-subject.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/ui/widget/style-subject.h 2011-05-30 17:47:12.000000000 +0200
+@@ -14,6 +14,7 @@
+ #include "libnr/nr-rect.h"
+ #include <2geom/rect.h>
+ #include "sp-item.h"
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+
+ class SPDesktop;
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/uri-references.h inkscape-0.48.1/src/uri-references.h
+--- inkscape-0.48.1~/src/uri-references.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/uri-references.h 2011-05-30 17:47:12.000000000 +0200
+@@ -13,6 +13,7 @@
+ * Released under GNU GPL, read the file 'COPYING' for more information
+ */
+
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include <sigc++/trackable.h>
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/util/forward-pointer-iterator.h inkscape-0.48.1/src/util/forward-pointer-iterator.h
+--- inkscape-0.48.1~/src/util/forward-pointer-iterator.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/util/forward-pointer-iterator.h 2011-05-30 17:47:12.000000000 +0200
+@@ -15,6 +15,7 @@
+ #define SEEN_INKSCAPE_UTIL_FORWARD_POINTER_ITERATOR_H
+
+ #include <iterator>
++#include <stddef.h>
+ #include "util/reference.h"
+
+ namespace Inkscape {
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/util/share.h inkscape-0.48.1/src/util/share.h
+--- inkscape-0.48.1~/src/util/share.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/util/share.h 2011-05-30 17:47:12.000000000 +0200
+@@ -14,6 +14,7 @@
+
+ #include "gc-core.h"
+ #include <cstring>
++#include <stddef.h>
+
+ namespace Inkscape {
+ namespace Util {
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/util/unordered-containers.h inkscape-0.48.1/src/util/unordered-containers.h
+--- inkscape-0.48.1~/src/util/unordered-containers.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/util/unordered-containers.h 2011-05-30 17:47:12.000000000 +0200
+@@ -41,6 +41,8 @@
+ # define INK_UNORDERED_MAP __gnu_cxx::hash_map
+ # define INK_HASH __gnu_cxx::hash
+
++#include <stddef.h>
++
+ namespace __gnu_cxx {
+ // hash function for pointers
+ // TR1 and Boost have this defined by default, __gnu_cxx doesn't
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/widgets/desktop-widget.h inkscape-0.48.1/src/widgets/desktop-widget.h
+--- inkscape-0.48.1~/src/widgets/desktop-widget.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/widgets/desktop-widget.h 2011-05-30 17:47:12.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include "ui/view/view-widget.h"
+ #include "ui/view/edit-widget-interface.h"
+
++#include <stddef.h>
+ #include <sigc++/connection.h>
+
+ // forward declaration
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/widgets/gradient-image.h inkscape-0.48.1/src/widgets/gradient-image.h
+--- inkscape-0.48.1~/src/widgets/gradient-image.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/widgets/gradient-image.h 2011-05-30 17:47:12.000000000 +0200
+@@ -19,6 +19,7 @@
+
+ #include <glib.h>
+
++#include <stddef.h>
+ #include <sigc++/connection.h>
+
+ #define SP_TYPE_GRADIENT_IMAGE (sp_gradient_image_get_type ())
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/widgets/gradient-vector.h inkscape-0.48.1/src/widgets/gradient-vector.h
+--- inkscape-0.48.1~/src/widgets/gradient-vector.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/widgets/gradient-vector.h 2011-05-30 17:47:12.000000000 +0200
+@@ -17,6 +17,7 @@
+
+ #include <glib.h>
+
++#include <stddef.h>
+ #include <sigc++/connection.h>
+
+ #include <gtk/gtkvbox.h>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/widgets/sp-attribute-widget.h inkscape-0.48.1/src/widgets/sp-attribute-widget.h
+--- inkscape-0.48.1~/src/widgets/sp-attribute-widget.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/widgets/sp-attribute-widget.h 2011-05-30 17:47:12.000000000 +0200
+@@ -14,6 +14,7 @@
+ #define SEEN_DIALOGS_SP_ATTRIBUTE_WIDGET_H
+
+ #include <glib.h>
++#include <stddef.h>
+ #include <sigc++/connection.h>
+
+ #define SP_TYPE_ATTRIBUTE_WIDGET (sp_attribute_widget_get_type ())
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/xml/helper-observer.h inkscape-0.48.1/src/xml/helper-observer.h
+--- inkscape-0.48.1~/src/xml/helper-observer.h 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.1/src/xml/helper-observer.h 2011-05-30 17:47:12.000000000 +0200
+@@ -5,6 +5,7 @@
+ #include "node.h"
+ #include "../sp-object.h"
+ //#include "../sp-object-repr.h"
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+
+ namespace Inkscape {
