MySQL Workbench is a cross-platform, visual database design tool developed by

MySQL. It is the highly anticipated successor application of the DBDesigner4
project. MySQL Workbench will be available as a native GUI tool on Windows,
Linux and OS X.

3 files changed, 62 insertions, 0 deletions

diff --git a/databases/mysql-workbench/patches/patch-frontend_linux_linux_utilities_toolbar_manager.cpp b/databases/mysql-workbench/patches/patch-frontend_linux_linux_utilities_toolbar_manager.cpp
new file mode 100644
index 00000000000..6afa779094d
--- /dev/null
+++ b/databases/mysql-workbench/patches/patch-frontend_linux_linux_utilities_toolbar_manager.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-frontend_linux_linux_utilities_toolbar_manager.cpp,v 1.1.1.1 2011/05/16 12:40:50 adam Exp $
+
+Fix building with newer Gtkmm.
+
+--- frontend/linux/linux_utilities/toolbar_manager.cpp.orig	2011-05-16 11:11:25.000000000 +0000
++++ frontend/linux/linux_utilities/toolbar_manager.cpp
+@@ -31,7 +31,7 @@ static Gtk::ComboBox *create_color_combo
+   }
+ 
+   Glib::RefPtr<Gtk::ListStore> model= Gtk::ListStore::create(*color_combo_columns);
+-  Gtk::ComboBox *combo= new Gtk::ComboBox(model);
++  Gtk::ComboBox *combo= new Gtk::ComboBox(model, false);
+ 
+   combo->pack_start(color_combo_columns->image);
+ 
diff --git a/databases/mysql-workbench/patches/patch-library_base_international_file.cpp b/databases/mysql-workbench/patches/patch-library_base_international_file.cpp
new file mode 100644
index 00000000000..dd3fdb2809e
--- /dev/null
+++ b/databases/mysql-workbench/patches/patch-library_base_international_file.cpp
@@ -0,0 +1,18 @@
+$NetBSD: patch-library_base_international_file.cpp,v 1.1.1.1 2011/05/16 12:40:50 adam Exp $
+
+Use const string for iconv on all platforms.
+
+--- library/base/international_file.cpp.orig	2011-05-16 08:33:28.000000000 +0000
++++ library/base/international_file.cpp
+@@ -257,11 +257,7 @@ boost::int64_t read_char_from_intl_file(
+   else
+   {
+     gunichar utf8_char= g_utf8_get_char(file->next_utf8_char);
+-#ifdef _WIN32
+     const char * cur_utf8_char= file->next_utf8_char;
+-#else
+-    char * cur_utf8_char= file->next_utf8_char;
+-#endif
+     file->next_utf8_char= g_utf8_next_char(file->next_utf8_char);
+ 
+     *bytes_read= (int) (file->next_utf8_char - cur_utf8_char);
diff --git a/databases/mysql-workbench/patches/patch-library_forms_gtk_lf_panel.h b/databases/mysql-workbench/patches/patch-library_forms_gtk_lf_panel.h
new file mode 100644
index 00000000000..bc032949f06
--- /dev/null
+++ b/databases/mysql-workbench/patches/patch-library_forms_gtk_lf_panel.h
@@ -0,0 +1,29 @@
+$NetBSD: patch-library_forms_gtk_lf_panel.h,v 1.1.1.1 2011/05/16 12:40:50 adam Exp $
+
+Sacrifice sel_color to fix compilation with newer Gtkmm.
+
+--- library/forms/gtk/lf_panel.h.orig	2011-05-16 08:57:29.000000000 +0000
++++ library/forms/gtk/lf_panel.h
+@@ -45,11 +45,11 @@ protected:
+   PanelImpl(::mforms::Panel *self, ::mforms::PanelType type)
+     : ContainerImpl(self), _frame(0), _evbox(0), _radio_group_set(false)
+   {
+-    static Gdk::Color sel_color;
++//    static Gdk::Color sel_color;
+     static bool initialized = false;
+     if (!initialized)
+     {
+-      sel_color = Gtk::RC::get_style(Gtk::TreeView())->get_bg(Gtk::STATE_SELECTED);
++//      sel_color = Gtk::RC::get_style(Gtk::TreeView())->get_bg(Gtk::STATE_SELECTED);
+       initialized = true;
+     }
+ 
+@@ -62,7 +62,7 @@ protected:
+       break;
+     case StyledHeaderPanel:      // just a container with color filled background
+       _evbox= Gtk::manage(new Gtk::EventBox());
+-      _evbox->modify_bg(Gtk::STATE_NORMAL, sel_color);
++//      _evbox->modify_bg(Gtk::STATE_NORMAL, sel_color);
+       break;
+     case FilledPanel:      // just a container with color filled background
+       _evbox= Gtk::manage(new Gtk::EventBox());