Pan/Inkscape gassert in gmessage <-> gtestutils change

[John Affleck <lists+garnome lists oddment net>]

I'm not sure why more people aren't seeing this. Both Pan and Inkscape
failed to compile due to missing g_assert definitions for me and it
looks like the definition moved from gmessages to gtestutils. Attached
are patches against both pan and inkscape to rectify the situation.

  John A.

--- pan-0.132/pan/data-impl/headers.cc.orig	2008-03-26 18:34:33.149449410 -0400
+++ pan-0.132/pan/data-impl/headers.cc	2008-03-26 18:35:03.222055916 -0400
@@ -28,7 +28,7 @@ extern "C" {
   #include <sys/types.h> // for chmod
   #include <sys/stat.h> // for chmod
   #include <glib/gi18n.h>
-  #include <glib/gmessages.h> // for g_assert
+  #include <glib/gtestutils.h> // for g_assert
 }
 #include <pan/general/debug.h>
 #include <pan/general/foreach.h>
--- pan-0.132/pan/data-impl/my-tree.cc.orig	2008-03-26 18:34:06.272057356 -0400
+++ pan-0.132/pan/data-impl/my-tree.cc	2008-03-26 18:35:14.229349723 -0400
@@ -19,7 +19,7 @@
 
 #include <config.h>
 #include <cassert>
-#include <glib/gmessages.h> // for g_assert
+#include <glib/gtestutils.h> // for g_assert
 #include <pan/general/debug.h>
 #include <pan/general/foreach.h>
 #include <pan/general/quark.h>

--- inkscape-0.45.1/src/io/resource.cpp.orig	2007-01-15 21:46:08.000000000 -0500
+++ inkscape-0.45.1/src/io/resource.cpp	2008-03-28 09:26:17.016946256 -0400
@@ -16,7 +16,7 @@
 #include "config.h"
 #endif
 
-#include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 #include <glib/gstrfuncs.h>
 #include <glib/gfileutils.h>
 #include "path-prefix.h"
--- inkscape-0.45.1/src/svg/svg-color.cpp.orig	2007-01-15 21:45:33.000000000 -0500
+++ inkscape-0.45.1/src/svg/svg-color.cpp	2008-03-28 09:26:17.043939619 -0400
@@ -23,7 +23,7 @@
 #include <cassert>
 #include <math.h>
 #include <glib/gmem.h>
-#include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 #include <glib/gstrfuncs.h>
 #include <glib/ghash.h>
 #include <glib/gutils.h>
--- inkscape-0.45.1/src/svg/css-ostringstream.cpp.orig	2007-01-15 21:45:33.000000000 -0500
+++ inkscape-0.45.1/src/svg/css-ostringstream.cpp	2008-03-28 09:26:17.052937407 -0400
@@ -1,7 +1,7 @@
 #include "svg/css-ostringstream.h"
 #include "svg/strip-trailing-zeros.h"
 #include "prefs-utils.h"
-#include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 #include <glib/gstrfuncs.h>
 
 Inkscape::CSSOStringStream::CSSOStringStream()
--- inkscape-0.45.1/src/svg/strip-trailing-zeros.cpp.orig	2007-01-15 21:45:33.000000000 -0500
+++ inkscape-0.45.1/src/svg/strip-trailing-zeros.cpp	2008-03-28 09:26:17.023944535 -0400
@@ -1,5 +1,5 @@
 #include "svg/strip-trailing-zeros.h"
-#include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 using std::string;
 
 string
--- inkscape-0.45.1/src/svg/gnome-canvas-bpath-util.cpp.orig	2007-01-15 21:45:33.000000000 -0500
+++ inkscape-0.45.1/src/svg/gnome-canvas-bpath-util.cpp	2008-03-28 09:26:17.029943060 -0400
@@ -11,7 +11,7 @@
  */
 
 #include <glib/gmem.h>
-#include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 
 #include "libnr/n-art-bpath.h"
 #include "gnome-canvas-bpath-util.h"
--- inkscape-0.45.1/src/svg/svg-path.cpp.orig	2007-01-15 21:45:33.000000000 -0500
+++ inkscape-0.45.1/src/svg/svg-path.cpp	2008-03-28 09:26:17.035941586 -0400
@@ -28,7 +28,7 @@
 
 #include <cassert>
 #include <glib/gmem.h>
-#include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 #include <glib/gstrfuncs.h>
 
 #include "libnr/n-art-bpath.h"
--- inkscape-0.45.1/src/util/share.cpp.orig	2007-01-15 21:46:05.000000000 -0500
+++ inkscape-0.45.1/src/util/share.cpp	2008-03-28 09:26:17.063934703 -0400
@@ -10,7 +10,7 @@
  */
 
 #include "util/share.h"
