[packages/mysql-workbench] up to 5.2.44
glen
glen at pld-linux.org
Fri Oct 5 00:58:40 CEST 2012
commit 7c4486daaec195f413f3c02086978c8678b92356
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Oct 4 22:41:51 2012 +0300
up to 5.2.44
avoid-version.patch | 26 ++++++------
bashism.patch | 42 +++++++++----------
log_slow_queries.patch | 10 ++---
mysql-workbench.spec | 9 ++--
system-cppconn.patch | 112 +++++++++++++++++++++++++++++++++----------------
wrapper-exec.patch | 16 +++----
6 files changed, 128 insertions(+), 87 deletions(-)
---
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index cbcc576..aa790ed 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -6,8 +6,8 @@
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.40
-Release: 1
+Version: 5.2.44
+Release: 0.1
License: GPL v2
Group: Applications/Databases
Source0: ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/%{name}-gpl-%{version}-src.tar.gz
@@ -107,7 +107,6 @@ cp -p '%{SOURCE1}' res/mysql.profiles
%{__automake}
%configure \
--disable-dependency-tracking \
- --enable-readline \
CFLAGS="%{rpmcppflags} %{rpmcflags} -Wno-deprecated" \
LUA_LIBS="$(pkg-config --libs lua51)" \
LUA_CFLAGS="$(pkg-config --cflags lua51)"
@@ -145,7 +144,8 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc ChangeLog README
%attr(755,root,root) %{_bindir}/%{name}
-%attr(755,root,root) %{_bindir}/%{name}-bin
+%attr(755,root,root) %{_bindir}/wbcopytables
+
%{_datadir}/%{name}
%{_datadir}/mime/packages/mysql-workbench.xml
%{_iconsdir}/hicolor/*x*/apps/mysql-workbench.png
@@ -154,6 +154,7 @@ rm -rf $RPM_BUILD_ROOT
%{_pixmapsdir}/%{name}.png
%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}-bin
%attr(755,root,root) %{_libdir}/%{name}/*.so*
%dir %{_libdir}/%{name}/modules
%{_libdir}/%{name}/modules/*.py*
diff --git a/avoid-version.patch b/avoid-version.patch
index c13a8e1..e5ac8ed 100644
--- a/avoid-version.patch
+++ b/avoid-version.patch
@@ -179,15 +179,15 @@
-dbutils_grt_la_LDFLAGS=-module
+dbutils_grt_la_LDFLAGS=-module -avoid-version
# dbutils_grt_la_LIBADD=$(top_srcdir)/backend/grtdb/libgrtdbbe.la $(top_srcdir)/backend/grt/libgrtbe.la
---- mysql-workbench-gpl-5.2.38-src/modules/grt.forms/Makefile.am~ 2012-02-21 18:53:45.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/modules/grt.forms/Makefile.am 2012-05-12 02:28:12.138343489 +0300
-@@ -11,5 +11,5 @@
+--- mysql-workbench-gpl-5.2.44-src/modules/grt.forms/Makefile.am~ 2012-09-26 23:50:46.000000000 +0300
++++ mysql-workbench-gpl-5.2.44-src/modules/grt.forms/Makefile.am 2012-10-04 12:00:06.713337129 +0300
+@@ -12,5 +12,5 @@
forms_grt_la_SOURCES=src/grt_forms.cpp
-forms_grt_la_LDFLAGS=-module
+forms_grt_la_LDFLAGS=-module -avoid-version
-
+ forms_grt_la_LIBADD=../../ext/scintilla/gtk/libwbscintilla.la
--- mysql-workbench-gpl-5.2.38-src/modules/wb.model/Makefile.am~ 2012-02-21 18:53:45.000000000 +0200
+++ mysql-workbench-gpl-5.2.38-src/modules/wb.model/Makefile.am 2012-05-12 02:28:20.332057685 +0300
@@ -72,7 +72,7 @@
@@ -254,25 +254,27 @@
wb_model_editors_wbp_la_LIBADD=$(top_srcdir)/frontend/linux/linux_utilities/liblinux_utilities.la
wb_model_editors_wbp_la_SOURCES=\
---- mysql-workbench-gpl-5.2.38-src/library/forms/swig/Makefile.am~ 2012-05-12 02:32:22.000000000 +0300
-+++ mysql-workbench-gpl-5.2.38-src/library/forms/swig/Makefile.am 2012-05-12 03:26:55.794262558 +0300
-@@ -15,6 +15,6 @@
- -I$(top_srcdir)/library/base\
+--- mysql-workbench-gpl-5.2.44-src/library/forms/swig/Makefile.am~ 2012-09-26 23:50:47.000000000 +0300
++++ mysql-workbench-gpl-5.2.44-src/library/forms/swig/Makefile.am 2012-10-04 12:00:33.441243485 +0300
+@@ -25,7 +25,7 @@
+ -I$(top_srcdir)/ext/scintilla/include\
-I$(top_srcdir)/backend/wbpublic/
-_mforms_la_LDFLAGS=-module
+-_cairo_la_LDFLAGS=-module
+_mforms_la_LDFLAGS=-module -avoid-version
++_cairo_la_LDFLAGS=-module -avoid-version
---- mysql-workbench-gpl-5.2.38-src/plugins/db.mysql.diff.reporting/frontend/Makefile.am~ 2012-02-21 18:53:45.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/plugins/db.mysql.diff.reporting/frontend/Makefile.am 2012-05-12 03:28:01.137271612 +0300
-@@ -22,7 +22,7 @@
+--- mysql-workbench-gpl-5.2.44-src/plugins/db.mysql.diff.reporting/frontend/Makefile.am~ 2012-09-26 23:50:42.000000000 +0300
++++ mysql-workbench-gpl-5.2.44-src/plugins/db.mysql.diff.reporting/frontend/Makefile.am 2012-10-04 12:00:50.945172367 +0300
+@@ -23,7 +23,7 @@
@GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @CAIRO_CFLAGS@ @PCRE_CFLAGS@
-db_mysql_diff_reporting_wbp_la_LDFLAGS=-module
+db_mysql_diff_reporting_wbp_la_LDFLAGS=-module -avoid-version
- db_mysql_diff_reporting_wbp_la_LIBADD=$(top_srcdir)/library/grt/src/libgrt.la $(top_srcdir)/library/forms/libmforms.la @GLIB_LIBS@
+ db_mysql_diff_reporting_wbp_la_LIBADD=$(top_srcdir)/library/grt/src/libgrt.la $(top_srcdir)/library/forms/libmforms.la $(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la @GLIB_LIBS@
--- mysql-workbench-gpl-5.2.38-src/plugins/db.mysql.editors/linux/Makefile.am~ 2012-02-21 18:53:46.000000000 +0200
diff --git a/bashism.patch b/bashism.patch
index e708281..8083e01 100644
--- a/bashism.patch
+++ b/bashism.patch
@@ -35,31 +35,31 @@
class CheckForUpdateThread(threading.Thread):
---- mysql-workbench-gpl-5.2.38-src/./plugins/wb.admin/frontend/wb_admin_grt.py~ 2012-02-21 18:53:37.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/./plugins/wb.admin/frontend/wb_admin_grt.py 2012-05-11 20:38:09.431110024 +0300
-@@ -120,9 +120,9 @@
- try:
- if not server_instance.serverInfo["sys.sudo"]:
- # don't break settings that were working perfectly before, assume a valid default
-- server_instance.serverInfo["sys.sudo"] = "/usr/bin/sudo -p EnterPasswordHere /bin/bash -c"
-+ server_instance.serverInfo["sys.sudo"] = "/usr/bin/sudo -p EnterPasswordHere /bin/sh -c"
- except:
-- server_instance.serverInfo["sys.sudo"] = "/usr/bin/sudo -p EnterPasswordHere /bin/bash -c"
-+ server_instance.serverInfo["sys.sudo"] = "/usr/bin/sudo -p EnterPasswordHere /bin/sh -c"
+--- mysql-workbench-gpl-5.2.44-src/./plugins/wb.admin/frontend/wb_admin_grt.py~ 2012-09-26 23:50:38.000000000 +0300
++++ mysql-workbench-gpl-5.2.44-src/./plugins/wb.admin/frontend/wb_admin_grt.py 2012-10-04 11:57:08.815085883 +0300
+@@ -123,9 +123,9 @@
+ try:
+ if not server_instance.serverInfo["sys.sudo"]:
+ # don't break settings that were working perfectly before, assume a valid default
+- server_instance.serverInfo["sys.sudo"] = "/usr/bin/sudo -p EnterPasswordHere /bin/bash -c"
++ server_instance.serverInfo["sys.sudo"] = "/usr/bin/sudo -p EnterPasswordHere /bin/sh -c"
+ except:
+- server_instance.serverInfo["sys.sudo"] = "/usr/bin/sudo -p EnterPasswordHere /bin/bash -c"
++ server_instance.serverInfo["sys.sudo"] = "/usr/bin/sudo -p EnterPasswordHere /bin/sh -c"
app = App.get()
try:
---- mysql-workbench-gpl-5.2.38-src/./plugins/wb.admin/backend/wb_server_management.py~ 2012-02-21 18:53:36.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/./plugins/wb.admin/backend/wb_server_management.py 2012-05-11 20:39:04.223601285 +0300
+--- mysql-workbench-gpl-5.2.44-src/./plugins/wb.admin/backend/wb_server_management.py~ 2012-09-26 23:50:52.000000000 +0300
++++ mysql-workbench-gpl-5.2.44-src/./plugins/wb.admin/backend/wb_server_management.py 2012-10-04 11:54:47.998554556 +0300
@@ -141,9 +141,9 @@
- raise Exception("WBA: Internal error, unexpected character in script to be executed")
+ raise Exception("WBA: Internal error, unexpected character in script to be executed")
if not as_admin:
-- result = pexpect.run("/bin/bash -c '" + script + "'", withexitstatus=True)
-+ result = pexpect.run("/bin/sh -c '" + script + "'", withexitstatus=True)
+- result = pexpect.run("/bin/bash -c '" + script + "'", withexitstatus=True)
++ result = pexpect.run("/bin/sh -c '" + script + "'", withexitstatus=True)
else:
-- child = pexpect.spawn("/bin/bash -c '" + script + "'") # script should already have sudo prefix
-+ child = pexpect.spawn("/bin/sh -c '" + script + "'") # script should already have sudo prefix
- try:
- child.expect('assword', timeout=10)
- if admin_password is not None:
+- child = pexpect.spawn("/bin/bash -c '" + script + "'") # script should already have sudo prefix
++ child = pexpect.spawn("/bin/sh -c '" + script + "'") # script should already have sudo prefix
+ try:
+ child.expect('assword', timeout=10)
+ if admin_password is not None:
diff --git a/log_slow_queries.patch b/log_slow_queries.patch
index efdaa9f..fc73e9e 100644
--- a/log_slow_queries.patch
+++ b/log_slow_queries.patch
@@ -1,11 +1,11 @@
---- mysql-workbench-gpl-5.2.38-src/./plugins/wb.admin/backend/wb_admin_control.py~ 2012-02-21 18:53:37.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/./plugins/wb.admin/backend/wb_admin_control.py 2012-05-11 20:03:42.732364945 +0300
-@@ -675,7 +675,7 @@
+--- mysql-workbench-gpl-5.2.44-src/./plugins/wb.admin/backend/wb_admin_control.py~ 2012-09-26 23:50:47.000000000 +0300
++++ mysql-workbench-gpl-5.2.44-src/./plugins/wb.admin/backend/wb_admin_control.py 2012-10-04 11:51:21.335635822 +0300
+@@ -677,7 +677,7 @@
general_log_file_path = opts[config_section].get('log', '').strip(' "') if opts.has_key(config_section) else ''
self.server_profile.general_log_file_path = general_log_file_path or os.path.join(datadir, hostname + '.log')
-
+
- slow_query_log_file = opts[config_section].get('log-slow-queries', '').strip(' "') if opts.has_key(config_section) else ''
+ slow_query_log_file = (opts[config_section].get('log-slow-queries', '') or opts[config_section].get('log_slow_queries', '')).strip(' "') if opts.has_key(config_section) else ''
self.server_profile.slow_log_file_path = slow_query_log_file or os.path.join(datadir, hostname + '.slow')
-
+
error_log_file_path = opts[config_section].get('log-error', '').strip(' "') if opts.has_key(config_section) else ''
diff --git a/system-cppconn.patch b/system-cppconn.patch
index f15b626..d78632d 100644
--- a/system-cppconn.patch
+++ b/system-cppconn.patch
@@ -1,18 +1,35 @@
-diff -up mysql-workbench-gpl-5.2.28-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.cppconn mysql-workbench-gpl-5.2.28-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp
---- mysql-workbench-gpl-5.2.28-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.cppconn 2010-09-20 19:11:07.100715204 +0200
-+++ mysql-workbench-gpl-5.2.28-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp 2010-09-20 19:11:12.633514446 +0200
-@@ -47,7 +47,7 @@
+TODO
+- make this configure option and submit upstream
+- This patch uses versioned soname (libmysqlcppconn.so.6) !!!
+
+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
// dynamic loading pretty much useless
-#include <cppconn/../driver/mysql_connection.h>
+#include <mysql_connection.h>
- #include "boost_smart_ptr_helpers.h"
+ #include <boost/foreach.hpp>
+ #include <boost/scoped_ptr.hpp>
+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>
---- mysql-workbench-gpl-5.2.38-src/configure.in~ 2012-05-11 22:40:53.000000000 +0300
-+++ mysql-workbench-gpl-5.2.38-src/configure.in 2012-05-11 22:41:05.998432764 +0300
-@@ -425,8 +425,6 @@
+
+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
@@ -21,20 +38,58 @@ diff -up mysql-workbench-gpl-5.2.28-src/backend/wbprivate/sqlide/wb_sql_editor_f
ext/vsqlite++/Makefile
ext/vsqlite++/src/sqlite/Makefile
backend/Makefile
---- mysql-workbench-gpl-5.2.38-src/ext/Makefile.am~ 2012-02-21 18:53:37.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/ext/Makefile.am 2012-05-11 22:41:47.250338170 +0300
-@@ -4,7 +4,7 @@
- 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++ $(ctemplate_dirs)
-+SUBDIRS=scintilla/gtk vsqlite++ $(ctemplate_dirs)
+-SUBDIRS=scintilla/gtk cppconn vsqlite++ $(antlr_dirs) $(ctemplate_dirs)
++SUBDIRS=scintilla/gtk vsqlite++ $(antlr_dirs) $(ctemplate_dirs)
if BUNDLE_UTILITIES
all-am:
---- 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 @@
+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\
+ -I$(top_srcdir)/ext\
+- -I$(top_srcdir)/ext/cppconn\
+ -I$(top_srcdir)/modules\
+ -I$(top_srcdir)/ext/vsqlite++/include\
+ -I$(top_srcdir)/ext/scintilla/include\
+@@ -54,14 +53,13 @@ mysql_workbench_bin_LDADD=\
+ $(top_srcdir)/library/base/libwbbase.la\
+ $(top_srcdir)/library/grt/src/libgrt.la\
+ $(top_srcdir)/library/dbc/libcdbc.la\
+- $(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la\
+ $(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la\
+ $(top_srcdir)/library/canvas/src/libmdcanvasgtk.la\
+ $(top_srcdir)/library/canvas/src/libmdcanvas.la\
+ $(top_srcdir)/library/mysql55-parser/libmysql55parser.la\
+ @CTEMPLATE_LIBS@\
+ @GNOME_LIBS@ @GRT_LIBS@ @PCRE_LIBS@ @GLIB_LIBS@ @CAIRO_LIBS@ @ZIP_LIBS@ @MYSQL_LIBS@ @SQLITE3_LIBS@\
+- -lX11
++ -lmysqlcppconn -lX11
+
+ #precompiled.h.gch: precompiled.h
+ # $(CXXCOMPILE) precompiled.h -o precompiled.h.gch
+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)
+ {
++ gchar *p = NULL;
++ GModule *gmodule = NULL;
+ // 0. determine correct driver filename
+
+ db_mgmt_DriverRef drv = connectionProperties->driver();
+@@ -221,21 +223,21 @@ ConnectionWrapper DriverManager::getConn
library = drv->driverLibraryName();
else
throw SQLException("Invalid connection settings: undefined connection driver");
@@ -47,17 +102,16 @@ diff -up mysql-workbench-gpl-5.2.28-src/backend/wbprivate/sqlide/wb_sql_editor_f
-#endif
+
+ // Patch : use library in standard path
-+ gchar *p = NULL;
+ p = g_module_build_path (NULL, library.c_str());
// 1. find driver
-+ GModule *gmodule = NULL;
+
+- GModule *gmodule= g_module_open((_driver_path + "/" + library).c_str(), G_MODULE_BIND_LOCAL);
+ 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());
@@ -66,19 +120,3 @@ diff -up mysql-workbench-gpl-5.2.28-src/backend/wbprivate/sqlide/wb_sql_editor_f
}
Driver *(* get_driver_instance)()= NULL;
---- mysql-workbench-gpl-5.2.38-src/frontend/linux/workbench/Makefile.am~ 2012-02-21 18:53:45.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/frontend/linux/workbench/Makefile.am 2012-05-11 22:43:49.509318592 +0300
-@@ -54,12 +54,12 @@
- $(top_srcdir)/library/base/libwbbase.la\
- $(top_srcdir)/library/grt/src/libgrt.la\
- $(top_srcdir)/library/dbc/libcdbc.la\
-- $(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la\
- $(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la\
- $(top_srcdir)/library/canvas/src/libmdcanvasgtk.la\
- $(top_srcdir)/library/canvas/src/libmdcanvas.la\
- @CTEMPLATE_LIBS@\
- @GNOME_LIBS@ @GRT_LIBS@ @PCRE_LIBS@ @GLIB_LIBS@ @CAIRO_LIBS@ @ZIP_LIBS@ @MYSQL_LIBS@ @SQLITE3_LIBS@\
-+ -lmysqlcppconn \
- -lX11
-
- #precompiled.h.gch: precompiled.h
diff --git a/wrapper-exec.patch b/wrapper-exec.patch
index 3722140..4c64767 100644
--- a/wrapper-exec.patch
+++ b/wrapper-exec.patch
@@ -1,12 +1,12 @@
---- mysql-workbench-gpl-5.2.38-src/./frontend/linux/workbench/mysql-workbench.in~ 2012-05-13 22:10:55.000000000 +0300
-+++ mysql-workbench-gpl-5.2.38-src/./frontend/linux/workbench/mysql-workbench.in 2012-05-13 22:12:35.259827721 +0300
-@@ -57,7 +57,7 @@
-
+--- mysql-workbench-gpl-5.2.44-src/./frontend/linux/workbench/mysql-workbench.in~ 2012-10-04 12:01:43.000000000 +0300
++++ mysql-workbench-gpl-5.2.44-src/./frontend/linux/workbench/mysql-workbench.in 2012-10-04 12:02:04.321049986 +0300
+@@ -59,7 +59,7 @@
+ export MWB_BASE_DIR="$basedirname"
if type -p catchsegv > /dev/null; then
--catchsegv $bindirname/mysql-workbench-bin "$@"
-+exec catchsegv $bindirname/mysql-workbench-bin "$@"
+-catchsegv $basedirname/$libexecdir/mysql-workbench-bin "$@"
++exec catchsegv $basedirname/$libexecdir/mysql-workbench-bin "$@"
else
--$bindirname/mysql-workbench-bin "$@"
-+exec $bindirname/mysql-workbench-bin "$@"
+-$basedirname/$libexecdir/mysql-workbench-bin "$@"
++exec $basedirname/$libexecdir/mysql-workbench-bin "$@"
fi
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql-workbench.git/commitdiff/b2dd4e3f7164b7dd777f447eb8cbff81c716d445
More information about the pld-cvs-commit
mailing list