Build fixes for new glib2.

10 files changed, 132 insertions, 6 deletions

diff --git a/sysutils/dvdisaster/distinfo b/sysutils/dvdisaster/distinfo
index 6e69dddde11..e4f83d9d0fb 100644
--- a/sysutils/dvdisaster/distinfo
+++ b/sysutils/dvdisaster/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.5 2012/02/04 21:57:54 shattered Exp $
+$NetBSD: distinfo,v 1.6 2012/05/07 01:22:50 dholland Exp $
 
 SHA1 (dvdisaster-0.72.3.tar.bz2) = 6ed08f8e52f4b90b39134b0caf9b5f0df221b0da
 RMD160 (dvdisaster-0.72.3.tar.bz2) = 63a2dcd4387bd2bfd4632270a53e4a0dfd5a692e
 Size (dvdisaster-0.72.3.tar.bz2) = 4168126 bytes
 SHA1 (patch-aa) = 97fe33bdc514925041718992b28d75b672b4be0c
 SHA1 (patch-ab) = 5d47ca08389005d11618d6d9953f686312c716bf
-SHA1 (patch-ah) = 9cb1e03dc8c13e560a2f862811a4e828563db112
+SHA1 (patch-ah) = 0553d0e4eb4fd3ce3e3c28a77e666bbfc3677179
+SHA1 (patch-dvdisaster_h) = 2163361a9eb24da9bb852ebbd4565d41282aea83
 SHA1 (patch-scsi-netbsd.c) = 076a625291bf8d29d6339fb2209d61712ceb6b62
diff --git a/sysutils/dvdisaster/patches/patch-ah b/sysutils/dvdisaster/patches/patch-ah
index 031f6f58272..eb17cf51044 100644
--- a/sysutils/dvdisaster/patches/patch-ah
+++ b/sysutils/dvdisaster/patches/patch-ah
@@ -1,8 +1,11 @@
-$NetBSD: patch-ah,v 1.1 2007/08/05 19:15:47 joerg Exp $
+$NetBSD: patch-ah,v 1.2 2012/05/07 01:22:50 dholland Exp $
 
---- memtrack.c.orig	2007-08-01 20:40:51.000000000 +0000
+- use standard includes
+- fix build with latest glib2
+
+--- memtrack.c.orig	2011-10-02 18:32:04.000000000 +0000
 +++ memtrack.c
-@@ -21,9 +21,6 @@
+@@ -21,16 +21,12 @@
  
  #define _GNU_SOURCE
  
