mysql-workbench 5.2.43

8 files changed, 94 insertions, 116 deletions

diff --git a/mysql-workbench-5.2.41-antlr.patch b/mysql-workbench-5.2.41-antlr.patch
deleted file mode 100644
index 69ef249..0000000
--- a/mysql-workbench-5.2.41-antlr.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up mysql-workbench-gpl-5.2.41-src/configure.in.antlr mysql-workbench-gpl-5.2.41-src/configure.in
---- mysql-workbench-gpl-5.2.41-src/configure.in.antlr	2012-08-11 09:16:26.180997691 +0200
-+++ mysql-workbench-gpl-5.2.41-src/configure.in	2012-08-11 09:16:26.201997764 +0200
-@@ -377,7 +377,8 @@ AC_SUBST(ODBC_LIBS)
- AC_CHECK_HEADER([antlr3.h], ac_system_antlr_runtime=yes, ac_system_antlr_runtime=no)
- if test "$ac_system_antlr_runtime" = yes; then
-     AC_RUN_IFELSE([AC_LANG_SOURCE([#include <antlr3config.h>
--int main() { return strcmp(PACKAGE_VERSION, "3.4") >= 0; }
-+#include <string.h>
-+int main() { return strcmp(PACKAGE_VERSION, "3.4") < 0; }
- ])],
-            AC_MSG_RESULT([antlr runtimes for C >= 3.4 found]),
-            [AC_MSG_RESULT([required antlr runtimes not found, using bundled])
-diff -up mysql-workbench-gpl-5.2.41-src/ext/Makefile.am.antlr mysql-workbench-gpl-5.2.41-src/ext/Makefile.am
---- mysql-workbench-gpl-5.2.41-src/ext/Makefile.am.antlr	2012-08-11 09:17:06.014135012 +0200
-+++ mysql-workbench-gpl-5.2.41-src/ext/Makefile.am	2012-08-11 09:17:18.452177547 +0200
-@@ -1,5 +1,5 @@
- 
--SUBDIRS=scintilla/gtk vsqlite++ antlr-runtime
-+SUBDIRS=scintilla/gtk vsqlite++
- 
- if BUNDLE_UTILITIES
- all-am:
diff --git a/mysql-workbench-5.2.41-ctemplate.patch b/mysql-workbench-5.2.41-ctemplate.patch
deleted file mode 100644
index 0debab1..0000000
--- a/mysql-workbench-5.2.41-ctemplate.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up mysql-workbench-gpl-5.2.41-src/ext/Makefile.am.ctemplate mysql-workbench-gpl-5.2.41-src/ext/Makefile.am
---- mysql-workbench-gpl-5.2.41-src/ext/Makefile.am.ctemplate	2012-08-11 09:13:36.000000000 +0200
-+++ mysql-workbench-gpl-5.2.41-src/ext/Makefile.am	2012-08-11 09:14:05.756513523 +0200
-@@ -1,10 +1,5 @@
- 
--if BUILD_CTEMPLATE
--else
--ctemplate_dirs=ctemplate 
--endif
--
--SUBDIRS=scintilla/gtk vsqlite++ antlr-runtime $(ctemplate_dirs)
-+SUBDIRS=scintilla/gtk vsqlite++ antlr-runtime
- 
- if BUNDLE_UTILITIES
- all-am:
diff --git a/mysql-workbench-5.2.41-glib.patch b/mysql-workbench-5.2.41-glib.patch
deleted file mode 100644
index 0798bfc..0000000
--- a/mysql-workbench-5.2.41-glib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mysql-workbench-gpl-5.2.41-src/backend/wbpublic/sqlide/autocomplete_object_name_cache.cpp.glib mysql-workbench-gpl-5.2.41-src/backend/wbpublic/sqlide/autocomplete_object_name_cache.cpp
---- mysql-workbench-gpl-5.2.41-src/backend/wbpublic/sqlide/autocomplete_object_name_cache.cpp.glib	2012-08-11 09:34:13.454462374 +0200
-+++ mysql-workbench-gpl-5.2.41-src/backend/wbpublic/sqlide/autocomplete_object_name_cache.cpp	2012-08-11 09:34:19.431483470 +0200
-@@ -22,7 +22,7 @@
- #include <sqlite/execute.hpp>
- #include <sqlite/query.hpp>
- 
--#include <glib/gthread.h>
-+#include <glib.h>
- 
- #include "autocomplete_object_name_cache.h"
- #include "base/log.h"
diff --git a/mysql-workbench-5.2.43-antlr.patch b/mysql-workbench-5.2.43-antlr.patch
new file mode 100644
index 0000000..7b05d46
--- /dev/null
+++ b/mysql-workbench-5.2.43-antlr.patch
@@ -0,0 +1,15 @@
+diff -up mysql-workbench-gpl-5.2.43-src/configure.in.antlr mysql-workbench-gpl-5.2.43-src/configure.in
+diff -up mysql-workbench-gpl-5.2.43-src/ext/Makefile.am.antlr mysql-workbench-gpl-5.2.43-src/ext/Makefile.am
+--- mysql-workbench-gpl-5.2.43-src/ext/Makefile.am.antlr	2012-09-13 18:16:37.000000000 +0200
++++ mysql-workbench-gpl-5.2.43-src/ext/Makefile.am	2012-09-13 18:17:02.908892609 +0200
+@@ -1,9 +1,5 @@
+ 
+-if BUILD_ANTLR_RUNTIME
+-antlr_dirs=antlr-runtime
+-endif
+-
+-SUBDIRS=scintilla/gtk vsqlite++ $(antlr_dirs)
++SUBDIRS=scintilla/gtk vsqlite++
+ 
+ if BUNDLE_UTILITIES
+ all-am:
diff --git a/mysql-workbench-5.2.41-cppconn.patch b/mysql-workbench-5.2.43-cppconn.patch
index b40ef35..5a593d6 100644
--- a/mysql-workbench-5.2.41-cppconn.patch
+++ b/mysql-workbench-5.2.43-cppconn.patch
@@ -1,6 +1,6 @@
-diff -up mysql-workbench-gpl-5.2.41-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.cppconn mysql-workbench-gpl-5.2.41-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp
---- mysql-workbench-gpl-5.2.41-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.cppconn	2012-07-25 05:07:39.000000000 +0200
-+++ mysql-workbench-gpl-5.2.41-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp	2012-08-11 08:31:17.262756837 +0200
+diff -up mysql-workbench-gpl-5.2.43-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.cppconn mysql-workbench-gpl-5.2.43-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp
+--- mysql-workbench-gpl-5.2.43-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.cppconn	2012-09-11 17:47:10.000000000 +0200
++++ mysql-workbench-gpl-5.2.43-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp	2012-09-13 18:09:32.129077029 +0200
 @@ -49,7 +49,7 @@
  // this doesn't belong here, but there's no other workaround for having access to mysql_info
  // because of that we also need to link wbprivate directly to the connector, making their
@@ -10,10 +10,22 @@ diff -up mysql-workbench-gpl-5.2.41-src/backend/wbprivate/sqlide/wb_sql_editor_f
  
  #include <boost/foreach.hpp>
  #include <boost/scoped_ptr.hpp>
-diff -up mysql-workbench-gpl-5.2.41-src/configure.in.cppconn mysql-workbench-gpl-5.2.41-src/configure.in
---- mysql-workbench-gpl-5.2.41-src/configure.in.cppconn	2012-07-25 05:07:43.000000000 +0200
-+++ mysql-workbench-gpl-5.2.41-src/configure.in	2012-08-11 08:32:04.937900117 +0200
-@@ -488,8 +488,6 @@ res/mysql.profiles/Makefile
+diff -up mysql-workbench-gpl-5.2.43-src/backend/wbpublic/grtdb/diff_dbobjectmatch.cpp.cppconn mysql-workbench-gpl-5.2.43-src/backend/wbpublic/grtdb/diff_dbobjectmatch.cpp
+--- mysql-workbench-gpl-5.2.43-src/backend/wbpublic/grtdb/diff_dbobjectmatch.cpp.cppconn	2012-09-11 17:47:11.000000000 +0200
++++ mysql-workbench-gpl-5.2.43-src/backend/wbpublic/grtdb/diff_dbobjectmatch.cpp	2012-09-13 18:09:32.130077033 +0200
+@@ -22,7 +22,7 @@
+ // this doesn't belong here, but there's no other workaround for having access to mysql_info
+ // because of that we also need to link wbprivate directly to the connector, making their
+ // dynamic loading pretty much useless
+-#include <cppconn/../driver/mysql_connection.h>
++#include <mysql_connection.h>
+ #include <cppconn/metadata.h>
+ 
+ 
+diff -up mysql-workbench-gpl-5.2.43-src/configure.in.cppconn mysql-workbench-gpl-5.2.43-src/configure.in
+--- mysql-workbench-gpl-5.2.43-src/configure.in.cppconn	2012-09-11 17:47:20.000000000 +0200
++++ mysql-workbench-gpl-5.2.43-src/configure.in	2012-09-13 18:09:32.130077033 +0200
+@@ -487,8 +487,6 @@ res/mysql.profiles/Makefile
  res/sqlidedata/Makefile
  ext/Makefile
  ext/scintilla/gtk/Makefile
@@ -22,21 +34,21 @@ diff -up mysql-workbench-gpl-5.2.41-src/configure.in.cppconn mysql-workbench-gpl
  ext/vsqlite++/Makefile
  ext/vsqlite++/src/sqlite/Makefile
  backend/Makefile
-diff -up mysql-workbench-gpl-5.2.41-src/ext/Makefile.am.cppconn mysql-workbench-gpl-5.2.41-src/ext/Makefile.am
---- mysql-workbench-gpl-5.2.41-src/ext/Makefile.am.cppconn	2012-07-25 05:07:41.000000000 +0200
-+++ mysql-workbench-gpl-5.2.41-src/ext/Makefile.am	2012-08-11 08:32:44.674022530 +0200
-@@ -4,7 +4,7 @@ else
- ctemplate_dirs=ctemplate 
+diff -up mysql-workbench-gpl-5.2.43-src/ext/Makefile.am.cppconn mysql-workbench-gpl-5.2.43-src/ext/Makefile.am
+--- mysql-workbench-gpl-5.2.43-src/ext/Makefile.am.cppconn	2012-09-11 17:47:07.000000000 +0200
++++ mysql-workbench-gpl-5.2.43-src/ext/Makefile.am	2012-09-13 18:09:44.314125984 +0200
+@@ -7,7 +7,7 @@ if BUILD_ANTLR_RUNTIME
+ antlr_dirs=antlr-runtime
  endif
  
--SUBDIRS=scintilla/gtk cppconn vsqlite++ antlr-runtime $(ctemplate_dirs)
-+SUBDIRS=scintilla/gtk vsqlite++ antlr-runtime $(ctemplate_dirs)
+-SUBDIRS=scintilla/gtk cppconn vsqlite++ $(antlr_dirs) $(ctemplate_dirs)
++SUBDIRS=scintilla/gtk vsqlite++ $(antlr_dirs) $(ctemplate_dirs)
  
  if BUNDLE_UTILITIES
  all-am:
-diff -up mysql-workbench-gpl-5.2.41-src/frontend/linux/workbench/Makefile.am.cppconn mysql-workbench-gpl-5.2.41-src/frontend/linux/workbench/Makefile.am
---- mysql-workbench-gpl-5.2.41-src/frontend/linux/workbench/Makefile.am.cppconn	2012-07-25 05:07:40.000000000 +0200
-+++ mysql-workbench-gpl-5.2.41-src/frontend/linux/workbench/Makefile.am	2012-08-11 08:39:25.157340958 +0200
+diff -up mysql-workbench-gpl-5.2.43-src/frontend/linux/workbench/Makefile.am.cppconn mysql-workbench-gpl-5.2.43-src/frontend/linux/workbench/Makefile.am
+--- mysql-workbench-gpl-5.2.43-src/frontend/linux/workbench/Makefile.am.cppconn	2012-09-11 17:46:58.000000000 +0200
++++ mysql-workbench-gpl-5.2.43-src/frontend/linux/workbench/Makefile.am	2012-09-13 18:09:35.484090509 +0200
 @@ -38,7 +38,6 @@ INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GR
  	-I$(top_srcdir)/modules/wb.model/src\
  	-I$(top_srcdir)/modules/interfaces\
@@ -61,9 +73,9 @@ diff -up mysql-workbench-gpl-5.2.41-src/frontend/linux/workbench/Makefile.am.cpp
  
  #precompiled.h.gch: precompiled.h
  #	$(CXXCOMPILE) precompiled.h -o precompiled.h.gch
-diff -up mysql-workbench-gpl-5.2.41-src/library/dbc/src/driver_manager.cpp.cppconn mysql-workbench-gpl-5.2.41-src/library/dbc/src/driver_manager.cpp
---- mysql-workbench-gpl-5.2.41-src/library/dbc/src/driver_manager.cpp.cppconn	2012-07-25 05:07:35.000000000 +0200
-+++ mysql-workbench-gpl-5.2.41-src/library/dbc/src/driver_manager.cpp	2012-08-11 08:37:39.612984727 +0200
+diff -up mysql-workbench-gpl-5.2.43-src/library/dbc/src/driver_manager.cpp.cppconn mysql-workbench-gpl-5.2.43-src/library/dbc/src/driver_manager.cpp
+--- mysql-workbench-gpl-5.2.43-src/library/dbc/src/driver_manager.cpp.cppconn	2012-09-11 17:47:00.000000000 +0200
++++ mysql-workbench-gpl-5.2.43-src/library/dbc/src/driver_manager.cpp	2012-09-13 18:09:35.485090511 +0200
 @@ -212,6 +212,8 @@ ConnectionWrapper DriverManager::getConn
  
  ConnectionWrapper DriverManager::getConnection(const db_mgmt_ConnectionRef &connectionProperties, boost::shared_ptr<TunnelConnection> tunnel, Authentication::Ref password, ConnectionInitSlot connection_init_slot)
@@ -104,14 +116,3 @@ diff -up mysql-workbench-gpl-5.2.41-src/library/dbc/src/driver_manager.cpp.cppco
    }
    
    Driver *(* get_driver_instance)()= NULL;
---- mysql-workbench-gpl-5.2.41-src/backend/wbpublic/grtdb/diff_dbobjectmatch.cpp.cppconn	2012-08-11 09:25:04.192665300 +0200
-+++ mysql-workbench-gpl-5.2.41-src/backend/wbpublic/grtdb/diff_dbobjectmatch.cpp	2012-08-11 09:25:41.106778794 +0200
-@@ -22,7 +22,7 @@
- // this doesn't belong here, but there's no other workaround for having access to mysql_info
- // because of that we also need to link wbprivate directly to the connector, making their
- // dynamic loading pretty much useless
--#include <cppconn/../driver/mysql_connection.h>
-+#include <mysql_connection.h>
- #include <cppconn/metadata.h>
- 
- 
diff --git a/mysql-workbench-5.2.43-ctemplate.patch b/mysql-workbench-5.2.43-ctemplate.patch
new file mode 100644
index 0000000..97e8534
--- /dev/null
+++ b/mysql-workbench-5.2.43-ctemplate.patch
@@ -0,0 +1,18 @@
+diff -up mysql-workbench-gpl-5.2.43-src/ext/Makefile.am.ctemplate mysql-workbench-gpl-5.2.43-src/ext/Makefile.am
+--- mysql-workbench-gpl-5.2.43-src/ext/Makefile.am.ctemplate	2012-09-13 18:12:53.000000000 +0200
++++ mysql-workbench-gpl-5.2.43-src/ext/Makefile.am	2012-09-13 18:13:54.635133978 +0200
+@@ -1,13 +1,9 @@
+ 
+-if BUILD_CTEMPLATE
+-ctemplate_dirs=ctemplate 
+-endif
+-
+ if BUILD_ANTLR_RUNTIME
+ antlr_dirs=antlr-runtime
+ endif
+ 
+-SUBDIRS=scintilla/gtk vsqlite++ $(antlr_dirs) $(ctemplate_dirs)
++SUBDIRS=scintilla/gtk vsqlite++ $(antlr_dirs)
+ 
+ if BUNDLE_UTILITIES
+ all-am:
diff --git a/mysql-workbench-5.2.42-noautocc.patch b/mysql-workbench-5.2.43-noautocc.patch
index a945f3c..8b95913 100644
--- a/mysql-workbench-5.2.42-noautocc.patch
+++ b/mysql-workbench-5.2.43-noautocc.patch
@@ -1,6 +1,6 @@
-diff -up mysql-workbench-gpl-5.2.42-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp.auto mysql-workbench-gpl-5.2.42-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp
---- mysql-workbench-gpl-5.2.42-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp.auto	2012-08-28 07:23:58.733977928 +0200
-+++ mysql-workbench-gpl-5.2.42-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp	2012-08-28 07:26:52.679449570 +0200
+diff -up mysql-workbench-gpl-5.2.43-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp.noautocc mysql-workbench-gpl-5.2.43-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp
+--- mysql-workbench-gpl-5.2.43-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp.noautocc	2012-09-11 17:47:00.000000000 +0200
++++ mysql-workbench-gpl-5.2.43-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp	2012-09-13 18:21:55.207851256 +0200
 @@ -485,7 +485,11 @@ static bool validate_save_edits(wb::WBCo
  
  static bool validate_list_members(wb::WBContextSQLIDE *sqlide)
@@ -13,9 +13,9 @@ diff -up mysql-workbench-gpl-5.2.42-src/backend/wbprivate/sqlide/wb_context_sqli
  }
  
  //--------------------------------------------------------------------------------------------------
-diff -up mysql-workbench-gpl-5.2.42-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.auto mysql-workbench-gpl-5.2.42-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp
---- mysql-workbench-gpl-5.2.42-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.auto	2012-08-28 07:23:50.240956043 +0200
-+++ mysql-workbench-gpl-5.2.42-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp	2012-08-28 07:25:59.442301869 +0200
+diff -up mysql-workbench-gpl-5.2.43-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.noautocc mysql-workbench-gpl-5.2.43-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp
+--- mysql-workbench-gpl-5.2.43-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.noautocc	2012-09-13 18:21:55.186851187 +0200
++++ mysql-workbench-gpl-5.2.43-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp	2012-09-13 18:21:55.209851264 +0200
 @@ -902,6 +902,7 @@ grt::StringRef SqlEditorForm::do_connect
      model->catalog(catalog);
    }
