More fixes for the new glib2.

12 files changed, 178 insertions, 1 deletions

diff --git a/audio/bmpx/distinfo b/audio/bmpx/distinfo
index fb50155bd2e..f02804606a6 100644
--- a/audio/bmpx/distinfo
+++ b/audio/bmpx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2012/05/06 19:27:12 dholland Exp $
+$NetBSD: distinfo,v 1.16 2012/05/06 19:35:57 dholland Exp $
 
 SHA1 (bmpx-0.40.14.tar.bz2) = 3284843c45cab302f414663a5cb31eb4373d07c7
 RMD160 (bmpx-0.40.14.tar.bz2) = 12a9939d53b58a43ee9deefa43188ac6b33dae72
@@ -16,4 +16,15 @@ SHA1 (patch-aj) = e6a9bd43cac01df156a95a688f8fd99e1383bb63
 SHA1 (patch-ak) = 10a363145c7e9f75e07ca69fc38515413fc606f8
 SHA1 (patch-library_cc) = 26cbced97d7669081eb4ff60c062a34c258c7337
 SHA1 (patch-mcs_gtk-bind.h) = e9417364df34f8baea6b279b5bc1d1b4ba0d966a
+SHA1 (patch-src_dialog-progress_hh) = cfb3caa62cbca65bc6e8c70543ad20d857f45ce5
+SHA1 (patch-src_dialog-simple-progress_hh) = 990f48d7052f2fca64f1247ee475a2b40d5bd9fe
+SHA1 (patch-src_hal_hh) = cb4046f9fca8af792641fd04f86f3efd52f58929
+SHA1 (patch-src_jamendodata-libxml2-sax_cc) = 888416fd225b58f593095f3fbef1580c5064b1b8
+SHA1 (patch-src_library_hh) = 3c7a220003b6a2accd0675ec223b89c1b843dc73
+SHA1 (patch-src_logger_hh) = 7ec25dc4d7b51d60e5390aef7b54d34efb66927e
+SHA1 (patch-src_playbacksource_cc) = 5dd3d47b8a0306c344bace766f60d23b9bcdc6d0
+SHA1 (patch-src_playbacksource_hh) = a79da6855f3d581aea66c5713f76a45ca014b50e
 SHA1 (patch-src_sanity_h) = 82acd300b2c0ad7eaf7f9a63bb0df19d4e71dd2c
