diff options
author | joerg <joerg> | 2015-07-07 11:45:52 +0000 |
---|---|---|
committer | joerg <joerg> | 2015-07-07 11:45:52 +0000 |
commit | d0f965f5d6bec092e11014ccafe00d40f9e15926 (patch) | |
tree | 9c2421b2670438bd5b7a60794269cccca974887f /databases/mysql-workbench/patches | |
parent | 2ca6607ad8278c3f85d195c80d7b29836647362e (diff) | |
download | pkgsrc-d0f965f5d6bec092e11014ccafe00d40f9e15926.tar.gz |
Initialising an iterator from 0 is a GCCism. Avoid forcing a dependency
of the backend on a module by avoiding a dynamic cast. Don't use false
as string. Fix build with newer cTemplate.
Diffstat (limited to 'databases/mysql-workbench/patches')
5 files changed, 128 insertions, 0 deletions
diff --git a/databases/mysql-workbench/patches/patch-backend_wbprivate_sqlide_wb__sql__editor__form.cpp b/databases/mysql-workbench/patches/patch-backend_wbprivate_sqlide_wb__sql__editor__form.cpp new file mode 100644 index 00000000000..a2202b30389 --- /dev/null +++ b/databases/mysql-workbench/patches/patch-backend_wbprivate_sqlide_wb__sql__editor__form.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-backend_wbprivate_sqlide_wb__sql__editor__form.cpp,v 1.1 2015/07/07 11:45:52 joerg Exp $ + +Can't use dynamic_cast as the type information is normally not present. + +--- backend/wbprivate/sqlide/wb_sql_editor_form.cpp.orig 2015-06-28 18:41:49.000000000 +0000 ++++ backend/wbprivate/sqlide/wb_sql_editor_form.cpp +@@ -1728,7 +1728,7 @@ grt::StringRef Db_sql_editor::do_exec_sq + goto stop_processing_sql_script; + } + +- sql::mysql::MySQL_Connection* mysql_connection = dynamic_cast<sql::mysql::MySQL_Connection*>(dbc_statement->getConnection()); ++ sql::mysql::MySQL_Connection* mysql_connection = reinterpret_cast<sql::mysql::MySQL_Connection*>(dbc_statement->getConnection()); + sql::SQLString last_statement_info; + if (mysql_connection != NULL) + last_statement_info = mysql_connection->getLastStatementInfo(); diff --git a/databases/mysql-workbench/patches/patch-backend_wbpublic_grt_grt__structs__tree.cpp b/databases/mysql-workbench/patches/patch-backend_wbpublic_grt_grt__structs__tree.cpp new file mode 100644 index 00000000000..d1062b993cd --- /dev/null +++ b/databases/mysql-workbench/patches/patch-backend_wbpublic_grt_grt__structs__tree.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-backend_wbpublic_grt_grt__structs__tree.cpp,v 1.1 2015/07/07 11:45:52 joerg Exp $ + +--- backend/wbpublic/grt/grt_structs_tree.cpp.orig 2015-06-28 17:50:16.000000000 +0000 ++++ backend/wbpublic/grt/grt_structs_tree.cpp +@@ -140,7 +140,7 @@ std::string StructsTreeBE::get_field_des + Node *n= get_node_for_id(node); + + if (n == NULL) +- return false; ++ return ""; + + switch (n->type) + { diff --git a/databases/mysql-workbench/patches/patch-backend_wbpublic_sqlide_recordset__text__storage.cpp b/databases/mysql-workbench/patches/patch-backend_wbpublic_sqlide_recordset__text__storage.cpp new file mode 100644 index 00000000000..bb41426234d --- /dev/null +++ b/databases/mysql-workbench/patches/patch-backend_wbpublic_sqlide_recordset__text__storage.cpp @@ -0,0 +1,31 @@ +$NetBSD: patch-backend_wbpublic_sqlide_recordset__text__storage.cpp,v 1.1 2015/07/07 11:45:52 joerg Exp $ + +--- backend/wbpublic/sqlide/recordset_text_storage.cpp.orig 2015-06-28 17:59:17.000000000 +0000 ++++ backend/wbpublic/sqlide/recordset_text_storage.cpp +@@ -162,7 +162,7 @@ void Recordset_text_storage::do_serializ + if (!pre_tpl) + g_warning("Failed to open template file: `%s`", pre_tpl_path.c_str()); + else +- pre_tpl->ReloadIfChanged(); ++ pre_tpl->ReloadAllIfChanged(); + } + if (g_file_test((name+".post.tpl").c_str(), G_FILE_TEST_EXISTS)) + { +@@ -171,7 +171,7 @@ void Recordset_text_storage::do_serializ + if (!post_tpl) + g_warning("Failed to open template file: `%s`", post_tpl_path.c_str()); + else +- post_tpl->ReloadIfChanged(); ++ post_tpl->ReloadAllIfChanged(); + } + } + +@@ -180,7 +180,7 @@ void Recordset_text_storage::do_serializ + throw std::runtime_error(strfmt("Failed to open output file: `%s`", _file_path.c_str())); + } + +- tpl->ReloadIfChanged(); ++ tpl->ReloadAllIfChanged(); + + std::auto_ptr<TemplateDictionary> dict(new TemplateDictionary("/")); + BOOST_FOREACH (const Parameters::value_type ¶m, _parameters) diff --git a/databases/mysql-workbench/patches/patch-frontend_linux_workbench_Makefile.in b/databases/mysql-workbench/patches/patch-frontend_linux_workbench_Makefile.in new file mode 100644 index 00000000000..52737eee41a --- /dev/null +++ b/databases/mysql-workbench/patches/patch-frontend_linux_workbench_Makefile.in @@ -0,0 +1,27 @@ +$NetBSD: patch-frontend_linux_workbench_Makefile.in,v 1.1 2015/07/07 11:45:52 joerg Exp $ + +--- frontend/linux/workbench/Makefile.in.orig 2015-06-28 18:32:27.000000000 +0000 ++++ frontend/linux/workbench/Makefile.in +@@ -71,10 +71,8 @@ mysql_workbench_bin_DEPENDENCIES = \ + $(top_srcdir)/library/base/libwbbase.la \ + $(top_srcdir)/library/grt/src/libgrt.la \ + $(top_srcdir)/library/dbc/libcdbc.la \ +- $(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la \ + $(top_srcdir)/library/canvas/src/libmdcanvasgtk.la \ +- $(top_srcdir)/library/canvas/src/libmdcanvas.la \ +- $(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la ++ $(top_srcdir)/library/canvas/src/libmdcanvas.la + binSCRIPT_INSTALL = $(INSTALL_SCRIPT) + SCRIPTS = $(bin_SCRIPTS) + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +@@ -315,10 +313,8 @@ mysql_workbench_bin_LDADD = \ + $(top_srcdir)/library/base/libwbbase.la\ + $(top_srcdir)/library/grt/src/libgrt.la\ + $(top_srcdir)/library/dbc/libcdbc.la\ +- $(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la\ + $(top_srcdir)/library/canvas/src/libmdcanvasgtk.la\ + $(top_srcdir)/library/canvas/src/libmdcanvas.la\ +- $(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la\ + @CTEMPLATE_LIBS@\ + @GNOME_LIBS@ @GRT_LIBS@ @PCRE_LIBS@ @GLIB_LIBS@ @CAIRO_LIBS@ @ZIP_LIBS@ @MYSQL_LIBS@ @SQLITE3_LIBS@\ + -lX11 diff --git a/databases/mysql-workbench/patches/patch-library_grt_src_grtpp.h b/databases/mysql-workbench/patches/patch-library_grt_src_grtpp.h new file mode 100644 index 00000000000..8d43d4de764 --- /dev/null +++ b/databases/mysql-workbench/patches/patch-library_grt_src_grtpp.h @@ -0,0 +1,42 @@ +$NetBSD: patch-library_grt_src_grtpp.h,v 1.1 2015/07/07 11:45:52 joerg Exp $ + +--- library/grt/src/grtpp.h.orig 2015-06-28 17:13:25.000000000 +0000 ++++ library/grt/src/grtpp.h +@@ -855,8 +855,6 @@ namespace grt { + + IterType iter; + +- TypedListConstIterator() : iter(0) {} +- + TypedListConstIterator(const TypedListConstIterator &content) : iter(content.iter) {} + + TypedListConstIterator(const IterType &content) +@@ -895,6 +893,9 @@ namespace grt { + ++iter; + return temp; + } ++ ++ private: ++ TypedListConstIterator() {} + }; + + template<class C> +@@ -909,8 +910,6 @@ namespace grt { + + IterType iter; + +- TypedListConstReverseIterator() {} +- + TypedListConstReverseIterator(const TypedListConstReverseIterator &content) : iter(content.iter) {} + + TypedListConstReverseIterator(const IterType &content) +@@ -949,6 +948,9 @@ namespace grt { + ++iter; + return temp; + } ++ ++ private: ++ TypedListConstReverseIterator() {} + }; + + |