@@ -32,24 +32,22 @@ diff -up mysql-workbench-gpl-5.2.42-src/backend/wbprivate/sqlide/wb_sql_editor_f
      log_debug("Code completion is disabled, so no name cache is created\n");
    
    return grt::StringRef();
-diff -up mysql-workbench-gpl-5.2.42-src/backend/wbprivate/workbench/wb_context.cpp.auto mysql-workbench-gpl-5.2.42-src/backend/wbprivate/workbench/wb_context.cpp
---- mysql-workbench-gpl-5.2.42-src/backend/wbprivate/workbench/wb_context.cpp.auto	2012-08-28 07:24:08.635003637 +0200
-+++ mysql-workbench-gpl-5.2.42-src/backend/wbprivate/workbench/wb_context.cpp	2012-08-28 07:27:24.959539941 +0200
-@@ -1551,8 +1551,8 @@ void WBContext::set_default_options(grt:
+diff -up mysql-workbench-gpl-5.2.43-src/backend/wbprivate/workbench/wb_context.cpp.noautocc mysql-workbench-gpl-5.2.43-src/backend/wbprivate/workbench/wb_context.cpp
+--- mysql-workbench-gpl-5.2.43-src/backend/wbprivate/workbench/wb_context.cpp.noautocc	2012-09-11 17:47:19.000000000 +0200
++++ mysql-workbench-gpl-5.2.43-src/backend/wbprivate/workbench/wb_context.cpp	2012-09-13 18:23:03.409093906 +0200
+@@ -1555,7 +1555,7 @@ void WBContext::set_default_options(grt:
    set_default(options, "SqlEditor::SyntaxCheck::MaxErrCount", 100);
  
    // DB SQL editor
 -  options.gset("DbSqlEditor:CodeCompletionEnabled", 1);
--  options.gset("DbSqlEditor:AutoStartCodeCompletion", 1);
 +  options.gset("DbSqlEditor:CodeCompletionEnabled", 0);
-+  options.gset("DbSqlEditor:AutoStartCodeCompletion", 0);
+   options.gset("DbSqlEditor:AutoStartCodeCompletion", 0); // enable back when it works better
    options.gset("DbSqlEditor:ProgressStatusUpdateInterval", 500); // in ms
    options.gset("DbSqlEditor:KeepAliveInterval", 600); // in seconds
-   options.gset("DbSqlEditor:ReadTimeOut", 600); // in seconds
-diff -up mysql-workbench-gpl-5.2.42-src/backend/wbpublic/sqlide/sql_editor_be.cpp.auto mysql-workbench-gpl-5.2.42-src/backend/wbpublic/sqlide/sql_editor_be.cpp
---- mysql-workbench-gpl-5.2.42-src/backend/wbpublic/sqlide/sql_editor_be.cpp.auto	2012-08-28 07:24:21.657037748 +0200
-+++ mysql-workbench-gpl-5.2.42-src/backend/wbpublic/sqlide/sql_editor_be.cpp	2012-08-28 07:28:23.988706289 +0200
-@@ -880,14 +880,22 @@ void Sql_editor::set_sql_check_enabled(b
+diff -up mysql-workbench-gpl-5.2.43-src/backend/wbpublic/sqlide/sql_editor_be.cpp.noautocc mysql-workbench-gpl-5.2.43-src/backend/wbpublic/sqlide/sql_editor_be.cpp
+--- mysql-workbench-gpl-5.2.43-src/backend/wbpublic/sqlide/sql_editor_be.cpp.noautocc	2012-09-11 17:47:17.000000000 +0200
++++ mysql-workbench-gpl-5.2.43-src/backend/wbpublic/sqlide/sql_editor_be.cpp	2012-09-13 18:21:55.212851274 +0200
+@@ -889,14 +889,22 @@ void Sql_editor::set_sql_check_enabled(b
  
  bool Sql_editor::code_completion_enabled()
  {
@@ -72,9 +70,9 @@ diff -up mysql-workbench-gpl-5.2.42-src/backend/wbpublic/sqlide/sql_editor_be.cp
  }
  
  //--------------------------------------------------------------------------------------------------
-diff -up mysql-workbench-gpl-5.2.42-src/frontend/common/preferences_form.cpp.auto mysql-workbench-gpl-5.2.42-src/frontend/common/preferences_form.cpp
---- mysql-workbench-gpl-5.2.42-src/frontend/common/preferences_form.cpp.auto	2012-08-28 07:24:35.712074907 +0200
-+++ mysql-workbench-gpl-5.2.42-src/frontend/common/preferences_form.cpp	2012-08-28 07:43:53.125210902 +0200
+diff -up mysql-workbench-gpl-5.2.43-src/frontend/common/preferences_form.cpp.noautocc mysql-workbench-gpl-5.2.43-src/frontend/common/preferences_form.cpp
+--- mysql-workbench-gpl-5.2.43-src/frontend/common/preferences_form.cpp.noautocc	2012-09-11 17:47:11.000000000 +0200
++++ mysql-workbench-gpl-5.2.43-src/frontend/common/preferences_form.cpp	2012-09-13 18:21:55.213851277 +0200
 @@ -618,6 +618,10 @@ void PreferencesForm::create_sqlide_page
      
      // Code completion settings is a horizontal box with two check boxes.
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index 81de45e..8036318 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -10,8 +10,8 @@
 
 Summary:   A MySQL visual database modeling, administration and querying tool
 Name:      mysql-workbench
-Version:   5.2.42
-Release:   2%{?dist}
+Version:   5.2.43
+Release:   1%{?dist}
 Group:     Applications/Databases
 License:   GPLv2 with exceptions
 
@@ -26,15 +26,12 @@ Source1:   stripdocs.sh
 
 # don't build extension, use system one
 # !!! This patch use versioned soname (libmysqlcppconn.so.6) !!!
-Patch1:    %{name}-5.2.41-cppconn.patch
-Patch2:    %{name}-5.2.41-ctemplate.patch
+Patch1:    %{name}-5.2.43-cppconn.patch
+Patch2:    %{name}-5.2.43-ctemplate.patch
 Patch3:    %{name}-5.2.41-tinyxml.patch
-# http://bugs.mysql.com/66325
-Patch4:    %{name}-5.2.41-antlr.patch
-# http://bugs.mysql.com/63705
-Patch5:    %{name}-5.2.41-glib.patch
+Patch4:    %{name}-5.2.43-antlr.patch
 # Disable broken AutoCompletion feature
-Patch6:    %{name}-5.2.42-noautocc.patch
+Patch6:    %{name}-5.2.43-noautocc.patch
 
 # don't use bundled documentation, redirect to online doc
 Patch9:    %{name}-5.2.41-nodocs.patch
@@ -140,7 +137,6 @@ rm -rf library/tinyxml
 rm -rf ext/antlr-runtime
 %endif
 
-%patch5 -p1 -b .glib
 %patch6 -p1 -b .noautocc
 %patch9 -p1 -b .nodocs
 
@@ -190,11 +186,6 @@ desktop-file-install --vendor="" \
    --dir=%{buildroot}%{_datadir}/applications/ \
          MySQLWorkbench.desktop
 
-# move binary and fix launcher http://bugs.mysql.com/66322
-mv %{buildroot}%{_bindir}/%{name}-bin %{buildroot}%{_libdir}/%{name}/%{name}-bin
-sed -e 's:bindirname/mysql-workbench-bin:wblibdir/mysql-workbench-bin:' \
-    -i %{buildroot}%{_bindir}/%{name}
-
 
 %clean
 rm -rf %{buildroot}
@@ -226,12 +217,17 @@ fi
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_datadir}/mime-info/%{name}.mime
 %{_datadir}/mime/packages/%{name}.xml
+%{_libexecdir}/mysql-workbench-bin
 %{_libdir}/%{name}
 %{_datadir}/%{name}
 %exclude %{_datadir}/doc/%{name}
 
 
 %changelog
+* Thu Sep 13 2012 Remi Collet <remi@fedoraproject.org> 5.2.43-1
+- update to 5.2.43 Community (OSS) Edition (GPL)
+  http://dev.mysql.com/doc/workbench/en/wb-news-5-2-43.html
+
 * Tue Aug 28 2012 Remi Collet <remi@fedoraproject.org> 5.2.42-2
 - disable broken auto completion (#851283)