From e1d582211f4ae76c8278fc4506400cb7cd04257c Mon Sep 17 00:00:00 2001
From: dholland <dholland@pkgsrc.org>
Date: Thu, 10 May 2012 07:42:22 +0000
Subject: Build fix for new glib2.

---
 databases/mergeant/distinfo                             |  3 ++-
 databases/mergeant/patches/patch-src_workspace-window_c | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 databases/mergeant/patches/patch-src_workspace-window_c

(limited to 'databases')

diff --git a/databases/mergeant/distinfo b/databases/mergeant/distinfo
index 807e1e4b590..6cf73e76f88 100644
--- a/databases/mergeant/distinfo
+++ b/databases/mergeant/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.11 2007/08/04 11:26:32 obache Exp $
+$NetBSD: distinfo,v 1.12 2012/05/10 07:42:22 dholland Exp $
 
 SHA1 (mergeant-0.66.tar.bz2) = 96c9405935012a5cd14437e925127ed49c7c089e
 RMD160 (mergeant-0.66.tar.bz2) = f74253fb9f939da0409c8a63ddc696dd75c0c65c
 Size (mergeant-0.66.tar.bz2) = 998987 bytes
+SHA1 (patch-src_workspace-window_c) = 4ed286e251000b7f57f052e6437dd1cd7dd10737
diff --git a/databases/mergeant/patches/patch-src_workspace-window_c b/databases/mergeant/patches/patch-src_workspace-window_c
new file mode 100644
index 00000000000..4dba2ce920e
--- /dev/null
+++ b/databases/mergeant/patches/patch-src_workspace-window_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_workspace-window_c,v 1.1 2012/05/10 07:42:22 dholland Exp $
+
+Fix build with glib2.
+
+--- src/workspace-window.c~	2007-03-06 19:26:56.000000000 +0000
++++ src/workspace-window.c
+@@ -24,7 +24,7 @@
+  */
+ 
+ #include <string.h>
+-#include <glib/gspawn.h>
++#include <glib.h>
+ #include <gtk/gtkstatusbar.h>
+ #include <gtk/gtktable.h>
+ #include <glib/gi18n-lib.h>
-- 
cgit v1.2.3