mysql-workbench: 5.2.46

2 files changed, 41 insertions, 27 deletions

diff --git a/mysql-workbench-5.2.45-noautocc.patch b/mysql-workbench-5.2.46-noautocc.patch
index 6e34261..071df91 100644
--- a/mysql-workbench-5.2.45-noautocc.patch
+++ b/mysql-workbench-5.2.46-noautocc.patch
@@ -1,6 +1,6 @@
-diff -up mysql-workbench-gpl-5.2.45-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp.noautocc mysql-workbench-gpl-5.2.45-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp
---- mysql-workbench-gpl-5.2.45-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp.noautocc	2012-12-27 16:42:46.000000000 +0100
-+++ mysql-workbench-gpl-5.2.45-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp	2012-12-29 11:39:01.080015839 +0100
+diff -up mysql-workbench-gpl-5.2.46-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp.noautocc mysql-workbench-gpl-5.2.46-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp
+--- mysql-workbench-gpl-5.2.46-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp.noautocc	2013-01-31 13:54:25.000000000 +0100
++++ mysql-workbench-gpl-5.2.46-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp	2013-02-09 10:38:15.400229072 +0100
 @@ -486,7 +486,11 @@ static bool validate_save_edits(wb::WBCo
  
  static bool validate_list_members(wb::WBContextSQLIDE *sqlide)
@@ -13,10 +13,10 @@ diff -up mysql-workbench-gpl-5.2.45-src/backend/wbprivate/sqlide/wb_context_sqli
  }
  
  //--------------------------------------------------------------------------------------------------
-diff -up mysql-workbench-gpl-5.2.45-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.noautocc mysql-workbench-gpl-5.2.45-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp
---- mysql-workbench-gpl-5.2.45-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.noautocc	2012-12-29 11:39:01.054015738 +0100
-+++ mysql-workbench-gpl-5.2.45-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp	2012-12-29 11:41:18.919436541 +0100
-@@ -889,6 +889,7 @@ grt::StringRef SqlEditorForm::do_connect
+diff -up mysql-workbench-gpl-5.2.46-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.noautocc mysql-workbench-gpl-5.2.46-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp
+--- mysql-workbench-gpl-5.2.46-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.noautocc	2013-02-09 10:38:15.380229015 +0100
++++ mysql-workbench-gpl-5.2.46-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp	2013-02-09 10:38:15.401229075 +0100
+@@ -894,6 +894,7 @@ grt::StringRef SqlEditorForm::do_connect
        err_ptr->password_expired = true;
      throw;
    }
@@ -24,7 +24,7 @@ diff -up mysql-workbench-gpl-5.2.45-src/backend/wbprivate/sqlide/wb_sql_editor_f
    if (_grtm->get_app_option_int("DbSqlEditor:CodeCompletionEnabled") == 1)
    {
      std::string cache_dir = _grtm->get_user_datadir() + "/cache/";
-@@ -908,6 +909,7 @@ grt::StringRef SqlEditorForm::do_connect
+@@ -913,6 +914,7 @@ grt::StringRef SqlEditorForm::do_connect
      }
    }
    else