@@ -12,3 +15,10 @@ $NetBSD: patch-ah,v 1.1 2007/08/05 19:15:47 joerg Exp $
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
+ 
+ #include <glib.h>
+ #include <glib/gprintf.h>
+-#include <glib/gstrfuncs.h>
+ 
+ /*
+  * We're not pulling in dvdisaster.h on purpose...
diff --git a/sysutils/dvdisaster/patches/patch-dvdisaster_h b/sysutils/dvdisaster/patches/patch-dvdisaster_h
new file mode 100644
index 00000000000..06f90e61c0f
--- /dev/null
+++ b/sysutils/dvdisaster/patches/patch-dvdisaster_h
@@ -0,0 +1,19 @@
+$NetBSD: patch-dvdisaster_h,v 1.1 2012/05/07 01:22:50 dholland Exp $
+
+Fix build with new glib2.
+
+--- dvdisaster.h~	2011-10-02 18:31:44.000000000 +0000
++++ dvdisaster.h
+@@ -37,11 +37,10 @@
+ 
+ #define _GNU_SOURCE
+ 
+-//#include <glib.h>
++#include <glib.h>
+ 
+ #include <gtk/gtk.h>
+ #include <glib/gprintf.h>
+-#include <glib/gstrfuncs.h>
+ 
+ #include <ctype.h>
+ #include <errno.h>
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index 21413eaf749..ab67d8f6038 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,7 +1,13 @@
-$NetBSD: distinfo,v 1.15 2010/11/28 13:00:33 drochner Exp $
+$NetBSD: distinfo,v 1.16 2012/05/07 01:28:43 dholland Exp $
 
 SHA1 (gnome-system-monitor-2.28.2.tar.bz2) = 5fab2473914663320cf961c2bbe1a13f019edef3
 RMD160 (gnome-system-monitor-2.28.2.tar.bz2) = f2a31f4eae60a6d344cb74e6f235fb27082aecb7
 Size (gnome-system-monitor-2.28.2.tar.bz2) = 2432252 bytes
 SHA1 (patch-ab) = d0398e6309aa979ef270656ba61eac5d8f47aca2
 SHA1 (patch-ac) = db0f1b7481e08d403ba74fa28f463f1b6023139f
+SHA1 (patch-src_interface_h) = f600813d41e11e17fb60da518db08a7de9a4f89f
+SHA1 (patch-src_load-graph_h) = 24d7c0acd4d6ca16883b66efc8f7d2c9dfe88d96
+SHA1 (patch-src_lsof_h) = cf5bbf20e4899d9d48238a63f92f15b50f1dacc9
+SHA1 (patch-src_openfiles_h) = 08c37eb8ad84135f73f7fd38b2f10a76afbe8fbc
+SHA1 (patch-src_procman__gnomesu_h) = 32f06a1fffb2c0b2011dce7a5d8ddb292fafe8e5
+SHA1 (patch-src_util_cpp) = cf7e780896f413dd8b81ff2b58b4fa71d67afa2e
diff --git a/sysutils/gnome-system-monitor/patches/patch-src_interface_h b/sysutils/gnome-system-monitor/patches/patch-src_interface_h
new file mode 100644
index 00000000000..5c49eb4c1d2
--- /dev/null
+++ b/sysutils/gnome-system-monitor/patches/patch-src_interface_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_interface_h,v 1.1 2012/05/07 01:28:44 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/interface.h~	2010-02-09 13:23:26.000000000 +0000
++++ src/interface.h
+@@ -20,7 +20,7 @@
+ #ifndef _PROCMAN_INTERFACE_H_
+ #define _PROCMAN_INTERFACE_H_
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <gtk/gtk.h>
+ #include "procman.h"
+ 
diff --git a/sysutils/gnome-system-monitor/patches/patch-src_load-graph_h b/sysutils/gnome-system-monitor/patches/patch-src_load-graph_h
new file mode 100644
index 00000000000..51b579542c2
--- /dev/null
+++ b/sysutils/gnome-system-monitor/patches/patch-src_load-graph_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_load-graph_h,v 1.1 2012/05/07 01:28:44 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/load-graph.h~	2010-02-09 13:23:26.000000000 +0000
++++ src/load-graph.h
+@@ -1,7 +1,7 @@
+ #ifndef _PROCMAN_LOAD_GRAPH_H_
+ #define _PROCMAN_LOAD_GRAPH_H_
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <glibtop/cpu.h>
+ 
+ enum
diff --git a/sysutils/gnome-system-monitor/patches/patch-src_lsof_h b/sysutils/gnome-system-monitor/patches/patch-src_lsof_h
new file mode 100644
index 00000000000..cb398b4da6f
--- /dev/null
+++ b/sysutils/gnome-system-monitor/patches/patch-src_lsof_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_lsof_h,v 1.1 2012/05/07 01:28:44 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/lsof.h~	2010-02-09 13:23:26.000000000 +0000
++++ src/lsof.h
+@@ -1,7 +1,7 @@
+ #ifndef H_PROCMAN_LSOF_1161179202
+ #define H_PROCMAN_LSOF_1161179202
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include "procman.h"
+ 
+ void procman_lsof(ProcData *data);
diff --git a/sysutils/gnome-system-monitor/patches/patch-src_openfiles_h b/sysutils/gnome-system-monitor/patches/patch-src_openfiles_h
new file mode 100644
index 00000000000..77cf65ffd10
--- /dev/null
+++ b/sysutils/gnome-system-monitor/patches/patch-src_openfiles_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_openfiles_h,v 1.1 2012/05/07 01:28:44 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/openfiles.h~	2010-02-09 13:23:26.000000000 +0000
++++ src/openfiles.h
+@@ -1,7 +1,7 @@
+ #ifndef _OPENFILES_H_
+ #define _OPENFILES_H_
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #include "procman.h"
+ 
diff --git a/sysutils/gnome-system-monitor/patches/patch-src_procman__gnomesu_h b/sysutils/gnome-system-monitor/patches/patch-src_procman__gnomesu_h
new file mode 100644
index 00000000000..1900cafcbfe
--- /dev/null
+++ b/sysutils/gnome-system-monitor/patches/patch-src_procman__gnomesu_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_procman__gnomesu_h,v 1.1 2012/05/07 01:28:44 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/procman_gnomesu.h~	2010-02-09 13:23:26.000000000 +0000
++++ src/procman_gnomesu.h
+@@ -1,7 +1,7 @@
+ #ifndef H_GNOME_SYSTEM_MONITOR_GNOMESU_H_1132171917
+ #define H_GNOME_SYSTEM_MONITOR_GNOMESU_H_1132171917
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ gboolean
+ procman_gnomesu_create_root_password_dialog(const char * message);
diff --git a/sysutils/gnome-system-monitor/patches/patch-src_util_cpp b/sysutils/gnome-system-monitor/patches/patch-src_util_cpp
new file mode 100644
index 00000000000..1501b7936dc
--- /dev/null
+++ b/sysutils/gnome-system-monitor/patches/patch-src_util_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_util_cpp,v 1.1 2012/05/07 01:28:44 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/util.cpp~	2010-02-09 13:23:26.000000000 +0000
++++ src/util.cpp
+@@ -1,7 +1,7 @@
+ #include <config.h>
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ #include <gtk/gtk.h>
+ 
+ #include <glibtop/proctime.h>