- up to 5.2.40

Changed files:
    glib.patch -> 1.2
    mysql-workbench.spec -> 1.56
    system-cppconn.patch -> 1.3

diff --git a/glib.patch b/glib.patch
deleted file mode 100644 (file)
index 2075505..0000000
--- a/glib.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- mysql-workbench-gpl-5.2.38-src/library/canvas/src/mdc_canvas_view.h.wig    2012-03-29 09:43:18.032778914 +0200
-+++ mysql-workbench-gpl-5.2.38-src/library/canvas/src/mdc_canvas_view.h        2012-03-29 09:43:28.729445403 +0200
-@@ -28,7 +28,7 @@
- #include "mdc_selection.h"
- 
- #ifndef _WIN32
--#include <glib/gthread.h>
-+#include <glib.h>
- #endif
- 
- BEGIN_MDC_DECLS
---- mysql-workbench-gpl-5.2.38-src/library/canvas/src/mdc_canvas_view_printing.cpp.wig 2012-03-29 09:48:20.466107248 +0200
-+++ mysql-workbench-gpl-5.2.38-src/library/canvas/src/mdc_canvas_view_printing.cpp     2012-03-29 09:48:29.776107097 +0200
-@@ -21,7 +21,7 @@
- 
- #include "mdc_canvas_view.h"
- #include "mdc_canvas_view_printing.h"
--#include <glib/gmessages.h>
-+#include <glib.h>
- 
- #ifdef _WIN32
- #include <cairo/cairo-win32.h>
---- mysql-workbench-gpl-5.2.38-src/library/grt/src/grtpp_util.cpp.wig  2012-03-29 09:51:11.806104420 +0200
-+++ mysql-workbench-gpl-5.2.38-src/library/grt/src/grtpp_util.cpp      2012-03-29 09:51:23.076104235 +0200
-@@ -25,7 +25,7 @@
- #include "grtpp_util.h"
- #include "base/string_utilities.h"
- 
--#include <glib/gbase64.h>
-+#include <glib.h>
- #include <functional>
- 
- using namespace grt;
---- mysql-workbench-gpl-5.2.38-src/backend/wbprivate/sqlide/wb_live_schema_tree.h.wig  2012-03-29 11:21:20.055793953 +0200
-+++ mysql-workbench-gpl-5.2.38-src/backend/wbprivate/sqlide/wb_live_schema_tree.h      2012-03-29 11:21:30.989127107 +0200
-@@ -24,7 +24,7 @@
- #include "grtpp.h"
- #include "workbench/wb_backend_public_interface.h"
- #include "base/string_utilities.h"
--#include <glib/gpattern.h>
-+#include <glib.h>
- 
- namespace wb
- {
---- mysql-workbench-gpl-5.2.38-src/plugins/db.mysql/backend/db_plugin_be.cpp.wig       2012-03-29 12:35:37.652163391 +0200
-+++ mysql-workbench-gpl-5.2.38-src/plugins/db.mysql/backend/db_plugin_be.cpp   2012-03-29 12:35:47.015496574 +0200
-@@ -31,7 +31,7 @@
- #include "grts/structs.db.h"
- #include "base/string_utilities.h"
- 
--#include <glib/gunicode.h>
-+#include <glib.h>
- 
- void Db_plugin::grtm(bec::GRTManager *grtm)
- {
---- mysql-workbench-gpl-5.2.38-src/modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp.wig  2012-03-29 12:18:35.735513605 +0200
-+++ mysql-workbench-gpl-5.2.38-src/modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp      2012-03-29 12:18:47.355513413 +0200
-@@ -20,7 +20,7 @@
- 
- #include "stdafx.h"
- 
--#include <glib/gunicode.h>
-+#include <glib.h>
- #include "grt/common.h"
- #include "grt/grt_manager.h"
- #include "grtdb/charset_utils.h"
-@@ -651,4 +651,4 @@ std::string Mysql_sql_parser_fe::get_fir
-     return versioning_comment_subst_token;
-   else
-     return token;
--}
-\ Brak znaku nowej linii na końcu pliku
-+}

diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index fd869926ca1cfb96a4f61d05624611e60061e1ac..cbcc576d09cd58b8a2526d22eafba8e3c4b15e7f 100644 (file)
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -1,21 +1,22 @@
+# NOTE
+# - change history: http://dev.mysql.com/doc/workbench/en/wb-change-history.html
 # TODO
 # - server administration is broken: sudo locks up (time to time) and it puts
 #   EnterPasswordHere begginning of mysqld.conf if you try to manage settings
 Summary:       Extensible modeling tool for MySQL
 Summary(pl.UTF-8):     Narzędzie do modelowania baz danych dla MySQL-a
 Name:          mysql-workbench
-Version:       5.2.39
+Version:       5.2.40
 Release:       1
 License:       GPL v2
 Group:         Applications/Databases
 Source0:       ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/%{name}-gpl-%{version}-src.tar.gz
-# Source0-md5: 35472b00d48a82d1d13954aef4f916fa
+# Source0-md5: ac5c2058cd39c796a1c7bed2647f74b6
 Source1:       PLD_Linux_(MySQL_Package).xml
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-python_libs.patch
 Patch2:                %{name}-posix.patch
 Patch3:                automake.patch
-Patch4:                glib.patch
 Patch5:                pld-profile.patch
 Patch6:                get_local_ip_list.patch
 Patch7:                log_slow_queries.patch
@@ -88,7 +89,6 @@ rm -r ext/cppconn
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1

diff --git a/system-cppconn.patch b/system-cppconn.patch
index 36de01d5ae5c3c44f328fce6ecc8acde7009643d..f15b62635fa536b0278a2296b9e8cfa09a41f59a 100644 (file)
--- a/system-cppconn.patch
+++ b/system-cppconn.patch
@@ -32,19 +32,9 @@ diff -up mysql-workbench-gpl-5.2.28-src/backend/wbprivate/sqlide/wb_sql_editor_f
  
  if BUNDLE_UTILITIES
  all-am:
-diff -up mysql-workbench-gpl-5.2.26/library/dbc/src/driver_manager.cpp.cppconn mysql-workbench-gpl-5.2.26/library/dbc/src/driver_manager.cpp
---- mysql-workbench-gpl-5.2.26/library/dbc/src/driver_manager.cpp.cppconn      2010-08-05 15:33:19.000000000 +0200
-+++ mysql-workbench-gpl-5.2.26/library/dbc/src/driver_manager.cpp      2010-08-07 08:11:56.907643461 +0200
-@@ -145,6 +145,8 @@ TunnelConnection *DriverManager::getTunn
- ConnectionWrapper DriverManager::getConnection(const db_mgmt_ConnectionRef &connectionProperties, ConnectionInitSlot connection_init_slot)
- {
-   TunnelConnection* tunnel = NULL;
-+  gchar *p = NULL;
-+  GModule *gmodule = NULL;
-   // 0. determine correct driver filename
-   
-   db_mgmt_DriverRef drv = connectionProperties->driver();
-@@ -154,21 +156,21 @@ ConnectionWrapper DriverManager::getConn
+--- mysql-workbench-gpl-5.2.40-src/library/dbc/src/driver_manager.cpp~ 2012-05-03 22:41:05.000000000 +0300
++++ mysql-workbench-gpl-5.2.40-src/library/dbc/src/driver_manager.cpp  2012-05-20 17:35:36.254800120 +0300
+@@ -221,21 +221,22 @@
      library = drv->driverLibraryName();
    else
      throw SQLException("Invalid connection settings: undefined connection driver");
@@ -57,16 +47,17 @@ diff -up mysql-workbench-gpl-5.2.26/library/dbc/src/driver_manager.cpp.cppconn m
 -#endif
 +
 +  // Patch : use library in standard path
++  gchar *p = NULL;
 +  p = g_module_build_path (NULL, library.c_str());
  
    // 1. find driver
- 
--  GModule *gmodule= g_module_open((_driver_path + "/" + library).c_str(), G_MODULE_BIND_LOCAL);
++  GModule *gmodule = NULL;
 +  if (p) {
 +    gmodule = g_module_open(std::string(p).append(".6").c_str(), G_MODULE_BIND_LOCAL);
 +    g_free(p);
 +  }
-+
+ 
+-  GModule *gmodule= g_module_open((_driver_path + "/" + library).c_str(), G_MODULE_BIND_LOCAL);
    if (NULL == gmodule)
    {
      fprintf(stderr, "Error: %s", g_module_error());