Author: glen Date: Sun May 20 19:50:22 2012 GMT Module: packages Tag: HEAD ---- Log message: - up to 5.2.40
---- Files affected: packages/mysql-workbench: mysql-workbench.spec (1.55 -> 1.56) , system-cppconn.patch (1.2 -> 1.3) , glib.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/mysql-workbench/mysql-workbench.spec diff -u packages/mysql-workbench/mysql-workbench.spec:1.55 packages/mysql-workbench/mysql-workbench.spec:1.56 --- packages/mysql-workbench/mysql-workbench.spec:1.55 Wed May 16 07:36:49 2012 +++ packages/mysql-workbench/mysql-workbench.spec Sun May 20 21:50:17 2012 @@ -1,22 +1,23 @@ # $Revision$, $Date$ +# 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 @@ -89,7 +90,6 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 @@ -169,6 +169,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.56 2012/05/20 19:50:17 glen +- up to 5.2.40 + Revision 1.55 2012/05/16 05:36:49 glen - rel 1, still broken server administration left as todo ================================================================ Index: packages/mysql-workbench/system-cppconn.patch diff -u packages/mysql-workbench/system-cppconn.patch:1.2 packages/mysql-workbench/system-cppconn.patch:1.3 --- packages/mysql-workbench/system-cppconn.patch:1.2 Sat May 12 02:34:23 2012 +++ packages/mysql-workbench/system-cppconn.patch Sun May 20 21:50:17 2012 @@ -32,19 +32,9 @@ 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 @@ -#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()); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/mysql-workbench/mysql-workbench.spec?r1=1.55&r2=1.56 http://cvs.pld-linux.org/packages/mysql-workbench/system-cppconn.patch?r1=1.2&r2=1.3 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
