Build fixes for new glib2.

3 files changed, 36 insertions, 8 deletions

diff --git a/emulators/gpsim/distinfo b/emulators/gpsim/distinfo
index f978214c424..e84328ed5bb 100644
--- a/emulators/gpsim/distinfo
+++ b/emulators/gpsim/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2011/12/19 15:52:18 wiz Exp $
+$NetBSD: distinfo,v 1.11 2012/05/10 06:52:52 dholland Exp $
 
 SHA1 (gpsim-0.21.11.tar.gz) = 05337560a6b48a9afb7a3f4be1ba606709f6b30a
 RMD160 (gpsim-0.21.11.tar.gz) = 36001180948fc2394043d8283dc1dd028ee4f922
 Size (gpsim-0.21.11.tar.gz) = 1218332 bytes
 SHA1 (patch-aa) = 0d102952cb8dbe7faaf50416a2d9bec24683c300
-SHA1 (patch-ab) = 14cae18eeb413e9bc911e1fcf0213d318bf88a1a
+SHA1 (patch-ab) = c67d244af2a89d679083f8b4245a7be4debf82f4
 SHA1 (patch-ac) = 1c2cf1059db73c385817199bb35672f4f2246a67
 SHA1 (patch-ad) = f172ec71e2c2ef6bb798da79e1f73c063ff27d5b
 SHA1 (patch-ae) = 5185e3cbea6d5e036020f1de9636907efe54c851
@@ -19,6 +19,7 @@ SHA1 (patch-gui_gui__stack.cc) = badf2fbda9f2f8a1f0005dab5bde4adf814aafe4
 SHA1 (patch-gui_gui__symbols.cc) = 2f36fb615029823065214a030b309ca4f36336cc
 SHA1 (patch-gui_settings__exdbm.cc) = 957854ab58bde81857a2729120a710346f89ecf6
 SHA1 (patch-modules_binary__indicator.cc) = a666710d4d93077c57163176428075416483719e
+SHA1 (patch-src_bitlog_h) = 406cfb4e4c3a8733e69fc0d9cf6692b61f9ac534
 SHA1 (patch-src_cmd__manager.h) = 1fda88495f6c4ff8a244787f19e64558f86675e0
 SHA1 (patch-src_modules.cc) = bc01b99a564051bce16c5d010635691a2b651c72
 SHA1 (patch-src_operator.cc) = 303dd4744aabc3a42fa97db3d3bebc3994c80e8a
diff --git a/emulators/gpsim/patches/patch-ab b/emulators/gpsim/patches/patch-ab
index 95d3eb178ec..96d189af9b8 100644
--- a/emulators/gpsim/patches/patch-ab
+++ b/emulators/gpsim/patches/patch-ab
@@ -1,4 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2011/12/19 15:52:20 wiz Exp $
+$NetBSD: patch-ab,v 1.7 2012/05/10 06:52:52 dholland Exp $
+
+- Use standard includes.
+- Deal with const-ness of dlerror()'s return value like gpsim-devel.
+- Fix build with latest glib2.
 
 --- src/os_dependent.cc.orig	2005-08-25 21:57:41.000000000 +0000
 +++ src/os_dependent.cc
@@ -10,18 +14,26 @@ $NetBSD: patch-ab,v 1.6 2011/12/19 15:52:20 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.6 2011/12/19 15:52:20 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/patches/patch-src_bitlog_h b/emulators/gpsim/patches/patch-src_bitlog_h
new file mode 100644
index 00000000000..8482f718b23
--- /dev/null
+++ b/emulators/gpsim/patches/patch-src_bitlog_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_bitlog_h,v 1.1 2012/05/10 06:52:52 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/bitlog.h~	2005-09-03 03:03:48.000000000 +0000
++++ src/bitlog.h
+@@ -25,7 +25,7 @@ class Cycle_Counter;
+ 
+ // include the absolute minimum portion of GLIB to get the definitions
+ // for guint64, etc.
+-#include <glibconfig.h>
++#include <glib.h>
+ 
+ /**********************************************************************
+  * boolean event logging