Build fixes for new glib2.

3 files changed, 37 insertions, 8 deletions

diff --git a/emulators/gpsim-devel/distinfo b/emulators/gpsim-devel/distinfo
index fb714b4e9a1..8c259a286de 100644
--- a/emulators/gpsim-devel/distinfo
+++ b/emulators/gpsim-devel/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2011/12/19 15:58:40 wiz Exp $
+$NetBSD: distinfo,v 1.9 2012/05/10 07:10:49 dholland Exp $
 
 SHA1 (gpsim-20050905.tar.gz) = 46e7d0d69695961aca4324d8d3267181bd641081
 RMD160 (gpsim-20050905.tar.gz) = 1b717f0e51440c4e2db72a4bdfb90d2e8d5e4a3d
 Size (gpsim-20050905.tar.gz) = 2027957 bytes
 SHA1 (patch-aa) = f7d1c04b216ecabaf3071f92c97c7436a54f1e87
-SHA1 (patch-ab) = 5e8c56b7d5b995bd19ce9e74a657f67656af10da
+SHA1 (patch-ab) = 5e5b840c3b965484db9fece50130f25d92929f68
 SHA1 (patch-ac) = 47ff4e3cd8a9255a85519a29a61f1d1f51997965
 SHA1 (patch-ae) = 31c9ac582edf2e9e543905f0af6aed92da49f73c
 SHA1 (patch-af) = 7cc61d6a1b6476a2a120ae15f25c500693f1897f
@@ -22,6 +22,7 @@ SHA1 (patch-gui_gui__stack.cc) = 041ee43064d17e298a8457f083477729c08994eb
 SHA1 (patch-gui_gui__symbols.cc) = be4da964ee6d7e5311188d535a9cb283e7f8ba1b
 SHA1 (patch-gui_settings__exdbm.cc) = 4a5962fd13ec791ada60d0e9c8055deb5eeeff7b
 SHA1 (patch-modules_binary__indicator.cc) = d51d3c7f7b5025d268575b8336e07114d88ce249
+SHA1 (patch-src_bitlog_h) = c40862474c3b22659031f6dd36a8e1b271af47fd
 SHA1 (patch-src_cmd__manager.h) = a59cede11198ef71f902067219205f1c86c1b879
 SHA1 (patch-src_modules.cc) = bd66268e162fb3377adcb795dfecf20df611baa3
 SHA1 (patch-src_operator.cc) = 4bdb1cee156930fb817ddff3e0eda6b49731872e
diff --git a/emulators/gpsim-devel/patches/patch-ab b/emulators/gpsim-devel/patches/patch-ab
index 17943f24ee3..bcca6d11a6e 100644
--- a/emulators/gpsim-devel/patches/patch-ab
+++ b/emulators/gpsim-devel/patches/patch-ab
@@ -1,4 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2011/12/19 15:58:40 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2012/05/10 07:10:49 dholland Exp $
+
+- Use standard headers.
+- Honor constness of dlerror()'s return value on DragonFly.
+- Fix build with latest glib2.
 
 --- src/os_dependent.cc.orig	2005-08-03 18:01:01.000000000 +0000
 +++ src/os_dependent.cc
@@ -10,18 +14,26 @@ $NetBSD: patch-ab,v 1.4 2011/12/19 15:58:40 wiz Exp $
  
  #include <iostream>
  #include <iomanip>
-@@ -37,6 +38,10 @@ Boston, MA 02111-1307, USA.  */
+@@ -37,14 +38,16 @@ Boston, MA 02111-1307, USA.  */
  #include "exports.h"
  #include "modules.h"
  
 +#if defined(__DragonFly__)
-+#include <glib/gstrfuncs.h>
-+#include <glib/gmem.h>
++#include <glib.h>
 +#endif
  #ifndef _WIN32
  #include <dlfcn.h>
  #define STRICMP strcasecmp
-@@ -348,7 +353,9 @@ unsigned long get_error() {
+ #else
+ #define G_PLATFORM_WIN32
+ #define G_OS_WIN32
+-#include <glib/gmem.h>
+-#include <glib/gwin32.h>
++#include <glib.h>
+ #include <direct.h>
+ #include <windows.h>
+ 
+@@ -348,7 +351,9 @@ unsigned long get_error() {
  }
  
  char * get_error_message() {
@@ -32,7 +44,7 @@ $NetBSD: patch-ab,v 1.4 2011/12/19 15:58:40 wiz Exp $
    return dlerror();
  #else
    return g_win32_error_message(GetLastError());
-@@ -357,7 +364,7 @@ char * get_error_message() {
+@@ -357,7 +362,7 @@ char * get_error_message() {
  
  void free_error_message(char * pszError)
  {
diff --git a/emulators/gpsim-devel/patches/patch-src_bitlog_h b/emulators/gpsim-devel/patches/patch-src_bitlog_h
new file mode 100644
index 00000000000..31665cd0e6b
--- /dev/null
+++ b/emulators/gpsim-devel/patches/patch-src_bitlog_h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_bitlog_h,v 1.1 2012/05/10 07:10:49 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/bitlog.h~	2005-09-05 09:39:36.000000000 +0000
++++ src/bitlog.h
+@@ -25,7 +25,8 @@ class Cycle_Counter;
+ 
+ // include the absolute minimum portion of GLIB to get the definitions
+ // for guint64, etc.
+-#include <glibconfig.h>
++// -- no such luck for you!
++#include <glib.h>
+ 
+ /**********************************************************************
+  * boolean event logging