1 diff -urN inkscape-0.48.4.org/configure.ac inkscape-0.48.4/configure.ac
2 --- inkscape-0.48.4.org/configure.ac 2012-12-15 17:50:19.000000000 +0100
3 +++ inkscape-0.48.4/configure.ac 2013-04-18 08:23:52.486037399 +0200
8 -AM_CONFIG_HEADER(config.h)
9 +AC_CONFIG_HEADERS(config.h)
18 AC_PROG_INTLTOOL(0.22)
20 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
22 dnl These next few lines are needed only while libcroco is in our source tree.
25 if test "$GCC" = "yes"; then
26 # Enable some warnings from gcc.
27 diff -urN inkscape-0.48.4.org/src/application/application.cpp inkscape-0.48.4/src/application/application.cpp
28 --- inkscape-0.48.4.org/src/application/application.cpp 2011-07-08 20:25:09.000000000 +0200
29 +++ inkscape-0.48.4/src/application/application.cpp 2013-04-18 18:46:57.986074834 +0200
35 #include <gtkmm/main.h>
37 #include "preferences.h"
38 diff -urN inkscape-0.48.4.org/src/color-profile.cpp inkscape-0.48.4/src/color-profile.cpp
39 --- inkscape-0.48.4.org/src/color-profile.cpp 2012-02-19 02:41:36.000000000 +0100
40 +++ inkscape-0.48.4/src/color-profile.cpp 2013-04-18 18:40:23.471833642 +0200
43 #include <glib/gstdio.h>
44 #include <sys/fcntl.h>
46 #include <gdkmm/color.h>
47 #include <glib/gi18n.h>
49 diff -urN inkscape-0.48.4.org/src/device-manager.h inkscape-0.48.4/src/device-manager.h
50 --- inkscape-0.48.4.org/src/device-manager.h 2011-07-08 20:25:09.000000000 +0200
51 +++ inkscape-0.48.4/src/device-manager.h 2013-04-18 18:41:12.403213599 +0200
57 #include <glibmm/ustring.h>
58 #include <gdkmm/device.h>
60 diff -urN inkscape-0.48.4.org/src/dropper-context.cpp inkscape-0.48.4/src/dropper-context.cpp
61 --- inkscape-0.48.4.org/src/dropper-context.cpp 2012-12-13 18:00:46.000000000 +0100
62 +++ inkscape-0.48.4/src/dropper-context.cpp 2013-04-18 18:41:36.673894020 +0200
68 #include <glibmm/i18n.h>
69 #include <glibmm/ustring.h>
70 #include <glibmm/refptr.h>
71 diff -urN inkscape-0.48.4.org/src/extension/implementation/implementation.h inkscape-0.48.4/src/extension/implementation/implementation.h
72 --- inkscape-0.48.4.org/src/extension/implementation/implementation.h 2011-07-08 20:25:09.000000000 +0200
73 +++ inkscape-0.48.4/src/extension/implementation/implementation.h 2013-04-18 18:48:37.282107951 +0200
75 #define __INKSCAPE_EXTENSION_IMPLEMENTATION_H__
79 #include <gdkmm/types.h>
80 #include <gtkmm/widget.h>
82 diff -urN inkscape-0.48.4.org/src/inkview.cpp inkscape-0.48.4/src/inkview.cpp
83 --- inkscape-0.48.4.org/src/inkview.cpp 2012-02-14 04:22:17.000000000 +0100
84 +++ inkscape-0.48.4/src/inkview.cpp 2013-04-18 18:49:49.657404010 +0200
86 #include <gdk/gdkkeysyms.h>
90 #include <gtkmm/main.h>
93 diff -urN inkscape-0.48.4.org/src/live_effects/parameter/array.h inkscape-0.48.4/src/live_effects/parameter/array.h
94 --- inkscape-0.48.4.org/src/live_effects/parameter/array.h 2012-02-14 04:22:17.000000000 +0100
95 +++ inkscape-0.48.4/src/live_effects/parameter/array.h 2013-04-18 18:55:16.766245615 +0200
101 #include <gtkmm/tooltips.h>
103 #include "live_effects/parameter/parameter.h"
104 diff -urN inkscape-0.48.4.org/src/live_effects/parameter/path.h inkscape-0.48.4/src/live_effects/parameter/path.h
105 --- inkscape-0.48.4.org/src/live_effects/parameter/path.h 2012-02-14 04:22:17.000000000 +0100
106 +++ inkscape-0.48.4/src/live_effects/parameter/path.h 2013-04-18 18:51:41.040418596 +0200
109 #include <2geom/path.h>
112 #include <gtkmm/tooltips.h>
114 #include "live_effects/parameter/parameter.h"
115 diff -urN inkscape-0.48.4.org/src/live_effects/parameter/point.h inkscape-0.48.4/src/live_effects/parameter/point.h
116 --- inkscape-0.48.4.org/src/live_effects/parameter/point.h 2012-02-14 04:22:17.000000000 +0100
117 +++ inkscape-0.48.4/src/live_effects/parameter/point.h 2013-04-18 18:54:39.751913279 +0200
120 #include <2geom/point.h>
123 #include <gtkmm/tooltips.h>
125 #include "live_effects/parameter/parameter.h"
126 diff -urN inkscape-0.48.4.org/src/live_effects/parameter/vector.h inkscape-0.48.4/src/live_effects/parameter/vector.h
127 --- inkscape-0.48.4.org/src/live_effects/parameter/vector.h 2012-02-14 04:22:17.000000000 +0100
128 +++ inkscape-0.48.4/src/live_effects/parameter/vector.h 2013-04-18 18:53:23.269848169 +0200
131 #include <2geom/point.h>
134 #include <gtkmm/tooltips.h>
136 #include "live_effects/parameter/parameter.h"
137 diff -urN inkscape-0.48.4.org/src/selection-chemistry.cpp inkscape-0.48.4/src/selection-chemistry.cpp
138 --- inkscape-0.48.4.org/src/selection-chemistry.cpp 2012-02-14 04:22:17.000000000 +0100
139 +++ inkscape-0.48.4/src/selection-chemistry.cpp 2013-04-18 18:43:09.013129172 +0200
141 // TOOD fixme: This should be moved into preference repr
142 SPCycleType SP_CYCLING = SP_CYCLE_FOCUS;
146 #include <gtkmm/clipboard.h>
149 diff -urN inkscape-0.48.4.org/src/text-chemistry.cpp inkscape-0.48.4/src/text-chemistry.cpp
150 --- inkscape-0.48.4.org/src/text-chemistry.cpp 2011-07-08 20:25:09.000000000 +0200
151 +++ inkscape-0.48.4/src/text-chemistry.cpp 2013-04-18 18:44:23.738522844 +0200
157 #include <glibmm/i18n.h>
159 #include "libnr/nr-matrix-fns.h"
160 diff -urN inkscape-0.48.4.org/src/text-context.cpp inkscape-0.48.4/src/text-context.cpp
161 --- inkscape-0.48.4.org/src/text-context.cpp 2011-07-08 20:25:09.000000000 +0200
162 +++ inkscape-0.48.4/src/text-context.cpp 2013-04-18 18:45:26.073565601 +0200
164 #include <display/sp-ctrlline.h>
165 #include <display/sodipodi-ctrlrect.h>
166 #include <display/sp-ctrlquadr.h>
168 #include <gtkmm/clipboard.h>
171 diff -urN inkscape-0.48.4.org/src/ui/clipboard.cpp inkscape-0.48.4/src/ui/clipboard.cpp
172 --- inkscape-0.48.4.org/src/ui/clipboard.cpp 2012-02-14 04:22:17.000000000 +0100
173 +++ inkscape-0.48.4/src/ui/clipboard.cpp 2013-04-18 18:59:51.744602396 +0200
179 #include <gtkmm/clipboard.h>
180 #include <glibmm/ustring.h>
181 #include <glibmm/i18n.h>
182 diff -urN inkscape-0.48.4.org/src/ui/dialog/inkscape-preferences.cpp inkscape-0.48.4/src/ui/dialog/inkscape-preferences.cpp
183 --- inkscape-0.48.4.org/src/ui/dialog/inkscape-preferences.cpp 2012-12-13 18:00:46.000000000 +0100
184 +++ inkscape-0.48.4/src/ui/dialog/inkscape-preferences.cpp 2013-04-18 19:02:20.236881579 +0200
190 #include <gtkmm/main.h>
191 #include <gtkmm/frame.h>
192 #include <gtkmm/scrolledwindow.h>
193 diff -urN inkscape-0.48.4.org/src/ui/dialog/memory.cpp inkscape-0.48.4/src/ui/dialog/memory.cpp
194 --- inkscape-0.48.4.org/src/ui/dialog/memory.cpp 2011-07-08 20:25:09.000000000 +0200
195 +++ inkscape-0.48.4/src/ui/dialog/memory.cpp 2013-04-18 19:03:14.545069899 +0200
201 #include <glibmm/i18n.h>
202 #include <gtkmm/liststore.h>
203 #include <gtkmm/treeview.h>
204 diff -urN inkscape-0.48.4.org/src/ui/tool/control-point.cpp inkscape-0.48.4/src/ui/tool/control-point.cpp
205 --- inkscape-0.48.4.org/src/ui/tool/control-point.cpp 2012-02-14 04:22:17.000000000 +0100
206 +++ inkscape-0.48.4/src/ui/tool/control-point.cpp 2013-04-18 19:04:07.833213400 +0200
214 #include <2geom/point.h>
215 --- x/src/widgets/desktop-widget.h~ 2011-07-08 13:25:09.000000000 -0500
216 +++ x/src/widgets/desktop-widget.h 2013-02-15 16:04:45.806910365 -0600
219 GtkWidget *tool_toolbox;
220 GtkWidget *aux_toolbox;
221 - GtkWidget *commands_toolbox,;
222 + GtkWidget *commands_toolbox;
223 GtkWidget *snap_toolbox;
225 static void init(SPDesktopWidget *widget);