From 411a42b0686d62b02ff1bf3091cf4ac7bc1c4ca0 Mon Sep 17 00:00:00 2001 From: joerg Date: Tue, 25 Dec 2012 21:12:31 +0000 Subject: static const objects must have default constructors, so don't use const here. Don't use extern inside functions when the declared function is not in the same namespace. --- databases/mysql-workbench/distinfo | 8 +++++++- ...atch-backend_wbprivate_workbench_wb__context.cpp | 21 +++++++++++++++++++++ ...tch-backend_wbpublic_sqlide_sqlide__generics.cpp | 13 +++++++++++++ ...tch-backend_wbpublic_sqlide_var__grid__model.cpp | 13 +++++++++++++ .../patches/patch-library_forms_mforms.cpp | 21 +++++++++++++++++++++ .../patch-library_grt_src_grtpp__shell__lua.cpp | 20 ++++++++++++++++++++ .../patch-library_grt_src_grtpp__shell__python.cpp | 21 +++++++++++++++++++++ 7 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 databases/mysql-workbench/patches/patch-backend_wbprivate_workbench_wb__context.cpp create mode 100644 databases/mysql-workbench/patches/patch-backend_wbpublic_sqlide_sqlide__generics.cpp create mode 100644 databases/mysql-workbench/patches/patch-backend_wbpublic_sqlide_var__grid__model.cpp create mode 100644 databases/mysql-workbench/patches/patch-library_forms_mforms.cpp create mode 100644 databases/mysql-workbench/patches/patch-library_grt_src_grtpp__shell__lua.cpp create mode 100644 databases/mysql-workbench/patches/patch-library_grt_src_grtpp__shell__python.cpp diff --git a/databases/mysql-workbench/distinfo b/databases/mysql-workbench/distinfo index 2d17d1adee9..27f611e5f5a 100644 --- a/databases/mysql-workbench/distinfo +++ b/databases/mysql-workbench/distinfo @@ -1,9 +1,12 @@ -$NetBSD: distinfo,v 1.6 2012/09/15 05:14:07 obache Exp $ +$NetBSD: distinfo,v 1.7 2012/12/25 21:12:31 joerg 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_wbprivate_workbench_wb__context.cpp) = c215ac28cf4a1a41eae4dec0eb54c2c14c5b52fb +SHA1 (patch-backend_wbpublic_sqlide_sqlide__generics.cpp) = 08df04e135eb45bd7d4f071e40ad7a22b17b6f63 +SHA1 (patch-backend_wbpublic_sqlide_var__grid__model.cpp) = b2e6cd40a2d785e904ff0fbafd501eb754aabef4 SHA1 (patch-backend_windows_wbprivate_wr_src_stdafx_h) = a42d1c33c627dd52e73f6841d759be5922950984 SHA1 (patch-frontend_linux_linux_utilities_toolbar_manager.cpp) = cc2ecf41802836c1ce799ebdff26ad89b70f3459 SHA1 (patch-library_base_file_utilities.cpp) = af34c32bec2e194b9e8e96c264dd7b036c380978 @@ -12,6 +15,9 @@ SHA1 (patch-library_canvas_src_mdc__canvas__view__printing_cpp) = 5c3e6c6f63421a 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_forms_mforms.cpp) = de621a3d2604ab3b3807758a432cc6762ee30559 +SHA1 (patch-library_grt_src_grtpp__shell__lua.cpp) = 48b0d96c7a847f444629b921773a1735935b93a2 +SHA1 (patch-library_grt_src_grtpp__shell__python.cpp) = 9aa18665114199d269170f791f83d53f1696042e 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 diff --git a/databases/mysql-workbench/patches/patch-backend_wbprivate_workbench_wb__context.cpp b/databases/mysql-workbench/patches/patch-backend_wbprivate_workbench_wb__context.cpp new file mode 100644 index 00000000000..27fe275e408 --- /dev/null +++ b/databases/mysql-workbench/patches/patch-backend_wbprivate_workbench_wb__context.cpp @@ -0,0 +1,21 @@ +$NetBSD: patch-backend_wbprivate_workbench_wb__context.cpp,v 1.1 2012/12/25 21:12:31 joerg Exp $ + +--- backend/wbprivate/workbench/wb_context.cpp.orig 2012-12-25 15:17:54.000000000 +0000 ++++ backend/wbprivate/workbench/wb_context.cpp +@@ -128,6 +128,8 @@ ENABLE_LOG("wbprivate") + #define HAVE_BUNDLED_MYSQLDUMP + #endif + ++void register_all_metaclasses(); ++ + using namespace grt; + using namespace bec; + using namespace wb; +@@ -194,7 +196,6 @@ WBContext::WBContext(WBContextUI *ui, bo + : _asked_for_saving(false), _uicontext(ui), _model_context(0), _sqlide_context(ui), _file(0), + _save_point(0), _tunnel_manager(0) + { +- extern void register_all_metaclasses(); + static bool registered_metaclasses= false; + + g_log_set_handler(NULL, (GLogLevelFlags)0xfffff, log_func, this); diff --git a/databases/mysql-workbench/patches/patch-backend_wbpublic_sqlide_sqlide__generics.cpp b/databases/mysql-workbench/patches/patch-backend_wbpublic_sqlide_sqlide__generics.cpp new file mode 100644 index 00000000000..1d9fe94f4e6 --- /dev/null +++ b/databases/mysql-workbench/patches/patch-backend_wbpublic_sqlide_sqlide__generics.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-backend_wbpublic_sqlide_sqlide__generics.cpp,v 1.1 2012/12/25 21:12:31 joerg Exp $ + +--- backend/wbpublic/sqlide/sqlide_generics.cpp.orig 2012-12-25 14:37:05.000000000 +0000 ++++ backend/wbpublic/sqlide/sqlide_generics.cpp +@@ -38,7 +38,7 @@ public: + template result_type operator()(const T &v1, const T &v2) const { return true; } + template result_type operator()(const T1 &v1, const T2 &v2) const { return false; } + }; +-static const IsVarTypeEqTo is_var_type_eq_to; ++static IsVarTypeEqTo is_var_type_eq_to; + + bool is_var_null(const sqlite::Variant &value) + { diff --git a/databases/mysql-workbench/patches/patch-backend_wbpublic_sqlide_var__grid__model.cpp b/databases/mysql-workbench/patches/patch-backend_wbpublic_sqlide_var__grid__model.cpp new file mode 100644 index 00000000000..f9c465121cf --- /dev/null +++ b/databases/mysql-workbench/patches/patch-backend_wbpublic_sqlide_var__grid__model.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-backend_wbpublic_sqlide_var__grid__model.cpp,v 1.1 2012/12/25 21:12:31 joerg Exp $ + +--- backend/wbpublic/sqlide/var_grid_model.cpp.orig 2012-12-25 14:43:01.000000000 +0000 ++++ backend/wbpublic/sqlide/var_grid_model.cpp +@@ -410,7 +410,7 @@ bool VarGridModel::set_field(const NodeI + bool is_blob_column= sqlide::is_var_blob(_real_column_types[column]); + if (!_optimized_blob_fetching || !is_blob_column) + { +- static const sqlide::VarEq var_eq; ++ static sqlide::VarEq var_eq; + if (!is_blob_column) + res= !boost::apply_visitor(var_eq, value, *cell); + if (res) diff --git a/databases/mysql-workbench/patches/patch-library_forms_mforms.cpp b/databases/mysql-workbench/patches/patch-library_forms_mforms.cpp new file mode 100644 index 00000000000..05b42cafe35 --- /dev/null +++ b/databases/mysql-workbench/patches/patch-library_forms_mforms.cpp @@ -0,0 +1,21 @@ +$NetBSD: patch-library_forms_mforms.cpp,v 1.1 2012/12/25 21:12:31 joerg Exp $ + +--- library/forms/mforms.cpp.orig 2012-12-25 15:55:34.000000000 +0000 ++++ library/forms/mforms.cpp +@@ -23,6 +23,8 @@ + #include "mforms/mforms.h" + #include "mforms/simpleform.h" + ++extern GThread *_mforms_main_thread; ++ + using namespace mforms; + + // The first time this method is called must be from the main thread, during +@@ -33,7 +35,6 @@ ControlFactory *ControlFactory::get_inst + if (!instance) + { + // Do some one time initializations. +- extern GThread *_mforms_main_thread; + _mforms_main_thread= g_thread_self(); + + instance= new ControlFactory(); diff --git a/databases/mysql-workbench/patches/patch-library_grt_src_grtpp__shell__lua.cpp b/databases/mysql-workbench/patches/patch-library_grt_src_grtpp__shell__lua.cpp new file mode 100644 index 00000000000..849fb404995 --- /dev/null +++ b/databases/mysql-workbench/patches/patch-library_grt_src_grtpp__shell__lua.cpp @@ -0,0 +1,20 @@ +$NetBSD: patch-library_grt_src_grtpp__shell__lua.cpp,v 1.1 2012/12/25 21:12:31 joerg Exp $ + +--- library/grt/src/grtpp_shell_lua.cpp.orig 2012-12-25 14:27:07.000000000 +0000 ++++ library/grt/src/grtpp_shell_lua.cpp +@@ -37,6 +37,7 @@ + #include + #endif + ++extern void myx_grt_shell_show_help(grt::GRT *grt, const char *command); + + using namespace grt; + using namespace base; +@@ -207,7 +208,6 @@ int LuaShell::set_global_var(const std:: + + void LuaShell::show_help(const std::string &keyword) + { +- extern void myx_grt_shell_show_help(grt::GRT *grt, const char *command); + + myx_grt_shell_show_help(_grt, keyword.c_str()); + } diff --git a/databases/mysql-workbench/patches/patch-library_grt_src_grtpp__shell__python.cpp b/databases/mysql-workbench/patches/patch-library_grt_src_grtpp__shell__python.cpp new file mode 100644 index 00000000000..31c76459350 --- /dev/null +++ b/databases/mysql-workbench/patches/patch-library_grt_src_grtpp__shell__python.cpp @@ -0,0 +1,21 @@ +$NetBSD: patch-library_grt_src_grtpp__shell__python.cpp,v 1.1 2012/12/25 21:12:31 joerg Exp $ + +--- library/grt/src/grtpp_shell_python.cpp.orig 2012-12-25 14:24:41.000000000 +0000 ++++ library/grt/src/grtpp_shell_python.cpp +@@ -22,6 +22,7 @@ + + #ifdef ENABLE_PYTHON_MODULES + #include "grtpp_shell_python.h" ++#include "grtpp_shell_python_help.h" + #include "base/string_utilities.h" + + using namespace grt; +@@ -194,8 +195,6 @@ int PythonShell::set_global_var(const st + + void PythonShell::show_help(const std::string &keyword) + { +- extern void grt_shell_show_python_help(GRT *grt, const char *command); +- + grt_shell_show_python_help(_grt, keyword.c_str()); + } + -- cgit v1.2.3