Build fixes for new glib2.

4 files changed, 50 insertions, 1 deletions

diff --git a/misc/gelemental/distinfo b/misc/gelemental/distinfo
index 75b4f67c097..79b7adbb837 100644
--- a/misc/gelemental/distinfo
+++ b/misc/gelemental/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.2 2011/11/25 22:09:13 joerg Exp $
+$NetBSD: distinfo,v 1.3 2012/05/06 23:07:05 dholland Exp $
 
 SHA1 (gelemental-1.2.0.tar.bz2) = 5640c8912de555eddf72924c866831249d0fdd28
 RMD160 (gelemental-1.2.0.tar.bz2) = a54b29e853d4861f4fd5adb947816cb0f736d2bc
 Size (gelemental-1.2.0.tar.bz2) = 460757 bytes
 SHA1 (patch-aa) = bef3bc522e630b5f5674b75bb9713a844e38b66f
+SHA1 (patch-libelemental_misc_extras_cc) = 5b65d9d3b26ff81f96a3af9a0de2552c79b2c957
+SHA1 (patch-libelemental_misc_widgets_cc) = 1de3021e6b4790e8f879f7ed8859281bf6f768ff
 SHA1 (patch-libelemental_value.tcc) = d07bd0eda624514bf4e22a2f995cc0176d1e6a6c
+SHA1 (patch-src_main_cc) = efd05b15c0e4fc2d19c07c525ac5f20e9fb05b1c
diff --git a/misc/gelemental/patches/patch-libelemental_misc_extras_cc b/misc/gelemental/patches/patch-libelemental_misc_extras_cc
new file mode 100644
index 00000000000..b4856d47cfd
--- /dev/null
+++ b/misc/gelemental/patches/patch-libelemental_misc_extras_cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-libelemental_misc_extras_cc,v 1.1 2012/05/06 23:07:05 dholland Exp $
+
+Fix build with new glib2.
+
+--- libelemental/misc/extras.cc~	2007-09-25 04:39:02.000000000 +0000
++++ libelemental/misc/extras.cc
+@@ -21,7 +21,7 @@
+ 
+ #include <algorithm>
+ #include <stdexcept>
+-#include <glib/gmem.h>
++#include <glib.h>
+ #include <glibmm/utility.h>
+ 
+ namespace misc {
diff --git a/misc/gelemental/patches/patch-libelemental_misc_widgets_cc b/misc/gelemental/patches/patch-libelemental_misc_widgets_cc
new file mode 100644
index 00000000000..93bea397aa3
--- /dev/null
+++ b/misc/gelemental/patches/patch-libelemental_misc_widgets_cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-libelemental_misc_widgets_cc,v 1.1 2012/05/06 23:07:05 dholland Exp $
+
+Fix build with new glib2.
+
+--- libelemental/misc/widgets.cc~	2007-09-25 04:39:02.000000000 +0000
++++ libelemental/misc/widgets.cc
+@@ -20,7 +20,7 @@
+ #include "macros.hh"
+ #include "widgets.hh"
+ 
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <gtkmm/alignment.h>
+ #include <gtkmm/image.h>
+ #include <gtkmm/label.h>
diff --git a/misc/gelemental/patches/patch-src_main_cc b/misc/gelemental/patches/patch-src_main_cc
new file mode 100644
index 00000000000..78a9522af04
--- /dev/null
+++ b/misc/gelemental/patches/patch-src_main_cc
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_main_cc,v 1.1 2012/05/06 23:07:05 dholland Exp $
+
+Fix build with new glib2.
+
+--- src/main.cc~	2007-09-25 04:49:33.000000000 +0000
++++ src/main.cc
+@@ -26,8 +26,7 @@
+ #include <clocale>
+ #include <iostream>
+ #include <locale>
+-#include <glib/goption.h>
+-#include <glib/gutils.h>
++#include <glib.h>
+ #include <glibmm/optionentry.h>
+ #include <gtk/gtkaboutdialog.h>
+ #include <gtk/gtkversion.h>