diff options
Diffstat (limited to 'databases/mysql-workbench/patches')
8 files changed, 26 insertions, 26 deletions
diff --git a/databases/mysql-workbench/patches/patch-backend_wbprivate_workbench_stdafx_h b/databases/mysql-workbench/patches/patch-backend_wbprivate_workbench_stdafx_h index d6a07d2a021..da6481d7704 100644 --- a/databases/mysql-workbench/patches/patch-backend_wbprivate_workbench_stdafx_h +++ b/databases/mysql-workbench/patches/patch-backend_wbprivate_workbench_stdafx_h @@ -1,10 +1,10 @@ -$NetBSD: patch-backend_wbprivate_workbench_stdafx_h,v 1.1 2012/05/07 18:40:35 dholland Exp $ +$NetBSD: patch-backend_wbprivate_workbench_stdafx_h,v 1.2 2012/09/07 19:16:20 adam Exp $ Fix build with latest glib2. ---- backend/wbprivate/workbench/stdafx.h~ 2011-03-17 12:48:42.000000000 +0000 +--- backend/wbprivate/workbench/stdafx.h.orig 2011-03-17 12:48:42.000000000 +0000 +++ backend/wbprivate/workbench/stdafx.h -@@ -39,7 +39,6 @@ +@@ -65,7 +65,6 @@ #include <gl/glu.h> #include <glib.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 index 0c0f92487ae..9a48ed73957 100644 --- 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 @@ -1,10 +1,10 @@ -$NetBSD: patch-backend_windows_wbprivate_wr_src_stdafx_h,v 1.1 2012/05/07 18:40:35 dholland Exp $ +$NetBSD: patch-backend_windows_wbprivate_wr_src_stdafx_h,v 1.2 2012/09/07 19:16:20 adam 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.orig 2011-03-17 12:48:41.000000000 +0000 +++ backend/windows/wbprivate.wr/src/stdafx.h -@@ -48,7 +48,7 @@ +@@ -65,7 +65,7 @@ #include <gl/glu.h> 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 index 6afa779094d..7327bd069b4 100644 --- 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 @@ -1,15 +1,15 @@ -$NetBSD: patch-frontend_linux_linux_utilities_toolbar_manager.cpp,v 1.1.1.1 2011/05/16 12:40:50 adam Exp $ +$NetBSD: patch-frontend_linux_linux_utilities_toolbar_manager.cpp,v 1.2 2012/09/07 19:16:20 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.orig 2012-08-09 20:57:01.000000000 +0000 +++ frontend/linux/linux_utilities/toolbar_manager.cpp -@@ -31,7 +31,7 @@ static Gtk::ComboBox *create_color_combo +@@ -30,7 +30,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); +- Gtk::ComboBox *combo= new Gtk::ComboBox(Glib::RefPtr<Gtk::TreeModel>(model)); ++ Gtk::ComboBox *combo= new Gtk::ComboBox(Glib::RefPtr<Gtk::TreeModel>(model), false); combo->pack_start(color_combo_columns->image); diff --git a/databases/mysql-workbench/patches/patch-library_base_file_utilities.cpp b/databases/mysql-workbench/patches/patch-library_base_file_utilities.cpp index 30d92966c38..6272f10c9ac 100644 --- a/databases/mysql-workbench/patches/patch-library_base_file_utilities.cpp +++ b/databases/mysql-workbench/patches/patch-library_base_file_utilities.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-library_base_file_utilities.cpp,v 1.1 2012/05/24 18:54:16 marino Exp $ +$NetBSD: patch-library_base_file_utilities.cpp,v 1.2 2012/09/07 19:16:20 adam Exp $ ---- library/base/file_utilities.cpp.orig 2011-03-17 12:48:44.000000000 +0000 +--- library/base/file_utilities.cpp.orig 2012-08-09 20:56:59.000000000 +0000 +++ library/base/file_utilities.cpp -@@ -31,6 +31,9 @@ +@@ -32,6 +32,9 @@ #include <fcntl.h> #include <sys/file.h> #endif @@ -11,4 +11,4 @@ $NetBSD: patch-library_base_file_utilities.cpp,v 1.1 2012/05/24 18:54:16 marino +#endif namespace base { - + diff --git a/databases/mysql-workbench/patches/patch-library_canvas_src_stdafx_h b/databases/mysql-workbench/patches/patch-library_canvas_src_stdafx_h index 7f432c22573..66991cef14b 100644 --- a/databases/mysql-workbench/patches/patch-library_canvas_src_stdafx_h +++ b/databases/mysql-workbench/patches/patch-library_canvas_src_stdafx_h @@ -1,13 +1,13 @@ -$NetBSD: patch-library_canvas_src_stdafx_h,v 1.1 2012/05/07 18:40:35 dholland Exp $ +$NetBSD: patch-library_canvas_src_stdafx_h,v 1.2 2012/09/07 19:16:20 adam Exp $ Fix build with latest glib2. ---- library/canvas/src/stdafx.h~ 2011-03-17 12:48:45.000000000 +0000 +--- library/canvas/src/stdafx.h.orig 2012-08-09 20:56:56.000000000 +0000 +++ library/canvas/src/stdafx.h -@@ -53,7 +53,7 @@ +@@ -52,7 +52,7 @@ + #include <gl/gl.h> #include <gl/glu.h> - -#include <glib/gthread.h> +#include <glib.h> 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 index a8147c27097..333564b1de7 100644 --- 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 @@ -1,8 +1,8 @@ -$NetBSD: patch-modules_db_mysql_sqlparser_src_stdafx_h,v 1.1 2012/05/07 18:40:35 dholland Exp $ +$NetBSD: patch-modules_db_mysql_sqlparser_src_stdafx_h,v 1.2 2012/09/07 19:16:20 adam 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.orig 2011-03-17 12:48:45.000000000 +0000 +++ modules/db.mysql.sqlparser/src/stdafx.h @@ -32,7 +32,7 @@ #include <algorithm> 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 index 4b7c2821a50..46104bad703 100644 --- 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 @@ -1,8 +1,8 @@ -$NetBSD: patch-modules_wb_mysql_import_src_stdafx_h,v 1.1 2012/05/07 18:40:35 dholland Exp $ +$NetBSD: patch-modules_wb_mysql_import_src_stdafx_h,v 1.2 2012/09/07 19:16:20 adam 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.orig 2011-03-17 12:48:31.000000000 +0000 +++ modules/wb.mysql.import/src/stdafx.h @@ -10,7 +10,7 @@ #include <algorithm> 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 index cf6bfb3d4e4..0b46bba86b8 100644 --- a/databases/mysql-workbench/patches/patch-plugins_wb_printing_backend_stdafx_h +++ b/databases/mysql-workbench/patches/patch-plugins_wb_printing_backend_stdafx_h @@ -1,10 +1,10 @@ -$NetBSD: patch-plugins_wb_printing_backend_stdafx_h,v 1.1 2012/05/07 18:40:35 dholland Exp $ +$NetBSD: patch-plugins_wb_printing_backend_stdafx_h,v 1.2 2012/09/07 19:16:20 adam 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.orig 2011-03-17 12:48:42.000000000 +0000 +++ plugins/wb.printing/backend/stdafx.h -@@ -46,7 +46,7 @@ +@@ -44,7 +44,7 @@ #include <gl/gl.h> #include <gl/glu.h> |