@@ -32,21 +32,21 @@ diff -up mysql-workbench-gpl-5.2.45-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.45-src/backend/wbprivate/workbench/wb_context.cpp.noautocc mysql-workbench-gpl-5.2.45-src/backend/wbprivate/workbench/wb_context.cpp
---- mysql-workbench-gpl-5.2.45-src/backend/wbprivate/workbench/wb_context.cpp.noautocc	2012-12-27 16:43:01.000000000 +0100
-+++ mysql-workbench-gpl-5.2.45-src/backend/wbprivate/workbench/wb_context.cpp	2012-12-29 11:39:01.084015855 +0100
-@@ -1562,7 +1562,7 @@ void WBContext::set_default_options(grt:
+diff -up mysql-workbench-gpl-5.2.46-src/backend/wbprivate/workbench/wb_context.cpp.noautocc mysql-workbench-gpl-5.2.46-src/backend/wbprivate/workbench/wb_context.cpp
+--- mysql-workbench-gpl-5.2.46-src/backend/wbprivate/workbench/wb_context.cpp.noautocc	2013-02-09 10:39:21.054421440 +0100
++++ mysql-workbench-gpl-5.2.46-src/backend/wbprivate/workbench/wb_context.cpp	2013-01-31 13:54:41.000000000 +0100
+@@ -1576,7 +1576,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:CodeCompletionEnabled", 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
-diff -up mysql-workbench-gpl-5.2.45-src/backend/wbpublic/sqlide/sql_editor_be.cpp.noautocc mysql-workbench-gpl-5.2.45-src/backend/wbpublic/sqlide/sql_editor_be.cpp
---- mysql-workbench-gpl-5.2.45-src/backend/wbpublic/sqlide/sql_editor_be.cpp.noautocc	2012-12-27 16:42:46.000000000 +0100
-+++ mysql-workbench-gpl-5.2.45-src/backend/wbpublic/sqlide/sql_editor_be.cpp	2012-12-29 11:39:01.085015859 +0100
+-  set_default(options, "DbSqlEditor:CodeCompletionEnabled", 1);
++  set_default(options, "DbSqlEditor:CodeCompletionEnabled", 0);
+   set_default(options, "DbSqlEditor:AutoStartCodeCompletion", 0); // enable back when it works better
+   set_default(options, "DbSqlEditor:ProgressStatusUpdateInterval", 500); // in ms
+   set_default(options, "DbSqlEditor:KeepAliveInterval", 600); // in seconds
+diff -up mysql-workbench-gpl-5.2.46-src/backend/wbpublic/sqlide/sql_editor_be.cpp.noautocc mysql-workbench-gpl-5.2.46-src/backend/wbpublic/sqlide/sql_editor_be.cpp
+--- mysql-workbench-gpl-5.2.46-src/backend/wbpublic/sqlide/sql_editor_be.cpp.noautocc	2013-01-31 13:54:26.000000000 +0100
++++ mysql-workbench-gpl-5.2.46-src/backend/wbpublic/sqlide/sql_editor_be.cpp	2013-02-09 10:38:15.404229084 +0100
 @@ -912,14 +912,22 @@ void Sql_editor::set_sql_check_enabled(b
  
  bool Sql_editor::code_completion_enabled()
@@ -70,9 +70,9 @@ diff -up mysql-workbench-gpl-5.2.45-src/backend/wbpublic/sqlide/sql_editor_be.cp
  }
  
  //--------------------------------------------------------------------------------------------------
-diff -up mysql-workbench-gpl-5.2.45-src/frontend/common/preferences_form.cpp.noautocc mysql-workbench-gpl-5.2.45-src/frontend/common/preferences_form.cpp
---- mysql-workbench-gpl-5.2.45-src/frontend/common/preferences_form.cpp.noautocc	2012-12-27 16:42:54.000000000 +0100
-+++ mysql-workbench-gpl-5.2.45-src/frontend/common/preferences_form.cpp	2012-12-29 11:39:01.086015863 +0100
+diff -up mysql-workbench-gpl-5.2.46-src/frontend/common/preferences_form.cpp.noautocc mysql-workbench-gpl-5.2.46-src/frontend/common/preferences_form.cpp
+--- mysql-workbench-gpl-5.2.46-src/frontend/common/preferences_form.cpp.noautocc	2013-01-31 13:54:31.000000000 +0100
++++ mysql-workbench-gpl-5.2.46-src/frontend/common/preferences_form.cpp	2013-02-09 10:38:15.406229090 +0100
 @@ -622,6 +622,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 34b80a6..bd8b9ff 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -3,14 +3,15 @@
 %global tarversion gpl-%{version}-src
 
 # Use system cppconn if a compatible upstream version exists
-%global cppconnver 1.1.1
+# http://bugs.mysql.com/68326 (ABI is not stable)
+%global cppconnver 1.1.2
 
 # "script_templates" (and some others) shouldn't be compiled
 %global _python_bytecompile_errors_terminate_build 0
 
 Summary:   A MySQL visual database modeling, administration and querying tool
 Name:      mysql-workbench
-Version:   5.2.45
+Version:   5.2.46
 Release:   1%{?dist}
 Group:     Applications/Databases
 License:   GPLv2 with exceptions
@@ -25,6 +26,7 @@ Source0:   %{name}-nodocs-%{version}.tar.xz
 Source1:   stripdocs.sh
 
 # don't build extension, use system one
+# http://bugs.mysql.com/68324
 # !!! This patch use versioned soname (libmysqlcppconn.so.6) !!!
 Patch1:    %{name}-5.2.45-cppconn.patch
 # Use system ctemplate
@@ -36,11 +38,13 @@ Patch4:    %{name}-5.2.43-antlr.patch
 # Use system antlr (and vsqlite) - NOT applied
 Patch5:    %{name}-5.2.44-antlr.patch
 # Disable broken AutoCompletion feature
-Patch6:    %{name}-5.2.45-noautocc.patch
+# http://bugs.mysql.com/68327
+Patch6:    %{name}-5.2.46-noautocc.patch
 # Use system vsqlite++ (not ready) - NOT applied
 Patch7:    %{name}-5.2.44-vsqlite.patch
 
 # don't use bundled documentation, redirect to online doc
+# http://bugs.mysql.com/68325
 Patch9:    %{name}-5.2.45-nodocs.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -239,6 +243,16 @@ fi
 
 
 %changelog
+* Sat Feb  9 2013 Remi Collet <remi@fedoraproject.org> 5.2.46-1
+- update to 5.2.46 Community (OSS) Edition (GPL)
+  http://dev.mysql.com/doc/relnotes/workbench/en/wb-news-5-2-46.html
+- raise dependency on mysql-connector-c++ 1.1.2
+- add link to upstream bugs
+  http://bugs.mysql.com/68324 use system cppcon
+  http://bugs.mysql.com/68325 build without doc
+  http://bugs.mysql.com/68326 cppconn ABI is not stable
+  http://bugs.mysql.com/68327 segfault in auto completion
+
 * Sat Dec 29 2012 Remi Collet <remi@fedoraproject.org> 5.2.45-1
 - update to 5.2.45 Community (OSS) Edition (GPL)
   http://dev.mysql.com/doc/relnotes/workbench/en/wb-news-5-2-45.html
@@ -464,7 +478,7 @@ fi
 * Sat Mar 21 2009 Remi Collet <RPMS@famillecollet.com> 5.1.9-1
 - update to 5.1.9 beta
 
-* Sun Jan 13 2009 Remi Collet <RPMS@famillecollet.com> 5.1.7-1
+* Sun Jan 11 2009 Remi Collet <RPMS@famillecollet.com> 5.1.7-1
 - update to 5.1.7 alpha
 
 * Sat Dec 13 2008 Remi Collet <RPMS@famillecollet.com> 5.1.5-1