Build fixes for latest glib2.

10 files changed, 146 insertions, 1 deletions

diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo
index 51b3d0bb8b3..0a5a5bb866c 100644
--- a/devel/anjuta/distinfo
+++ b/devel/anjuta/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2009/07/10 19:18:53 hasso Exp $
+$NetBSD: distinfo,v 1.22 2012/05/10 02:18:13 dholland Exp $
 
 SHA1 (anjuta-2.24.2.tar.bz2) = bcbab37d362f36bf1811bcd5c62c26c4fd31ec3e
 RMD160 (anjuta-2.24.2.tar.bz2) = 1f1a7b2820b8f7c10e05f7da0a51727f497dcb75
@@ -6,3 +6,12 @@ Size (anjuta-2.24.2.tar.bz2) = 6713913 bytes
 SHA1 (patch-aa) = 4702c50c7a0ecc94446e1b4b5dcdfbb2d84d6d42
 SHA1 (patch-ab) = d197146b046fdfa030ca2cab168b52350602206b
 SHA1 (patch-ac) = 6ffb8da0d923d5e017d10cbfebfa4d7bb0d0f155
+SHA1 (patch-libanjuta_anjuta-profile_c) = 491fa75c1538b0cd32231b82f0a313e205e172b6
+SHA1 (patch-plugins_class-gen_transform_h) = d1b225c8c5aea3cd517007a35726c6aa634e7a69
+SHA1 (patch-plugins_class-gen_window_c) = 0868212754cc1a665b986332b426ffe63a3db84f
+SHA1 (patch-plugins_project-wizard_action_c) = bcbe0fb12a022c12a584f98b885da74b65795a42
+SHA1 (patch-plugins_project-wizard_autogen_c) = d917efc838ac70b7c8765768a9dc52add5d8d951
+SHA1 (patch-plugins_project-wizard_druid_h) = 5d7ef084597164fc8806c345d7b585042bfaac67
+SHA1 (patch-plugins_project-wizard_header_c) = d4547c7ceef61c498a034a228724b0416b5ab7c8
+SHA1 (patch-plugins_project-wizard_parser_c) = ea49775bcda3331bb9c218f3f01f7dd4ed679da0
+SHA1 (patch-plugins_project-wizard_property_c) = 3878c5e3edaee349a792f8752035dc4d7b5941d3
diff --git a/devel/anjuta/patches/patch-libanjuta_anjuta-profile_c b/devel/anjuta/patches/patch-libanjuta_anjuta-profile_c
new file mode 100644
index 00000000000..eae163ee686
--- /dev/null
+++ b/devel/anjuta/patches/patch-libanjuta_anjuta-profile_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-libanjuta_anjuta-profile_c,v 1.1 2012/05/10 02:18:13 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libanjuta/anjuta-profile.c~	2008-10-19 15:36:54.000000000 +0000
++++ libanjuta/anjuta-profile.c
+@@ -28,7 +28,7 @@
+  */
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <string.h>
+ #include <libxml/parser.h>
+ #include <libxml/tree.h>
diff --git a/devel/anjuta/patches/patch-plugins_class-gen_transform_h b/devel/anjuta/patches/patch-plugins_class-gen_transform_h
new file mode 100644
index 00000000000..3405000918a
--- /dev/null
+++ b/devel/anjuta/patches/patch-plugins_class-gen_transform_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-plugins_class-gen_transform_h,v 1.1 2012/05/10 02:18:13 dholland Exp $
+
+Fix build with latest glib2.
+
+--- plugins/class-gen/transform.h~	2008-10-19 15:35:43.000000000 +0000
++++ plugins/class-gen/transform.h
+@@ -22,7 +22,7 @@
+ 
+ #include "element-editor.h"
+ 
+-#include <glib/ghash.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/devel/anjuta/patches/patch-plugins_class-gen_window_c b/devel/anjuta/patches/patch-plugins_class-gen_window_c
new file mode 100644
index 00000000000..a13301deb57
--- /dev/null
+++ b/devel/anjuta/patches/patch-plugins_class-gen_window_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-plugins_class-gen_window_c,v 1.1 2012/05/10 02:18:13 dholland Exp $
+
+Fix build with latest glib2.
+
+--- plugins/class-gen/window.c~	2008-10-19 15:35:43.000000000 +0000
++++ plugins/class-gen/window.c
+@@ -24,7 +24,7 @@
+ 
+ #include <libanjuta/anjuta-plugin.h>
+ 
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ 
+ #include <ctype.h>
+ 
diff --git a/devel/anjuta/patches/patch-plugins_project-wizard_action_c b/devel/anjuta/patches/patch-plugins_project-wizard_action_c
new file mode 100644
index 00000000000..8c789e81a6f
--- /dev/null
+++ b/devel/anjuta/patches/patch-plugins_project-wizard_action_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-plugins_project-wizard_action_c,v 1.1 2012/05/10 02:18:13 dholland Exp $
+
+Fix build with latest glib2.
+
+--- plugins/project-wizard/action.c~	2008-10-19 15:35:38.000000000 +0000
++++ plugins/project-wizard/action.c
+@@ -28,7 +28,7 @@
+ 
+ #include "action.h"
+ 
+-#include <glib/gdir.h>
++#include <glib.h>
+ 
+ /*---------------------------------------------------------------------------*/
+ 
diff --git a/devel/anjuta/patches/patch-plugins_project-wizard_autogen_c b/devel/anjuta/patches/patch-plugins_project-wizard_autogen_c
new file mode 100644
index 00000000000..c53e6644cf7
--- /dev/null
+++ b/devel/anjuta/patches/patch-plugins_project-wizard_autogen_c
@@ -0,0 +1,16 @@
+$NetBSD: patch-plugins_project-wizard_autogen_c,v 1.1 2012/05/10 02:18:13 dholland Exp $
+
+Fix build with latest glib2.
+
+--- plugins/project-wizard/autogen.c~	2008-10-19 15:35:38.000000000 +0000
++++ plugins/project-wizard/autogen.c
+@@ -36,8 +36,7 @@
+ #include <libanjuta/anjuta-launcher.h>
+ 
+ #include <glib/gstdio.h>
+-#include <glib/gfileutils.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/devel/anjuta/patches/patch-plugins_project-wizard_druid_h b/devel/anjuta/patches/patch-plugins_project-wizard_druid_h
new file mode 100644
index 00000000000..cddb4b8524a
--- /dev/null
+++ b/devel/anjuta/patches/patch-plugins_project-wizard_druid_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-plugins_project-wizard_druid_h,v 1.1 2012/05/10 02:18:13 dholland Exp $
+
+Fix build with latest glib2.
+
+--- plugins/project-wizard/druid.h~	2008-10-19 15:35:38.000000000 +0000
++++ plugins/project-wizard/druid.h
+@@ -24,7 +24,7 @@
+ #define GLADE_FILE PACKAGE_DATA_DIR"/glade/anjuta-project-wizard.glade"
+ #define ICON_FILE "anjuta-project-wizard-plugin-48.png"
+ 
+-#include <glib/gtypes.h> 
++#include <glib.h> 
+ 
+ struct _NPWPlugin;
+ typedef struct _NPWDruid NPWDruid;
diff --git a/devel/anjuta/patches/patch-plugins_project-wizard_header_c b/devel/anjuta/patches/patch-plugins_project-wizard_header_c
new file mode 100644
index 00000000000..c7d504d254b
--- /dev/null
+++ b/devel/anjuta/patches/patch-plugins_project-wizard_header_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-plugins_project-wizard_header_c,v 1.1 2012/05/10 02:18:13 dholland Exp $
+
+Fix build with latest glib2.
+
+--- plugins/project-wizard/header.c~	2008-10-19 15:35:38.000000000 +0000
++++ plugins/project-wizard/header.c
+@@ -29,7 +29,7 @@
+ 
+ #include "header.h"
+ 
+-#include <glib/gdir.h>
++#include <glib.h>
+ #include <libanjuta/anjuta-utils.h>
+ 
+ /*---------------------------------------------------------------------------*/
diff --git a/devel/anjuta/patches/patch-plugins_project-wizard_parser_c b/devel/anjuta/patches/patch-plugins_project-wizard_parser_c
new file mode 100644
index 00000000000..b962efecbe6
--- /dev/null
+++ b/devel/anjuta/patches/patch-plugins_project-wizard_parser_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-plugins_project-wizard_parser_c,v 1.1 2012/05/10 02:18:13 dholland Exp $
+
+Fix build with latest glib2.
+
+--- plugins/project-wizard/parser.c~	2008-10-19 15:35:39.000000000 +0000
++++ plugins/project-wizard/parser.c
+@@ -27,7 +27,7 @@
+ 
+ #include "parser.h"
+ 
+-#include <glib/gdir.h>
++#include <glib.h>
+ 
+ #include <string.h>
+ #include <stdarg.h>
diff --git a/devel/anjuta/patches/patch-plugins_project-wizard_property_c b/devel/anjuta/patches/patch-plugins_project-wizard_property_c
new file mode 100644
index 00000000000..48f1a70679b
--- /dev/null
+++ b/devel/anjuta/patches/patch-plugins_project-wizard_property_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-plugins_project-wizard_property_c,v 1.1 2012/05/10 02:18:13 dholland Exp $
+
+Fix build with latest glib2.
+
+--- plugins/project-wizard/property.c~	2008-10-19 15:35:38.000000000 +0000
++++ plugins/project-wizard/property.c
+@@ -27,7 +27,7 @@
+ 
+ #include "property.h"
+ 
+-#include <glib/gdir.h>
++#include <glib.h>
+ 
+ #include <gnome.h>
+ #include <glib/gi18n.h>