More build fixes for new glib2.

5 files changed, 65 insertions, 1 deletions

diff --git a/databases/mysql-workbench/distinfo b/databases/mysql-workbench/distinfo
index 2712097214e..2adf1a89cc0 100644
--- a/databases/mysql-workbench/distinfo
+++ b/databases/mysql-workbench/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2012/05/07 18:40:35 dholland Exp $
+$NetBSD: distinfo,v 1.3 2012/05/09 05:38:18 dholland Exp $
 
 SHA1 (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 1d47598fb0f956ce1a0c6b1afb462e8d6beeb1ed
 RMD160 (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 60213dd583da6034d5c4f7766b0a7dbafe57100c
@@ -7,9 +7,13 @@ SHA1 (patch-backend_wbprivate_workbench_stdafx_h) = 3bfeffdbbf7b8c3922ba514c436c
 SHA1 (patch-backend_windows_wbprivate_wr_src_stdafx_h) = a42d1c33c627dd52e73f6841d759be5922950984
 SHA1 (patch-frontend_linux_linux_utilities_toolbar_manager.cpp) = cc2ecf41802836c1ce799ebdff26ad89b70f3459
 SHA1 (patch-library_base_international_file.cpp) = 55a6910d63b29db1ba8ea6d17bc7c42ac8897162
+SHA1 (patch-library_canvas_src_mdc__canvas__view__printing_cpp) = 5c3e6c6f63421aa7aa5972a38e4f5b6d87aba71f
 SHA1 (patch-library_canvas_src_mdc__canvas__view_h) = 932e1e744ba0663afa0af3d618808fa9448b058a
 SHA1 (patch-library_canvas_src_stdafx_h) = 2e10af126271958857bdb77ca400d5e2d7e9a9ce
 SHA1 (patch-library_forms_gtk_lf_panel.h) = b381ffd107e23c1c099f89ff8175b64754d88fa1
+SHA1 (patch-library_grt_src_grtpp__util_cpp) = e3b8a89c8fefd11f37a3ea7123a85857d7c14e31
+SHA1 (patch-modules_db_mysql_sqlparser_src_mysql__sql__parser__fe_cpp) = 8424f1e3bafc3cd05799bc43701059cb22245cd0
 SHA1 (patch-modules_db_mysql_sqlparser_src_stdafx_h) = 3ac7af043be0dd52fe2634e2ac49682c5d4e51de
 SHA1 (patch-modules_wb_mysql_import_src_stdafx_h) = f12583b61b29f9ae2ef3aaf30b9281dc67b230df
+SHA1 (patch-plugins_db_mysql_backend_db__plugin__be_cpp) = 2ab6955e6d769a0b0164ec9a841a1d67101bd935
 SHA1 (patch-plugins_wb_printing_backend_stdafx_h) = 490c35fce386d9e3b8bc3f801db0316c712f103c
diff --git a/databases/mysql-workbench/patches/patch-library_canvas_src_mdc__canvas__view__printing_cpp b/databases/mysql-workbench/patches/patch-library_canvas_src_mdc__canvas__view__printing_cpp
new file mode 100644
index 00000000000..30b53895672
--- /dev/null
+++ b/databases/mysql-workbench/patches/patch-library_canvas_src_mdc__canvas__view__printing_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-library_canvas_src_mdc__canvas__view__printing_cpp,v 1.1 2012/05/09 05:38:18 dholland Exp $
+
+Fix build with latest glib2.
+
+--- library/canvas/src/mdc_canvas_view_printing.cpp~	2011-03-17 12:48:31.000000000 +0000
++++ library/canvas/src/mdc_canvas_view_printing.cpp
+@@ -3,7 +3,7 @@
+ 
+ #include "mdc_canvas_view.h"
+ #include "mdc_canvas_view_printing.h"
+-#include <glib/gmessages.h>
++#include <glib.h>
+ 
+ #ifdef _WIN32
+ #include <cairo/cairo-win32.h>
diff --git a/databases/mysql-workbench/patches/patch-library_grt_src_grtpp__util_cpp b/databases/mysql-workbench/patches/patch-library_grt_src_grtpp__util_cpp
new file mode 100644
index 00000000000..bc0a7602059
--- /dev/null
+++ b/databases/mysql-workbench/patches/patch-library_grt_src_grtpp__util_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-library_grt_src_grtpp__util_cpp,v 1.1 2012/05/09 05:38:18 dholland Exp $
+
+Fix build with latest glib2.
+
+--- library/grt/src/grtpp_util.cpp~	2011-03-17 12:48:45.000000000 +0000
++++ library/grt/src/grtpp_util.cpp
+@@ -25,7 +25,7 @@
+ #include "grtpp_util.h"
+ #include "base/string_utilities.h"
+ 
+-#include <glib/gbase64.h>
++#include <glib.h>
+ 
+ using namespace grt;
+ 
diff --git a/databases/mysql-workbench/patches/patch-modules_db_mysql_sqlparser_src_mysql__sql__parser__fe_cpp b/databases/mysql-workbench/patches/patch-modules_db_mysql_sqlparser_src_mysql__sql__parser__fe_cpp
new file mode 100644
index 00000000000..0f91a730986
--- /dev/null
+++ b/databases/mysql-workbench/patches/patch-modules_db_mysql_sqlparser_src_mysql__sql__parser__fe_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-modules_db_mysql_sqlparser_src_mysql__sql__parser__fe_cpp,v 1.1 2012/05/09 05:38:18 dholland Exp $
+
+Fix build with latest glib2.
+
+--- modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp~	2011-03-17 12:48:44.000000000 +0000
++++ modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp
+@@ -20,7 +20,7 @@
+ 
+ #include "stdafx.h"
+ 
+-#include <glib/gunicode.h>
++#include <glib.h>
+ #include "grt/common.h"
+ #include "grt/grt_manager.h"
+ #include "grtdb/charset_utils.h"
diff --git a/databases/mysql-workbench/patches/patch-plugins_db_mysql_backend_db__plugin__be_cpp b/databases/mysql-workbench/patches/patch-plugins_db_mysql_backend_db__plugin__be_cpp
new file mode 100644
index 00000000000..d2809114373
--- /dev/null
+++ b/databases/mysql-workbench/patches/patch-plugins_db_mysql_backend_db__plugin__be_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-plugins_db_mysql_backend_db__plugin__be_cpp,v 1.1 2012/05/09 05:38:18 dholland Exp $
+
+Fix build with latest glib2.
+
+--- plugins/db.mysql/backend/db_plugin_be.cpp~	2011-03-17 12:48:44.000000000 +0000
++++ plugins/db.mysql/backend/db_plugin_be.cpp
+@@ -31,7 +31,7 @@
+ #include "grts/structs.db.h"
+ #include "base/string_utilities.h"
+ 
+-#include <glib/gunicode.h>
++#include <glib.h>
+ 
+ void Db_plugin::grtm(bec::GRTManager *grtm)
+ {