From ae814756780c7b6fd2bd73af74be4f584c425c7f Mon Sep 17 00:00:00 2001 From: dholland Date: Mon, 7 May 2012 18:40:35 +0000 Subject: [PATCH] Build fixes for new glib2. --- databases/mysql-workbench/distinfo | 9 ++++++++- .../patch-backend_wbprivate_workbench_stdafx_h | 14 ++++++++++++++ ...atch-backend_windows_wbprivate_wr_src_stdafx_h | 15 +++++++++++++++ .../patch-library_canvas_src_mdc__canvas__view_h | 15 +++++++++++++++ .../patches/patch-library_canvas_src_stdafx_h | 15 +++++++++++++++ .../patch-modules_db_mysql_sqlparser_src_stdafx_h | 15 +++++++++++++++ .../patch-modules_wb_mysql_import_src_stdafx_h | 15 +++++++++++++++ .../patch-plugins_wb_printing_backend_stdafx_h | 15 +++++++++++++++ 8 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 databases/mysql-workbench/patches/patch-backend_wbprivate_workbench_stdafx_h create mode 100644 databases/mysql-workbench/patches/patch-backend_windows_wbprivate_wr_src_stdafx_h create mode 100644 databases/mysql-workbench/patches/patch-library_canvas_src_mdc__canvas__view_h create mode 100644 databases/mysql-workbench/patches/patch-library_canvas_src_stdafx_h create mode 100644 databases/mysql-workbench/patches/patch-modules_db_mysql_sqlparser_src_stdafx_h create mode 100644 databases/mysql-workbench/patches/patch-modules_wb_mysql_import_src_stdafx_h create mode 100644 databases/mysql-workbench/patches/patch-plugins_wb_printing_backend_stdafx_h diff --git a/databases/mysql-workbench/distinfo b/databases/mysql-workbench/distinfo index 23fc82537851..2712097214eb 100644 --- a/databases/mysql-workbench/distinfo +++ b/databases/mysql-workbench/distinfo @@ -1,8 +1,15 @@ -$NetBSD: distinfo,v 1.1.1.1 2011/05/16 12:40:50 adam Exp $ +$NetBSD: distinfo,v 1.2 2012/05/07 18:40:35 dholland Exp $ SHA1 (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 1d47598fb0f956ce1a0c6b1afb462e8d6beeb1ed RMD160 (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 60213dd583da6034d5c4f7766b0a7dbafe57100c Size (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 17873523 bytes +SHA1 (patch-backend_wbprivate_workbench_stdafx_h) = 3bfeffdbbf7b8c3922ba514c436cb5a6f92c614b +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_h) = 932e1e744ba0663afa0af3d618808fa9448b058a +SHA1 (patch-library_canvas_src_stdafx_h) = 2e10af126271958857bdb77ca400d5e2d7e9a9ce SHA1 (patch-library_forms_gtk_lf_panel.h) = b381ffd107e23c1c099f89ff8175b64754d88fa1 +SHA1 (patch-modules_db_mysql_sqlparser_src_stdafx_h) = 3ac7af043be0dd52fe2634e2ac49682c5d4e51de +SHA1 (patch-modules_wb_mysql_import_src_stdafx_h) = f12583b61b29f9ae2ef3aaf30b9281dc67b230df +SHA1 (patch-plugins_wb_printing_backend_stdafx_h) = 490c35fce386d9e3b8bc3f801db0316c712f103c diff --git a/databases/mysql-workbench/patches/patch-backend_wbprivate_workbench_stdafx_h b/databases/mysql-workbench/patches/patch-backend_wbprivate_workbench_stdafx_h new file mode 100644 index 000000000000..d6a07d2a0211 --- /dev/null +++ b/databases/mysql-workbench/patches/patch-backend_wbprivate_workbench_stdafx_h @@ -0,0 +1,14 @@ +$NetBSD: patch-backend_wbprivate_workbench_stdafx_h,v 1.1 2012/05/07 18:40:35 dholland Exp $ + +Fix build with latest glib2. + +--- backend/wbprivate/workbench/stdafx.h~ 2011-03-17 12:48:42.000000000 +0000 ++++ backend/wbprivate/workbench/stdafx.h +@@ -39,7 +39,6 @@ + #include + + #include +-#include + + #include "grtpp.h" + #include "grtpp_util.h" diff --git a/databases/mysql-workbench/patches/patch-backend_windows_wbprivate_wr_src_stdafx_h b/databases/mysql-workbench/patches/patch-backend_windows_wbprivate_wr_src_stdafx_h new file mode 100644 index 000000000000..0c0f92487ae6 --- /dev/null +++ b/databases/mysql-workbench/patches/patch-backend_windows_wbprivate_wr_src_stdafx_h @@ -0,0 +1,15 @@ +$NetBSD: patch-backend_windows_wbprivate_wr_src_stdafx_h,v 1.1 2012/05/07 18:40:35 dholland Exp $ + +Fix build with latest glib2. + +--- backend/windows/wbprivate.wr/src/stdafx.h~ 2011-03-17 12:48:41.000000000 +0000 ++++ backend/windows/wbprivate.wr/src/stdafx.h +@@ -48,7 +48,7 @@ + + #include + +-#include ++#include + + #ifndef _WIN32 + #include diff --git a/databases/mysql-workbench/patches/patch-library_canvas_src_mdc__canvas__view_h b/databases/mysql-workbench/patches/patch-library_canvas_src_mdc__canvas__view_h new file mode 100644 index 000000000000..26ab549d5ea6 --- /dev/null +++ b/databases/mysql-workbench/patches/patch-library_canvas_src_mdc__canvas__view_h @@ -0,0 +1,15 @@ +$NetBSD: patch-library_canvas_src_mdc__canvas__view_h,v 1.1 2012/05/07 18:40:35 dholland Exp $ + +Fix build with latest glib2. + +--- library/canvas/src/mdc_canvas_view.h~ 2011-03-17 12:48:44.000000000 +0000 ++++ library/canvas/src/mdc_canvas_view.h +@@ -9,7 +9,7 @@ + #include "mdc_selection.h" + + #ifndef _WIN32 +-#include ++#include + #endif + + BEGIN_MDC_DECLS diff --git a/databases/mysql-workbench/patches/patch-library_canvas_src_stdafx_h b/databases/mysql-workbench/patches/patch-library_canvas_src_stdafx_h new file mode 100644 index 000000000000..7f432c225734 --- /dev/null +++ b/databases/mysql-workbench/patches/patch-library_canvas_src_stdafx_h @@ -0,0 +1,15 @@ +$NetBSD: patch-library_canvas_src_stdafx_h,v 1.1 2012/05/07 18:40:35 dholland Exp $ + +Fix build with latest glib2. + +--- library/canvas/src/stdafx.h~ 2011-03-17 12:48:45.000000000 +0000 ++++ library/canvas/src/stdafx.h +@@ -53,7 +53,7 @@ + #include + + +-#include ++#include + + #endif // _WIN32 + diff --git a/databases/mysql-workbench/patches/patch-modules_db_mysql_sqlparser_src_stdafx_h b/databases/mysql-workbench/patches/patch-modules_db_mysql_sqlparser_src_stdafx_h new file mode 100644 index 000000000000..a8147c27097d --- /dev/null +++ b/databases/mysql-workbench/patches/patch-modules_db_mysql_sqlparser_src_stdafx_h @@ -0,0 +1,15 @@ +$NetBSD: patch-modules_db_mysql_sqlparser_src_stdafx_h,v 1.1 2012/05/07 18:40:35 dholland Exp $ + +Fix build with latest glib2. + +--- modules/db.mysql.sqlparser/src/stdafx.h~ 2011-03-17 12:48:45.000000000 +0000 ++++ modules/db.mysql.sqlparser/src/stdafx.h +@@ -32,7 +32,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "direct.h" + diff --git a/databases/mysql-workbench/patches/patch-modules_wb_mysql_import_src_stdafx_h b/databases/mysql-workbench/patches/patch-modules_wb_mysql_import_src_stdafx_h new file mode 100644 index 000000000000..4b7c2821a500 --- /dev/null +++ b/databases/mysql-workbench/patches/patch-modules_wb_mysql_import_src_stdafx_h @@ -0,0 +1,15 @@ +$NetBSD: patch-modules_wb_mysql_import_src_stdafx_h,v 1.1 2012/05/07 18:40:35 dholland Exp $ + +Fix build with latest glib2. + +--- modules/wb.mysql.import/src/stdafx.h~ 2011-03-17 12:48:31.000000000 +0000 ++++ modules/wb.mysql.import/src/stdafx.h +@@ -10,7 +10,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "direct.h" + diff --git a/databases/mysql-workbench/patches/patch-plugins_wb_printing_backend_stdafx_h b/databases/mysql-workbench/patches/patch-plugins_wb_printing_backend_stdafx_h new file mode 100644 index 000000000000..cf6bfb3d4e4d --- /dev/null +++ b/databases/mysql-workbench/patches/patch-plugins_wb_printing_backend_stdafx_h @@ -0,0 +1,15 @@ +$NetBSD: patch-plugins_wb_printing_backend_stdafx_h,v 1.1 2012/05/07 18:40:35 dholland Exp $ + +Fix build with latest glib2. + +--- plugins/wb.printing/backend/stdafx.h~ 2011-03-17 12:48:42.000000000 +0000 ++++ plugins/wb.printing/backend/stdafx.h +@@ -46,7 +46,7 @@ + #include + #include + +-#include ++#include + + #ifndef _WIN32 + #include