-#include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 
 namespace Inkscape {
 namespace Util {
--- inkscape-0.45.1/src/color-rgba.h.orig	2007-01-15 21:46:08.000000000 -0500
+++ inkscape-0.45.1/src/color-rgba.h	2008-03-28 09:26:17.133917495 -0400
@@ -12,7 +12,7 @@
 #ifndef SEEN_COLOR_RGBA_H
 #define SEEN_COLOR_RGBA_H
 
-#include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 #include "libnr/nr-pixops.h"
 #include "decimal-round.h"
 
--- inkscape-0.45.1/src/jabber_whiteboard/inkboard-session.cpp.orig	2007-01-15 21:46:00.000000000 -0500
+++ inkscape-0.45.1/src/jabber_whiteboard/inkboard-session.cpp	2008-03-28 09:26:17.069933228 -0400
@@ -10,7 +10,7 @@
  */
 
 #include <glibmm.h>
-#include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 #include <glib/gquark.h>
 
 #include "jabber_whiteboard/inkboard-session.h"
--- inkscape-0.45.1/src/display/bezier-utils.cpp.orig	2007-01-15 21:45:15.000000000 -0500
+++ inkscape-0.45.1/src/display/bezier-utils.cpp	2008-03-28 09:26:17.076931507 -0400
@@ -33,7 +33,7 @@
 # include <ieeefp.h>
 #endif
 
-#include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 #include <glib/gmem.h>
 #include "bezier-utils.h"
 #include <libnr/nr-point-fns.h>
--- inkscape-0.45.1/src/display/nr-plain-stuff.cpp.orig	2007-01-15 21:45:15.000000000 -0500
+++ inkscape-0.45.1/src/display/nr-plain-stuff.cpp	2008-03-28 09:26:17.082930032 -0400
@@ -11,7 +11,7 @@
  * Released under GNU GPL
  */
 
-#include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 #include <libnr/nr-pixops.h>
 #include "nr-plain-stuff.h"
 
--- inkscape-0.45.1/src/debug/logger.cpp.orig	2007-03-13 14:06:21.000000000 -0400
+++ inkscape-0.45.1/src/debug/logger.cpp	2008-03-28 09:26:17.087928803 -0400
@@ -11,7 +11,7 @@
 
 #include <fstream>
 #include <vector>
-#include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 #include "debug/logger.h"
 #include "debug/simple-event.h"
 #include "gc-alloc.h"
--- inkscape-0.45.1/src/libnr/nr-matrix.h.orig	2007-01-15 21:46:04.000000000 -0500
+++ inkscape-0.45.1/src/libnr/nr-matrix.h	2008-03-28 09:26:17.093927328 -0400
@@ -17,7 +17,7 @@
  * This code is in public domain.
  */
 
-#include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 
 #include "libnr/nr-coord.h"
 #include "libnr/nr-values.h"
--- inkscape-0.45.1/src/gc.cpp.orig	2007-01-15 21:46:08.000000000 -0500
+++ inkscape-0.45.1/src/gc.cpp	2008-03-28 09:26:17.110923149 -0400
@@ -11,7 +11,7 @@
 
 #include "gc-core.h"
 #include <stdexcept>
-#include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 #include <sigc++/functors/ptr_fun.h>
 #include <glibmm/main.h>
 
--- inkscape-0.45.1/src/gc-anchored.h.orig	2007-01-15 21:46:08.000000000 -0500
+++ inkscape-0.45.1/src/gc-anchored.h	2008-03-28 09:26:17.058935932 -0400
@@ -11,7 +11,7 @@
 #ifndef SEEN_INKSCAPE_GC_ANCHORED_H
 #define SEEN_INKSCAPE_GC_ANCHORED_H
 
-#include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 #include "gc-managed.h"
 
 namespace Inkscape {
--- inkscape-0.45.1/src/attributes.h.orig	2007-01-15 21:46:08.000000000 -0500
+++ inkscape-0.45.1/src/attributes.h	2008-03-28 09:26:17.105924378 -0400
@@ -14,7 +14,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #include <glib/gtypes.h>
-#include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 
 unsigned int sp_attribute_lookup(gchar const *key);
 unsigned char const *sp_attribute_name(unsigned int id);
--- inkscape-0.45.1/src/helper/units.h.orig	2007-01-15 21:45:40.000000000 -0500
+++ inkscape-0.45.1/src/helper/units.h	2008-03-28 09:26:17.116921674 -0400
@@ -15,7 +15,7 @@
  *
  */
 
-#include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 #include <glib/gslist.h>
 #include <glib/gtypes.h>
 #include "sp-metric.h"
--- inkscape-0.45.1/src/helper/png-write.cpp.orig	2007-01-15 21:45:40.000000000 -0500
+++ inkscape-0.45.1/src/helper/png-write.cpp	2008-03-28 09:26:17.122920199 -0400
@@ -18,7 +18,7 @@
 
 #include <interface.h>
 #include <libnr/nr-pixops.h>
-#include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 #include <png.h>
 #include "png-write.h"
 #include "io/sys.h"
--- inkscape-0.45.1/src/document-subset.cpp.orig	2007-01-15 21:46:08.000000000 -0500
+++ inkscape-0.45.1/src/document-subset.cpp	2008-03-28 09:26:17.099925853 -0400
@@ -12,7 +12,7 @@
 #include "document.h"
 #include "sp-object.h"
 
-#include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 
 #include <sigc++/signal.h>
 #include <sigc++/functors/mem_fun.h>
--- inkscape-0.45.1/src/object-hierarchy.h.orig	2007-01-15 21:46:08.000000000 -0500
+++ inkscape-0.45.1/src/object-hierarchy.h	2008-03-28 09:26:17.127918970 -0400
@@ -16,7 +16,7 @@
 #include <list>
 #include <sigc++/connection.h>
 #include <sigc++/signal.h>
-#include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 
 class SPObject;