Build fixes for new glib2.

4 files changed, 49 insertions, 1 deletions

diff --git a/time/planner/distinfo b/time/planner/distinfo
index 2d38195d406..ce4f0ac19e6 100644
--- a/time/planner/distinfo
+++ b/time/planner/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.4 2009/08/05 17:14:47 drochner Exp $
+$NetBSD: distinfo,v 1.5 2012/05/07 01:34:55 dholland Exp $
 
 SHA1 (planner-0.14.4.tar.bz2) = 43ba90bd18fcd271c0da31e66d2fa1294831cf28
 RMD160 (planner-0.14.4.tar.bz2) = 61fae3ac84e703d360b1cba97410a89da876a293
 Size (planner-0.14.4.tar.bz2) = 3738005 bytes
 SHA1 (patch-aa) = 5f2d0b4e8efb62efb736741fc60f4ca87a18778d
+SHA1 (patch-eds-backend_utils_create-planner-source_c) = 3677b0bdb331a3f6488bbe25e0360df17b0334e7
+SHA1 (patch-libplanner_mrp-error_c) = fc26cad50eb743ba59cb81ec3bfd96e90b8fcaf3
+SHA1 (patch-src_eel-canvas-rect_c) = 0e52572a33c7f5b255ef52831c1458e1edfd381f
diff --git a/time/planner/patches/patch-eds-backend_utils_create-planner-source_c b/time/planner/patches/patch-eds-backend_utils_create-planner-source_c
new file mode 100644
index 00000000000..3e3f4b9efe0
--- /dev/null
+++ b/time/planner/patches/patch-eds-backend_utils_create-planner-source_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-eds-backend_utils_create-planner-source_c,v 1.1 2012/05/07 01:34:55 dholland Exp $
+
+Fix build with latest glib2.
+
+--- eds-backend/utils/create-planner-source.c~	2008-07-22 13:41:57.000000000 +0000
++++ eds-backend/utils/create-planner-source.c
+@@ -21,7 +21,7 @@
+ 
+ #include <config.h>
+ #include <gconf/gconf-client.h>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <libgnome/gnome-init.h>
+ #include <libedataserver/e-source-list.h>
+ 
diff --git a/time/planner/patches/patch-libplanner_mrp-error_c b/time/planner/patches/patch-libplanner_mrp-error_c
new file mode 100644
index 00000000000..8cdcd8feb93
--- /dev/null
+++ b/time/planner/patches/patch-libplanner_mrp-error_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-libplanner_mrp-error_c,v 1.1 2012/05/07 01:34:55 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libplanner/mrp-error.c~	2008-07-22 13:41:46.000000000 +0000
++++ libplanner/mrp-error.c
+@@ -21,7 +21,7 @@
+  */
+ 
+ #include <config.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include "mrp-error.h"
+ 
+ GQuark
diff --git a/time/planner/patches/patch-src_eel-canvas-rect_c b/time/planner/patches/patch-src_eel-canvas-rect_c
new file mode 100644
index 00000000000..1a2b489671d
--- /dev/null
+++ b/time/planner/patches/patch-src_eel-canvas-rect_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_eel-canvas-rect_c,v 1.1 2012/05/07 01:34:55 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/eel-canvas-rect.c~	2008-07-22 13:41:47.000000000 +0000
++++ src/eel-canvas-rect.c
+@@ -28,7 +28,7 @@
+ #include <math.h>
+ #include <string.h>
+ 
+-#include <glib/gstring.h>
++#include <glib.h>
+ #include <libgnomecanvas/gnome-canvas-util.h>
+ 
+ /* FIXME: check for this in configure and use it. */