+SHA1 (patch-src_shell_hh) = b799ea9358b182ccc40c9c104be8fd6548b4c9dc
+SHA1 (patch-src_ui-part-podcasts_hh) = 0b73330a4ae7e3bd7d3b6d84817482916ee291ea
+SHA1 (patch-src_urihandler_hh) = 01f4ecf27e351553ec7259deb88e91dbd1d9fd0e
diff --git a/audio/bmpx/patches/patch-src_dialog-progress_hh b/audio/bmpx/patches/patch-src_dialog-progress_hh
new file mode 100644
index 00000000000..823769e94af
--- /dev/null
+++ b/audio/bmpx/patches/patch-src_dialog-progress_hh
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_dialog-progress_hh,v 1.1 2012/05/06 19:35:57 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/dialog-progress.hh~	2008-03-05 21:31:06.000000000 +0000
++++ src/dialog-progress.hh
+@@ -31,7 +31,7 @@
+ 
+ #include <string>
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <glibmm/ustring.h>
+ #include <gtkmm/dialog.h>
+ #include <gtkmm/progressbar.h>
diff --git a/audio/bmpx/patches/patch-src_dialog-simple-progress_hh b/audio/bmpx/patches/patch-src_dialog-simple-progress_hh
new file mode 100644
index 00000000000..aee30e356d0
--- /dev/null
+++ b/audio/bmpx/patches/patch-src_dialog-simple-progress_hh
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_dialog-simple-progress_hh,v 1.1 2012/05/06 19:35:57 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/dialog-simple-progress.hh~	2008-03-05 21:31:06.000000000 +0000
++++ src/dialog-simple-progress.hh
+@@ -29,7 +29,7 @@
+ #  include <config.h>
+ #endif //HAVE_CONFIG_H
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <glibmm/ustring.h>
+ #include <gtkmm/dialog.h>
+ #include <gtkmm/progressbar.h>
diff --git a/audio/bmpx/patches/patch-src_hal_hh b/audio/bmpx/patches/patch-src_hal_hh
new file mode 100644
index 00000000000..577219bb6fe
--- /dev/null
+++ b/audio/bmpx/patches/patch-src_hal_hh
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_hal_hh,v 1.1 2012/05/06 19:35:57 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/hal.hh~	2008-04-02 20:11:49.000000000 +0000
++++ src/hal.hh
+@@ -33,7 +33,7 @@
+ #include <map>
+ #include <vector>
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <glibmm/ustring.h>
+ 
+ #include <dbus/dbus.h>
diff --git a/audio/bmpx/patches/patch-src_jamendodata-libxml2-sax_cc b/audio/bmpx/patches/patch-src_jamendodata-libxml2-sax_cc
new file mode 100644
index 00000000000..e767d95a9ed
--- /dev/null
+++ b/audio/bmpx/patches/patch-src_jamendodata-libxml2-sax_cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_jamendodata-libxml2-sax_cc,v 1.1 2012/05/06 19:35:57 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/jamendodata-libxml2-sax.cc~	2008-03-05 21:31:06.000000000 +0000
++++ src/jamendodata-libxml2-sax.cc
+@@ -29,7 +29,7 @@
+ #include <boost/format.hpp>
+ 
+ #include <glibmm/ustring.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ 
+ #include "jamendodata-libxml2-sax.hh"
+ 
diff --git a/audio/bmpx/patches/patch-src_library_hh b/audio/bmpx/patches/patch-src_library_hh
new file mode 100644
index 00000000000..4edc865f844
--- /dev/null
+++ b/audio/bmpx/patches/patch-src_library_hh
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_library_hh,v 1.1 2012/05/06 19:35:57 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/library.hh~	2008-03-05 21:31:06.000000000 +0000
++++ src/library.hh
+@@ -28,7 +28,7 @@
+ #include <vector>
+ #include <string>
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <glibmm/ustring.h>
+ #include <sigc++/signal.h>
+ 
diff --git a/audio/bmpx/patches/patch-src_logger_hh b/audio/bmpx/patches/patch-src_logger_hh
new file mode 100644
index 00000000000..40e857728b5
--- /dev/null
+++ b/audio/bmpx/patches/patch-src_logger_hh
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_logger_hh,v 1.1 2012/05/06 19:35:57 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/logger.hh~	2008-03-05 21:31:06.000000000 +0000
++++ src/logger.hh
+@@ -33,7 +33,7 @@
+ #include <fstream>
+ #include <string>
+ 
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <glibmm/thread.h>
+ #include <glibmm/ustring.h>
+ 
diff --git a/audio/bmpx/patches/patch-src_playbacksource_cc b/audio/bmpx/patches/patch-src_playbacksource_cc
new file mode 100644
index 00000000000..053aa2797d4
--- /dev/null
+++ b/audio/bmpx/patches/patch-src_playbacksource_cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_playbacksource_cc,v 1.1 2012/05/06 19:35:57 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/playbacksource.cc~	2008-03-05 21:31:06.000000000 +0000
++++ src/playbacksource.cc
+@@ -26,7 +26,7 @@
+ #endif //HAVE_CONFIG_H
+ 
+ #include <exception>
+-#include <glib/ghash.h>
++#include <glib.h>
+ #include <glibmm/ustring.h>
+ #include <glibmm/i18n.h>
+ #include <sigc++/signal.h>
diff --git a/audio/bmpx/patches/patch-src_playbacksource_hh b/audio/bmpx/patches/patch-src_playbacksource_hh
new file mode 100644
index 00000000000..c8fae651900
--- /dev/null
+++ b/audio/bmpx/patches/patch-src_playbacksource_hh
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_playbacksource_hh,v 1.1 2012/05/06 19:35:57 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/playbacksource.hh~	2008-03-05 21:31:06.000000000 +0000
++++ src/playbacksource.hh
+@@ -28,7 +28,7 @@
+ #  include <config.h>
+ #endif //HAVE_CONFIG_H
+ 
+-#include <glib/ghash.h>
++#include <glib.h>
+ #include <glibmm/ustring.h>
+ #include <sigc++/signal.h>
+ #include <boost/format.hpp>
diff --git a/audio/bmpx/patches/patch-src_shell_hh b/audio/bmpx/patches/patch-src_shell_hh
new file mode 100644
index 00000000000..991c02ab8a8
--- /dev/null
+++ b/audio/bmpx/patches/patch-src_shell_hh
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_shell_hh,v 1.1 2012/05/06 19:35:57 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/shell.hh~	2008-03-05 21:31:06.000000000 +0000
++++ src/shell.hh
+@@ -32,8 +32,7 @@
+ #include <map>
+ #include <string>
+ 
+-#include <glib/gtypes.h>
+-#include <glib/ghash.h>
++#include <glib.h>
+ #include <glibmm/main.h>
+ #include <glibmm/ustring.h>
+ #include <gdkmm/pixbuf.h>
diff --git a/audio/bmpx/patches/patch-src_ui-part-podcasts_hh b/audio/bmpx/patches/patch-src_ui-part-podcasts_hh
new file mode 100644
index 00000000000..4176415629b
--- /dev/null
+++ b/audio/bmpx/patches/patch-src_ui-part-podcasts_hh
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_ui-part-podcasts_hh,v 1.1 2012/05/06 19:35:57 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/ui-part-podcasts.hh~	2008-03-05 21:31:06.000000000 +0000
++++ src/ui-part-podcasts.hh
+@@ -34,7 +34,7 @@
+ #include <ctime>
+ #include <map>
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <glibmm/ustring.h>
+ #include <gdkmm/pixbuf.h>
+ #include <gtkmm/liststore.h>
diff --git a/audio/bmpx/patches/patch-src_urihandler_hh b/audio/bmpx/patches/patch-src_urihandler_hh
new file mode 100644
index 00000000000..b874f9c8200
--- /dev/null
+++ b/audio/bmpx/patches/patch-src_urihandler_hh
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_urihandler_hh,v 1.1 2012/05/06 19:35:58 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/urihandler.hh~	2008-03-05 21:31:06.000000000 +0000
++++ src/urihandler.hh
+@@ -28,7 +28,7 @@
+ #  include <config.h>
+ #endif //HAVE_CONFIG_H
+ 
+-#include <glib/ghash.h>
++#include <glib.h>
+ #include <glibmm/ustring.h>
+ #include <sigc++/signal.h>
+ #include <boost/format.hpp>