- should build now with glibmm >= 2.24.3

diff --git a/inkscape-build.patch b/inkscape-build.patch
index 93a4b89c71fe2620054aaeb4d6b714ed40413250..d884fe1f7f2e363c6e1a4f76632047dfcd6967c3 100644 (file)
--- a/inkscape-build.patch
+++ b/inkscape-build.patch
@@ -24,3 +24,191 @@ diff -urN inkscape-0.48.4.org/configure.ac inkscape-0.48.4/configure.ac
  AM_PROG_CC_C_O
  if test "$GCC" = "yes"; then
    # Enable some warnings from gcc.
+diff -urN inkscape-0.48.4.org/src/application/application.cpp inkscape-0.48.4/src/application/application.cpp
+--- inkscape-0.48.4.org/src/application/application.cpp        2011-07-08 20:25:09.000000000 +0200
++++ inkscape-0.48.4/src/application/application.cpp    2013-04-18 18:46:57.986074834 +0200
+@@ -14,6 +14,7 @@
+ # include <config.h>
+ #endif
+ 
++#include <glibmm.h>
+ #include <gtkmm/main.h>
+ 
+ #include "preferences.h"
+diff -urN inkscape-0.48.4.org/src/color-profile.cpp inkscape-0.48.4/src/color-profile.cpp
+--- inkscape-0.48.4.org/src/color-profile.cpp  2012-02-19 02:41:36.000000000 +0100
++++ inkscape-0.48.4/src/color-profile.cpp      2013-04-18 18:40:23.471833642 +0200
+@@ -6,6 +6,7 @@
+ 
+ #include <glib/gstdio.h>
+ #include <sys/fcntl.h>
++#include <glibmm.h>
+ #include <gdkmm/color.h>
+ #include <glib/gi18n.h>
+ 
+diff -urN inkscape-0.48.4.org/src/device-manager.h inkscape-0.48.4/src/device-manager.h
+--- inkscape-0.48.4.org/src/device-manager.h   2011-07-08 20:25:09.000000000 +0200
++++ inkscape-0.48.4/src/device-manager.h       2013-04-18 18:41:12.403213599 +0200
+@@ -11,6 +11,7 @@
+ 
+ 
+ #include <list>
++#include <glibmm.h>
+ #include <glibmm/ustring.h>
+ #include <gdkmm/device.h>
+ 
+diff -urN inkscape-0.48.4.org/src/dropper-context.cpp inkscape-0.48.4/src/dropper-context.cpp
+--- inkscape-0.48.4.org/src/dropper-context.cpp        2012-12-13 18:00:46.000000000 +0100
++++ inkscape-0.48.4/src/dropper-context.cpp    2013-04-18 18:41:36.673894020 +0200
+@@ -16,6 +16,7 @@
+ # include <config.h>
+ #endif
+ 
++#include <glibmm.h>
+ #include <glibmm/i18n.h>
+ #include <glibmm/ustring.h>
+ #include <glibmm/refptr.h>
+diff -urN inkscape-0.48.4.org/src/extension/implementation/implementation.h inkscape-0.48.4/src/extension/implementation/implementation.h
+--- inkscape-0.48.4.org/src/extension/implementation/implementation.h  2011-07-08 20:25:09.000000000 +0200
++++ inkscape-0.48.4/src/extension/implementation/implementation.h      2013-04-18 18:48:37.282107951 +0200
+@@ -13,6 +13,7 @@
+ #define __INKSCAPE_EXTENSION_IMPLEMENTATION_H__
+ 
+ #include <gtk/gtk.h>
++#include <glibmm.h>
+ #include <gdkmm/types.h>
+ #include <gtkmm/widget.h>
+ 
+diff -urN inkscape-0.48.4.org/src/inkview.cpp inkscape-0.48.4/src/inkview.cpp
+--- inkscape-0.48.4.org/src/inkview.cpp        2012-02-14 04:22:17.000000000 +0100
++++ inkscape-0.48.4/src/inkview.cpp    2013-04-18 18:49:49.657404010 +0200
+@@ -48,6 +48,7 @@
+ #include <gdk/gdkkeysyms.h>
+ #include <gtk/gtk.h>
+ 
++#include <glibmm.h>
+ #include <gtkmm/main.h>
+ 
+ #include "gc-core.h"
+diff -urN inkscape-0.48.4.org/src/live_effects/parameter/array.h inkscape-0.48.4/src/live_effects/parameter/array.h
+--- inkscape-0.48.4.org/src/live_effects/parameter/array.h     2012-02-14 04:22:17.000000000 +0100
++++ inkscape-0.48.4/src/live_effects/parameter/array.h 2013-04-18 18:55:16.766245615 +0200
+@@ -13,6 +13,7 @@
+ 
+ #include <glib.h>
+ 
++#include <glibmm.h>
+ #include <gtkmm/tooltips.h>
+ 
+ #include "live_effects/parameter/parameter.h"
+diff -urN inkscape-0.48.4.org/src/live_effects/parameter/path.h inkscape-0.48.4/src/live_effects/parameter/path.h
+--- inkscape-0.48.4.org/src/live_effects/parameter/path.h      2012-02-14 04:22:17.000000000 +0100
++++ inkscape-0.48.4/src/live_effects/parameter/path.h  2013-04-18 18:51:41.040418596 +0200
+@@ -12,6 +12,7 @@
+ #include <glib.h>
+ #include <2geom/path.h>
+ 
++#include <glibmm.h>
+ #include <gtkmm/tooltips.h>
+ 
+ #include "live_effects/parameter/parameter.h"
+diff -urN inkscape-0.48.4.org/src/live_effects/parameter/point.h inkscape-0.48.4/src/live_effects/parameter/point.h
+--- inkscape-0.48.4.org/src/live_effects/parameter/point.h     2012-02-14 04:22:17.000000000 +0100
++++ inkscape-0.48.4/src/live_effects/parameter/point.h 2013-04-18 18:54:39.751913279 +0200
+@@ -12,6 +12,7 @@
+ #include <glib.h>
+ #include <2geom/point.h>
+ 
++#include <glibmm.h>
+ #include <gtkmm/tooltips.h>
+ 
+ #include "live_effects/parameter/parameter.h"
+diff -urN inkscape-0.48.4.org/src/live_effects/parameter/vector.h inkscape-0.48.4/src/live_effects/parameter/vector.h
+--- inkscape-0.48.4.org/src/live_effects/parameter/vector.h    2012-02-14 04:22:17.000000000 +0100
++++ inkscape-0.48.4/src/live_effects/parameter/vector.h        2013-04-18 18:53:23.269848169 +0200
+@@ -12,6 +12,7 @@
+ #include <glib.h>
+ #include <2geom/point.h>
+ 
++#include <glibmm.h>
+ #include <gtkmm/tooltips.h>
+ 
+ #include "live_effects/parameter/parameter.h"
+diff -urN inkscape-0.48.4.org/src/selection-chemistry.cpp inkscape-0.48.4/src/selection-chemistry.cpp
+--- inkscape-0.48.4.org/src/selection-chemistry.cpp    2012-02-14 04:22:17.000000000 +0100
++++ inkscape-0.48.4/src/selection-chemistry.cpp        2013-04-18 18:43:09.013129172 +0200
+@@ -25,7 +25,7 @@
+ // TOOD fixme: This should be moved into preference repr
+ SPCycleType SP_CYCLING = SP_CYCLE_FOCUS;
+ 
+-
++#include <glibmm.h>
+ #include <gtkmm/clipboard.h>
+ 
+ #include "svg/svg.h"
+diff -urN inkscape-0.48.4.org/src/text-chemistry.cpp inkscape-0.48.4/src/text-chemistry.cpp
+--- inkscape-0.48.4.org/src/text-chemistry.cpp 2011-07-08 20:25:09.000000000 +0200
++++ inkscape-0.48.4/src/text-chemistry.cpp     2013-04-18 18:44:23.738522844 +0200
+@@ -17,6 +17,7 @@
+ 
+ #include <cstring>
+ #include <string>
++#include <glibmm.h>
+ #include <glibmm/i18n.h>
+ 
+ #include "libnr/nr-matrix-fns.h"
+diff -urN inkscape-0.48.4.org/src/text-context.cpp inkscape-0.48.4/src/text-context.cpp
+--- inkscape-0.48.4.org/src/text-context.cpp   2011-07-08 20:25:09.000000000 +0200
++++ inkscape-0.48.4/src/text-context.cpp       2013-04-18 18:45:26.073565601 +0200
+@@ -22,6 +22,7 @@
+ #include <display/sp-ctrlline.h>
+ #include <display/sodipodi-ctrlrect.h>
+ #include <display/sp-ctrlquadr.h>
++#include <glibmm.h>
+ #include <gtkmm/clipboard.h>
+ 
+ #include "macros.h"
+diff -urN inkscape-0.48.4.org/src/ui/clipboard.cpp inkscape-0.48.4/src/ui/clipboard.cpp
+--- inkscape-0.48.4.org/src/ui/clipboard.cpp   2012-02-14 04:22:17.000000000 +0100
++++ inkscape-0.48.4/src/ui/clipboard.cpp       2013-04-18 18:59:51.744602396 +0200
+@@ -23,6 +23,7 @@
+ 
+ #include <list>
+ #include <algorithm>
++#include <glibmm.h>
+ #include <gtkmm/clipboard.h>
+ #include <glibmm/ustring.h>
+ #include <glibmm/i18n.h>
+diff -urN inkscape-0.48.4.org/src/ui/dialog/inkscape-preferences.cpp inkscape-0.48.4/src/ui/dialog/inkscape-preferences.cpp
+--- inkscape-0.48.4.org/src/ui/dialog/inkscape-preferences.cpp 2012-12-13 18:00:46.000000000 +0100
++++ inkscape-0.48.4/src/ui/dialog/inkscape-preferences.cpp     2013-04-18 19:02:20.236881579 +0200
+@@ -17,6 +17,7 @@
+ # include <config.h>
+ #endif
+ 
++#include <glibmm.h>
+ #include <gtkmm/main.h>
+ #include <gtkmm/frame.h>
+ #include <gtkmm/scrolledwindow.h>
+diff -urN inkscape-0.48.4.org/src/ui/dialog/memory.cpp inkscape-0.48.4/src/ui/dialog/memory.cpp
+--- inkscape-0.48.4.org/src/ui/dialog/memory.cpp       2011-07-08 20:25:09.000000000 +0200
++++ inkscape-0.48.4/src/ui/dialog/memory.cpp   2013-04-18 19:03:14.545069899 +0200
+@@ -13,6 +13,7 @@
+ # include <config.h>
+ #endif
+ 
++#include <glibmm.h>
+ #include <glibmm/i18n.h>
+ #include <gtkmm/liststore.h>
+ #include <gtkmm/treeview.h>
+diff -urN inkscape-0.48.4.org/src/ui/tool/control-point.cpp inkscape-0.48.4/src/ui/tool/control-point.cpp
+--- inkscape-0.48.4.org/src/ui/tool/control-point.cpp  2012-02-14 04:22:17.000000000 +0100
++++ inkscape-0.48.4/src/ui/tool/control-point.cpp      2013-04-18 19:04:07.833213400 +0200
+@@ -9,6 +9,7 @@
+  */
+ 
+ #include <iostream>
++#include <glibmm.h>
+ #include <gdkmm.h>
+ #include <gtkmm.h>
+ #include <2geom/point.h>