[packages/mysql-workbench: 1/5] update to 6.1.4
glen
glen at pld-linux.org
Mon May 26 10:50:30 CEST 2014
commit 5646395f5305349e59132e1a281262e86ea9b16e
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun May 4 09:49:31 2014 +0300
update to 6.1.4
avoid-version.patch | 312 --------------------------------------
bashism.patch | 87 +++++------
get_local_ip_list.patch | 11 --
libzip-headers.patch | 38 -----
log_slow_queries.patch | 20 +--
mysql-workbench-desktop.patch | 11 --
mysql-workbench-posix.patch | 14 --
mysql-workbench-python_libs.patch | 25 ---
mysql-workbench.spec | 101 ++++++------
pld-profile.patch | 20 +--
system-antlr.patch | 11 --
system-cppconn.patch | 113 --------------
wrapper-exec.patch | 16 +-
13 files changed, 110 insertions(+), 669 deletions(-)
---
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index 2fd16aa..9c743f6 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -1,36 +1,36 @@
# NOTE
-# - change history: http://dev.mysql.com/doc/workbench/en/wb-change-history.html
+# - change history: http://dev.mysql.com/doc/relnotes/workbench/en/
# 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
+# - package docs? (use without "-nodocs" tarball)
+#
+# Conditional build:
+%bcond_without gnome_keyring # build with gnome-keyring
+%bcond_without unixodbc # Use unixODBC instead of iODBC
+%bcond_with system_antlr # Use system antlr (All known publicly available versions of Antlr3C are buggy)
+
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.47
-Release: 1
+Version: 6.1.4
+Release: 0.3
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: e7cfb1249dddf628a6586bc309679ef3
+Source0: http://cdn.mysql.com/Downloads/MySQLGUITools/%{name}-community-%{version}-nodocs-src.tar.gz
+# Source0-md5: c0aa6043c75a8fb810cc1ef60cc916a4
Source1: PLD_Linux_(MySQL_Package).xml
-Patch0: %{name}-desktop.patch
-Patch1: %{name}-python_libs.patch
-Patch2: %{name}-posix.patch
-Patch3: system-antlr.patch
Patch5: pld-profile.patch
-Patch6: get_local_ip_list.patch
Patch7: log_slow_queries.patch
Patch8: bashism.patch
-Patch9: system-cppconn.patch
-Patch10: avoid-version.patch
Patch11: wrapper-exec.patch
-Patch12: libzip-headers.patch
URL: http://wb.mysql.com/
BuildRequires: OpenGL-devel
BuildRequires: autoconf
BuildRequires: automake >= 1.9
BuildRequires: boost-devel
BuildRequires: cairo-devel >= 1.5.12
+BuildRequires: cmake >= 2.8
BuildRequires: ctemplate-devel
BuildRequires: gettext-devel
BuildRequires: glib2-devel
@@ -39,21 +39,29 @@ BuildRequires: libantlr3c-devel >= 3.4
BuildRequires: libglade2-devel
#BuildRequires: libgnome-devel >= 2.0
BuildRequires: libgnome-keyring-devel
+%{?with_gnome_keyring:BuildRequires: libgnome-keyring-devel}
BuildRequires: libsigc++-devel >= 2.0
BuildRequires: libtool
BuildRequires: libuuid-devel
+BuildRequires: libxml2-devel
BuildRequires: libzip-devel
BuildRequires: lua51-devel
BuildRequires: mysql-connector-c++-devel >= 1.1.0-0.bzr916
BuildRequires: mysql-devel
+BuildRequires: pcre-cxx-devel
BuildRequires: pcre-devel
BuildRequires: pkgconfig
-BuildRequires: python-devel
+BuildRequires: python-devel >= 1:2.6
BuildRequires: readline-devel
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.566
BuildRequires: sqlite3-devel
-BuildRequires: unixODBC-devel
+BuildRequires: swig
+BuildRequires: tinyxml-devel
+%{?with_unixodbc:BuildRequires: unixODBC-devel}
+BuildRequires: libvsqlitepp-devel
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXext-devel
Requires: desktop-file-utils
Requires: python-paramiko
Requires: python-pexpect
@@ -84,62 +92,41 @@ danych, dokumentowania istniejących baz danych, a nawet wykonywania
skomplikowanych migracji do MySQL-a.
%prep
-%setup -q -n %{name}-gpl-%{version}-src
-%undos MySQLWorkbench.desktop.in
-# we use System provided libraries
-rm -r ext/antlr-runtime
-rm -r ext/cppconn
-rm -r ext/python/pexpect
-#rm -r ext/tinyxml
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%setup -q -n %{name}-community-%{version}-nodocs-src
%patch5 -p1
-%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
-%patch10 -p1
%patch11 -p1
-%patch12 -p1
cp -p '%{SOURCE1}' res/mysql.profiles
+# use System provided libraries
+%{?with_system_antlr:rm -r ext/antlr-runtime}
+#rm -r ext/scintilla
+#rm -r ext/HTMLRenderer
+#rm -r ext/Aga.Controls
+
%build
-%{__glib_gettextize}
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
- --disable-dependency-tracking \
- --with-unixodbc \
- CFLAGS="%{rpmcppflags} %{rpmcflags} -Wno-deprecated" \
- LUA_LIBS="$(pkg-config --libs lua51)" \
- LUA_CFLAGS="$(pkg-config --cflags lua51)"
+%cmake . \
+ -DLIB_INSTALL_DIR=%{_libdir} \
+ -DWB_INSTALL_DIR_EXECUTABLE=%{_libdir}/%{name} \
+ -DUSE_UNIXODBC=%{!?with_unixodbc:NO}%{?with_unixodbc:YES}
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-# clear mimeinfodata_DATA because don't want deprecated gnome-vfs install
%{__make} install \
- doc_DATA= \
- mimeinfodata_DATA= \
DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT%{_libdir}/%{name} -name '*.la' | xargs rm -v
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
+
+# deprecated gnome-vfs install
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/mime-info/%{name}.mime
%py_comp $RPM_BUILD_ROOT%{_libdir}/%{name}
%py_comp $RPM_BUILD_ROOT%{_datadir}/%{name}
# cleaning .py breaks ssh connections
-#%%py_postclean %{_libdir}/%{name} %{_datadir}/%{name}
-
-install -d $RPM_BUILD_ROOT%{_pixmapsdir}
-cp -p images/icons/MySQLWorkbench-128.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
-
-mv $RPM_BUILD_ROOT%{_desktopdir}/{MySQLWorkbench,%{name}}.desktop
+%py_postclean %{_libdir}/%{name} %{_datadir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -152,6 +139,7 @@ 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}
@@ -159,14 +147,11 @@ rm -rf $RPM_BUILD_ROOT
%{_iconsdir}/hicolor/*x*/apps/mysql-workbench.png
%{_iconsdir}/hicolor/*x*/mimetypes/*.png
%{_desktopdir}/%{name}.desktop
-%{_pixmapsdir}/%{name}.png
%dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}-bin
-%attr(755,root,root) %{_libdir}/%{name}/*.so*
+%attr(755,root,root) %{_libdir}/%{name}/*.so
%dir %{_libdir}/%{name}/modules
%{_libdir}/%{name}/modules/*.py*
-%{_libdir}/%{name}/modules/*.lua
-%attr(755,root,root) %{_libdir}/%{name}/modules/*.so*
+%attr(755,root,root) %{_libdir}/%{name}/modules/*.so
%dir %{_libdir}/%{name}/plugins
-%attr(755,root,root) %{_libdir}/%{name}/plugins/*.so*
+%attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
diff --git a/avoid-version.patch b/avoid-version.patch
deleted file mode 100644
index e5ac8ed..0000000
--- a/avoid-version.patch
+++ /dev/null
@@ -1,312 +0,0 @@
---- mysql-workbench-gpl-5.2.38-src/library/dbc/Makefile.am~ 2012-02-21 18:53:36.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/library/dbc/Makefile.am 2012-05-11 21:19:03.354697038 +0300
-@@ -1,6 +1,6 @@
-
- pkglib_LTLIBRARIES=libcdbc.la
--
-+libcdbc_la_LDFLAGS = -avoid-version
-
- libcdbc_la_SOURCES=\
- src/driver_manager.cpp\
---- mysql-workbench-gpl-5.2.38-src/library/grt/src/Makefile.am~ 2012-02-21 18:53:42.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/library/grt/src/Makefile.am 2012-05-12 02:16:55.176694692 +0300
-@@ -18,7 +18,9 @@
- @SIGC_LIBS@\
- @GRT_LIBS@\
- $(top_srcdir)/library/base/libwbbase.la
--
-+
-+libgrt_la_LDFLAGS = -avoid-version
-+
- libgrt_la_SOURCES=\
- grtpp_grt.cpp\
- grtpp_helper.cpp\
---- mysql-workbench-gpl-5.2.38-src/frontend/linux/linux_utilities/Makefile.am~ 2012-02-21 18:53:45.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/frontend/linux/linux_utilities/Makefile.am 2012-05-12 02:18:22.364063083 +0300
-@@ -6,6 +6,8 @@
- liblinux_utilities_la_LIBADD=$(top_srcdir)/frontend/linux/sqlide/libsqlide.la\
- $(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la
-
-+liblinux_utilities_la_LDFLAGS = -avoid-version
-+
- INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_CFLAGS@\
- -I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/base\
- -I$(top_srcdir)/backend/wbpublic -I$(top_srcdir)/generated -I$(top_srcdir)/library/canvas/src\
---- mysql-workbench-gpl-5.2.38-src/library/canvas/src/Makefile.am~ 2012-02-21 18:53:42.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/library/canvas/src/Makefile.am 2012-05-12 02:20:32.933605472 +0300
-@@ -51,6 +51,9 @@
- libmdcanvas_la_LIBADD=@CAIRO_LIBS@
- libmdcanvasgtk_la_LIBADD=@CAIRO_LIBS@ @GNOME_LIBS@
-
-+libmdcanvas_la_LDFLAGS = -avoid-version
-+libmdcanvasgtk_la_LDFLAGS = -avoid-version
-+
- INCLUDES=@CAIRO_CFLAGS@ @GNOME_CFLAGS@ \
- -I$(top_srcdir)/backend \
- -I$(top_srcdir)/library/base
---- mysql-workbench-gpl-5.2.38-src/library/forms/Makefile.am~ 2012-02-21 18:53:45.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/library/forms/Makefile.am 2012-05-12 02:21:20.292469934 +0300
-@@ -75,6 +75,7 @@
- gtk/src/lf_hypertext.cpp
-
- libmforms_la_LIBADD=@GNOME_LIBS@ @GNOME_KEYRING_LIBS@
-+libmforms_la_LDFLAGS = -avoid-version
-
- INCLUDES=@GLIB_CFLAGS@ @GNOME_CFLAGS@ @SIGC_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_KEYRING_CFLAGS@ @PCRE_CFLAGS@ \
- -I$(top_srcdir)/library/forms\
---- mysql-workbench-gpl-5.2.38-src/frontend/linux/sqlide/Makefile.am~ 2012-02-21 18:53:46.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/frontend/linux/sqlide/Makefile.am 2012-05-12 02:22:01.407711315 +0300
-@@ -5,6 +5,7 @@
- pkglib_LTLIBRARIES=libsqlide.la
-
- libsqlide_la_LIBADD=$(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la
-+libsqlide_la_LDFLAGS = -avoid-version
-
- INCLUDES=\
- -I$(top_srcdir)/frontend/linux\
---- mysql-workbench-gpl-5.2.38-src/library/sql-parser/source/Makefile.am~ 2012-02-21 18:53:39.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/library/sql-parser/source/Makefile.am 2012-05-12 02:22:59.347066788 +0300
-@@ -3,6 +3,8 @@
- AM_CFLAGS= $(CFLAGS) $(TEST_CFLAGS)
- AM_CXXFLAGS= $(CXXFLAGS) $(TEST_CFLAGS) -Wno-unknown-pragmas
-
-+libsqlparser_la_LDFLAGS = -avoid-version
-+
- libsqlparser_la_SOURCES=\
- charset-def.cpp\
- charset.cpp\
---- mysql-workbench-gpl-5.2.38-src/ext/vsqlite++/src/sqlite/Makefile.am~ 2012-02-21 18:53:37.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/ext/vsqlite++/src/sqlite/Makefile.am 2012-05-12 02:23:44.272484990 +0300
-@@ -1,5 +1,7 @@
- pkglib_LTLIBRARIES=libvsqlitepp.la
-
-+libvsqlitepp_la_LDFLAGS = -avoid-version
-+
- libvsqlitepp_la_SOURCES=\
- command.cpp\
- connection.cpp\
---- mysql-workbench-gpl-5.2.38-src/library/base/Makefile.am~ 2012-02-21 18:53:37.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/library/base/Makefile.am 2012-05-12 02:24:25.964419798 +0300
-@@ -10,6 +10,8 @@
- libwbbase_la_LIBADD=@GLIB_LIBS@\
- @PCRE_LIBS@ @CAIRO_LIBS@
-
-+libwbbase_la_LDFLAGS = -avoid-version
-+
- libwbbase_la_SOURCES=util_functions.cpp\
- sqlstring.cpp\
- file_functions.cpp\
---- mysql-workbench-gpl-5.2.38-src/backend/wbpublic/Makefile.am~ 2012-02-21 18:53:41.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/backend/wbpublic/Makefile.am 2012-05-12 02:25:21.033642078 +0300
-@@ -21,6 +21,8 @@
- -I$(top_srcdir)/backend/wbpublic -I$(top_srcdir)/generated\
- -I$(top_srcdir)/modules
-
-+libwbpublic_la_LDFLAGS = -avoid-version
-+
- libwbpublic_la_SOURCES=\
- grt/refresh_ui.cpp\
- grt/editor_base.cpp\
---- mysql-workbench-gpl-5.2.38-src/ext/scintilla/gtk/Makefile.am~ 2012-02-21 18:53:41.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/ext/scintilla/gtk/Makefile.am 2012-05-12 02:25:56.285278012 +0300
-@@ -9,6 +9,8 @@
-
- libwbscintilla_la_LIBADD=@GNOME_LIBS@
-
-+libwbscintilla_la_LDFLAGS = -avoid-version
-+
- libwbscintilla_la_SOURCES=\
- scintilla-marshal.c\
- ../src/Selection.cxx\
---- mysql-workbench-gpl-5.2.38-src/modules/db.checks/Makefile.am~ 2012-02-21 18:53:42.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/modules/db.checks/Makefile.am 2012-05-12 02:26:46.417604515 +0300
-@@ -14,7 +14,7 @@
- -I$(top_srcdir)/modules/db.mysql/src\
- @GRT_CFLAGS@ @GLIB_CFLAGS@ @GNOME_CFLAGS@ @PCRE_CFLAGS@
-
--db_checks_wbp_la_LDFLAGS=-module
-+db_checks_wbp_la_LDFLAGS=-module -avoid-version
-
- db_checks_wbp_la_SOURCES=\
- ./register_plugin.cpp \
---- mysql-workbench-gpl-5.2.38-src/modules/db.mysql.query/Makefile.am~ 2012-02-21 18:53:42.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/modules/db.mysql.query/Makefile.am 2012-05-12 02:27:31.016432039 +0300
-@@ -11,4 +11,4 @@
-
-
- db_mysql_query_grt_la_SOURCES=src/dbquery.cpp
--db_mysql_query_grt_la_LDFLAGS=-module
-+db_mysql_query_grt_la_LDFLAGS=-module -avoid-version
---- mysql-workbench-gpl-5.2.38-src/modules/db.mysql.sqlide/Makefile.am~ 2012-02-21 18:53:41.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/modules/db.mysql.sqlide/Makefile.am 2012-05-12 02:27:40.350199228 +0300
-@@ -22,7 +22,7 @@
- @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@
-
-
--db_mysql_sqlide_grt_la_LDFLAGS=-module
-+db_mysql_sqlide_grt_la_LDFLAGS=-module -avoid-version
- #db_mysql_sqlide_grt_la_LIBADD=
-
- db_mysql_sqlide_grt_la_SOURCES=\
---- mysql-workbench-gpl-5.2.38-src/modules/db.mysql.sqlparser/Makefile.am~ 2012-02-21 18:53:37.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/modules/db.mysql.sqlparser/Makefile.am 2012-05-12 02:27:47.210518114 +0300
-@@ -18,7 +18,7 @@
- -I$(top_srcdir)/library/base\
- @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @PCRE_CFLAGS@ @SIGC_CFLAGS@
-
--db_mysql_sqlparser_grt_la_LDFLAGS=-module
-+db_mysql_sqlparser_grt_la_LDFLAGS=-module -avoid-version
-
- db_mysql_sqlparser_grt_la_SOURCES=\
- src/db.mysql.sqlparser.cpp\
---- mysql-workbench-gpl-5.2.38-src/modules/db.mysql/Makefile.am~ 2012-02-21 18:53:45.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/modules/db.mysql/Makefile.am 2012-05-12 02:27:53.890828632 +0300
-@@ -32,7 +32,7 @@
- # db_mysql_statement_parser_fe.cpp
- #
-
--db_mysql_grt_la_LDFLAGS=-module
-+db_mysql_grt_la_LDFLAGS=-module -avoid-version
- #ctemplate linked to main binary
- #db_mysql_grt_la_LIBADD=-L$(top_srcdir)/ext/ctemplate/ctemplate-src/ $(top_srcdir)/ext/ctemplate/ctemplate-src/libctemplate_wb.la
-
---- mysql-workbench-gpl-5.2.38-src/modules/db/Makefile.am~ 2012-02-21 18:53:39.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/modules/db/Makefile.am 2012-05-12 02:28:04.231309282 +0300
-@@ -10,5 +10,5 @@
-
-
- dbutils_grt_la_SOURCES=src/dbutils.cpp
--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.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 @@
- @CTEMPLATE_CFLAGS@ @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @PCRE_CFLAGS@
-
-
--wb_model_grt_la_LDFLAGS=-module
-+wb_model_grt_la_LDFLAGS=-module -avoid-version
- #wb_model_grt_la_LIBADD=$(top_srcdir)/ext/ctemplate
-
- wb_model_grt_la_SOURCES=src/graph_renderer.cpp \
---- mysql-workbench-gpl-5.2.38-src/modules/wb.mysql.import/Makefile.am~ 2012-02-21 18:53:45.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/modules/wb.mysql.import/Makefile.am 2012-05-12 02:28:27.719067719 +0300
-@@ -21,7 +21,7 @@
- @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@
-
-
--wb_mysql_import_grt_la_LDFLAGS=-module
-+wb_mysql_import_grt_la_LDFLAGS=-module -avoid-version
- #wb_mysql_import_grt_la_LIBADD=
-
- wb_mysql_import_grt_la_SOURCES=\
---- mysql-workbench-gpl-5.2.38-src/modules/wb.mysql.validation/Makefile.am~ 2012-02-21 18:53:46.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/modules/wb.mysql.validation/Makefile.am 2012-05-12 02:28:35.562765646 +0300
-@@ -20,7 +20,7 @@
- @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @PCRE_CFLAGS@
-
-
--wb_mysql_validation_grt_la_LDFLAGS=-module
-+wb_mysql_validation_grt_la_LDFLAGS=-module -avoid-version
- #wb_mysql_import_grt_la_LIBADD=$(top_srcdir)
- wb_mysql_validation_grt_la_LIBADD=@GRT_LIBS@ @GLIB_LIBS@ @SIGC_LIBS@
-
---- mysql-workbench-gpl-5.2.38-src/modules/wb.validation/Makefile.am~ 2012-02-21 18:53:37.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/modules/wb.validation/Makefile.am 2012-05-12 02:28:43.576471476 +0300
-@@ -18,7 +18,7 @@
- @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@
-
-
--wb_validation_grt_la_LDFLAGS=-module
-+wb_validation_grt_la_LDFLAGS=-module -avoid-version
- #wb_mysql_import_grt_la_LIBADD=$(top_srcdir)/backend/grtdb/libgrtdbbe.la
- wb_validation_grt_la_LIBADD=@GRT_LIBS@ @GLIB_LIBS@ @SIGC_LIBS@
-
---- mysql-workbench-gpl-5.2.38-src/plugins/wb.model.snippets/Makefile.am~ 2012-02-21 18:53:46.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/plugins/wb.model.snippets/Makefile.am 2012-05-12 02:29:01.087285423 +0300
-@@ -22,7 +22,7 @@
- @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @CAIRO_CFLAGS@
-
-
--wb_model_snippets_wbp_la_LDFLAGS=-module
-+wb_model_snippets_wbp_la_LDFLAGS=-module -avoid-version
-
- wb_model_snippets_wbp_la_SOURCES=\
- include_model_wizard.cpp\
---- mysql-workbench-gpl-5.2.38-src/plugins/wb.model.editors/linux/Makefile.am~ 2012-02-21 18:53:42.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/plugins/wb.model.editors/linux/Makefile.am 2012-05-12 02:29:53.739732841 +0300
-@@ -21,7 +21,7 @@
- @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @GNOME_CFLAGS@
-
-
--wb_model_editors_wbp_la_LDFLAGS=-module
-+wb_model_editors_wbp_la_LDFLAGS=-module -avoid-version
- 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.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.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 $(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
-+++ mysql-workbench-gpl-5.2.38-src/plugins/db.mysql.editors/linux/Makefile.am 2012-05-12 03:28:23.031619788 +0300
-@@ -33,7 +33,7 @@
- @GRT_CFLAGS@ @GLIB_CFLAGS@ @GNOME_CFLAGS@ @SIGC_CFLAGS@
-
-
--db_mysql_editors_wbp_la_LDFLAGS=-module
-+db_mysql_editors_wbp_la_LDFLAGS=-module -avoid-version
- db_mysql_editors_wbp_la_LIBADD=$(top_srcdir)/frontend/linux/linux_utilities/liblinux_utilities.la\
- $(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la
-
---- mysql-workbench-gpl-5.2.38-src/plugins/db.mysql/frontend/Makefile.am~ 2012-02-21 18:53:39.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/plugins/db.mysql/frontend/Makefile.am 2012-05-12 03:28:40.849108112 +0300
-@@ -25,7 +25,7 @@
- @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @CAIRO_CFLAGS@ @PCRE_CFLAGS@
-
-
--db_mysql_wbp_la_LDFLAGS=-module
-+db_mysql_wbp_la_LDFLAGS=-module -avoid-version
-
- db_mysql_wbp_la_SOURCES=\
- ../backend/db_frw_eng_be.cpp\
---- mysql-workbench-gpl-5.2.38-src/plugins/wb.printing/linux/Makefile.am~ 2012-02-21 18:53:37.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/plugins/wb.printing/linux/Makefile.am 2012-05-12 03:28:56.869846901 +0300
-@@ -20,7 +20,7 @@
- @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @GNOME_CFLAGS@
-
-
--wb_printing_wbp_la_LDFLAGS=-module
-+wb_printing_wbp_la_LDFLAGS=-module -avoid-version
- wb_printing_wbp_la_LIBADD=$(top_srcdir)/frontend/linux/linux_utilities/liblinux_utilities.la
-
- wb_printing_wbp_la_SOURCES=\
diff --git a/bashism.patch b/bashism.patch
index 4731fb9..48f9560 100644
--- a/bashism.patch
+++ b/bashism.patch
@@ -6,24 +6,49 @@
# Uncomment the following line if you're having trouble with gnome-keyring lockups.
# This will cause passwords to be stored only temporarily for the session.
---- mysql-workbench-gpl-5.2.45-src/./modules/wb.utils/wb_utils_grt.py~ 2012-12-31 11:43:56.000000000 +0200
-+++ mysql-workbench-gpl-5.2.45-src/./modules/wb.utils/wb_utils_grt.py 2012-12-31 11:44:25.938118046 +0200
-@@ -114,7 +114,7 @@
- subprocess.Popen(command, shell = True)
- else:
- command = """mysql \\"-u%s\\" \\"-h%s\\" -P%i %s -p %s""" % (user, host, port, socket, schema)
+--- mysql-workbench-community-6.1.4-nodocs-src/./plugins/wb.admin/backend/wb_server_management.py~ 2014-05-04 00:23:57.000000000 +0300
++++ mysql-workbench-community-6.1.4-nodocs-src/./plugins/wb.admin/backend/wb_server_management.py 2014-05-04 00:28:47.674146927 +0300
+@@ -82,7 +82,7 @@
+ if '/bin/sh' in sudo_prefix or '/bin/bash' in sudo_prefix:
+ command = sudo_prefix + " \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\""
+ else:
+- command = sudo_prefix + " /bin/bash -c \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\""
++ command = sudo_prefix + " /bin/sh -c \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\""
+
+ return command
+
+@@ -206,7 +206,7 @@
+ return data
+
+ # script should already have sudo
+- child = subprocess.Popen(["/bin/bash", "-c", script], bufsize=0,
++ child = subprocess.Popen(["/bin/sh", "-c", script], bufsize=0,
+ stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
+ close_fds=True)
+
+--- mysql-workbench-community-6.1.4-nodocs-src/./backend/wbprivate/workbench/wb_module.cpp~ 2014-03-26 17:47:23.000000000 +0200
++++ mysql-workbench-community-6.1.4-nodocs-src/./backend/wbprivate/workbench/wb_module.cpp 2014-05-04 00:30:43.365950180 +0300
+@@ -1807,7 +1807,7 @@
+ char *ster = NULL;
+ int rc=0;
+ GError *err = NULL;
+- if (g_spawn_command_line_sync("/bin/bash -c \"ps -ec | grep \\\"mysqld\\b\\\" | awk '{ print $1 }' | xargs ps -fp | awk 'NR > 1 {for(i=1;i<=7;i++)$i=\\\"\\\"; print $0}'\"", &stdo, &ster, &rc, &err) && stdo)
++ if (g_spawn_command_line_sync("/bin/sh -c \"ps -ec | grep \\\"mysqld\\b\\\" | awk '{ print $1 }' | xargs ps -fp | awk 'NR > 1 {for(i=1;i<=7;i++)$i=\\\"\\\"; print $0}'\"", &stdo, &ster, &rc, &err) && stdo)
+ {
+ std::string processes(stdo);
+
+--- mysql-workbench-community-6.1.4-nodocs-src/./modules/wb.utils/wb_utils_grt.py~ 2014-03-26 17:47:23.000000000 +0200
++++ mysql-workbench-community-6.1.4-nodocs-src/./modules/wb.utils/wb_utils_grt.py 2014-05-04 00:31:19.540890016 +0300
+@@ -433,7 +433,7 @@
+ if not bundled_client_path:
+ bundled_client_path = "mysql"
+ command = """\\"%s\\" \\"-u%s\\" \\"-h%s\\" -P%i %s -p %s""" % (bundled_client_path, user, host, port, socket, schema)
- subprocess.call(["/bin/bash", "-c", "%s -e \"%s\" &" % (get_linux_terminal_program(), command)])
+ subprocess.call(["/bin/sh", "-c", "%s -e \"%s\" &" % (get_linux_terminal_program(), command)])
- # Utilities only work in Py 2.6
-@@ -203,14 +203,14 @@
- f.write('echo "The following MySQL Utilities are available:"\n')
- f.write('echo $MYSQL_UTILITIES_COMMANDS\n')
- f.write('rm -f "%s"\n' % setup_script)
-- f.write('bash -i\n')
-+ f.write('sh -i\n')
- f.close()
+ if sys.platform == "linux2":
+@@ -524,9 +524,9 @@
os.chmod(setup_script, 0700)
if 'konsole' in term:
@@ -35,37 +60,3 @@
else:
raise RuntimeError("Terminal program could not be found")
---- 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.45-src/./plugins/wb.admin/backend/wb_server_management.py~ 2012-12-27 17:42:57.000000000 +0200
-+++ mysql-workbench-gpl-5.2.45-src/./plugins/wb.admin/backend/wb_server_management.py 2012-12-31 11:45:11.326796419 +0200
-@@ -69,7 +69,7 @@
- sudo_user = "sudo -u %s" % as_user
- sudo_prefix = sudo_prefix.replace('sudo', sudo_user)
-
-- if '/bin/sh' in sudo_prefix or '/bin/bash' in sudo_prefix:
-+ if '/bin/sh' in sudo_prefix or '/bin/sh' in sudo_prefix:
- command = sudo_prefix + " \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\""
- else:
- command = sudo_prefix + " /bin/sh -c \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\""
-@@ -152,7 +152,7 @@
-
- # Exec the command
- waiting_rest_of_password_prompt = False
-- 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
- if as_user != Users.CURRENT:
- # If sudo is being used, we need to input the password
- try:
diff --git a/get_local_ip_list.patch b/get_local_ip_list.patch
deleted file mode 100644
index 5ee3e26..0000000
--- a/get_local_ip_list.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mysql-workbench-gpl-5.2.38-src/./plugins/wb.admin/backend/wb_server_control.py~ 2012-02-21 18:53:37.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/./plugins/wb.admin/backend/wb_server_control.py 2012-05-11 19:32:38.486191919 +0300
-@@ -32,7 +32,7 @@
-
- #-------------------------------------------------------------------------------
- def get_local_ip_list():
-- cmd = "/bin/sh -c ifconfig"
-+ cmd = "/sbin/ifconfig"
- regexp = "inet addr:([0-9a-f:\.]+)"
-
- if hasattr(sys, 'getwindowsversion'):
diff --git a/libzip-headers.patch b/libzip-headers.patch
deleted file mode 100644
index 756649f..0000000
--- a/libzip-headers.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-
-Fix missing libzip includedir
-
-
-/grt -I../../ext/cppconn/ -I../../library/dbc/src -I../../ext/scintilla/include -I../../ext/vsqlite++/include -I../../ext/vsqli
-te -I../../ext/tinyxml -O2 -fwrapv -pipe -Wformat -Werror=format-security -gdwarf-4 -fno-debug-types-section -fvar-tracking-
-assignments -g2 -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -fPIC -march=x86-64 -gdwarf-4 -fno-debug-ty
-pes-section -fvar-tracking-assignments -g2 -Wextra -Wall -Wno-unused -Wno-deprecated -DTIXML_USE_STL=1 -c -o wb_model_file.
-o `test -f 'workbench/wb_model_file.cpp' || echo './'`workbench/wb_model_file.cpp
-In file included from workbench/wb_model_file.cpp:24:0:
-/usr/include/zip.h:53:21: fatal error: zipconf.h: No such file or directory
- #include <zipconf.h>
- ^
-compilation terminated.
-Makefile:1126: recipe for target 'wb_model_file.o' failed
-make[3]: *** [wb_model_file.o] Error 1
-make[3]: *** Waiting for unfinished jobs....
-In file included from ../../backend/wbpublic/grt/grt_manager.h:22:0,
- from workbench/wb_command_ui.h:25,
- from workbench/wb_context_ui.h:31,
- from workbench/wb_command_ui.cpp:23:
-../../library/grt/src/grtpp.h:113:5: warning: unused parameter 'index' [-Wunused-parameter]
- bad_item(size_t index, size_t count) : std::logic_error("Index out of range.") {}
- ^
-../../library/grt/src/grtpp.h:113:5: warning: unused parameter 'count' [-Wunused-parameter]
-In file included from ../../backend/wbpublic/grt/grt_dispatcher.h:23:0,
- from ../../backend/wbpublic/grt/grt_manager.h:26,
---- mysql-workbench-gpl-5.2.47-src/backend/wbprivate/Makefile.am~ 2013-02-14 22:54:06.000000000 +0200
-+++ mysql-workbench-gpl-5.2.47-src/backend/wbprivate/Makefile.am 2014-05-01 18:39:09.127379244 +0300
-@@ -2,7 +2,7 @@
-
- noinst_LIBRARIES=libwbprivate.a
-
--INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_CFLAGS@ @PCRE_CFLAGS@\
-+INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_CFLAGS@ @PCRE_CFLAGS@ @ZIP_CFLAGS@ \
- -I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/base\
- -I$(top_srcdir)/library/forms\
- -I$(top_srcdir)/library/forms/mforms\
diff --git a/log_slow_queries.patch b/log_slow_queries.patch
index 98d68a9..6154e17 100644
--- a/log_slow_queries.patch
+++ b/log_slow_queries.patch
@@ -1,11 +1,11 @@
---- mysql-workbench-gpl-5.2.47-src/./plugins/wb.admin/backend/wb_admin_control.py~ 2013-02-14 22:54:03.000000000 +0200
-+++ mysql-workbench-gpl-5.2.47-src/./plugins/wb.admin/backend/wb_admin_control.py 2014-05-01 16:06:43.138434870 +0300
-@@ -704,7 +704,7 @@
- self.server_profile.general_log_file_path = general_log_file_path or os.path.join(self.server_profile.datadir, hostname + '.log')
- request_save_profile = True
+--- mysql-workbench-community-6.1.4-nodocs-src/./plugins/wb.admin/backend/wb_admin_control.py~ 2014-03-26 17:47:23.000000000 +0200
++++ mysql-workbench-community-6.1.4-nodocs-src/./plugins/wb.admin/backend/wb_admin_control.py 2014-05-04 00:45:02.024193812 +0300
+@@ -717,7 +717,7 @@
+ self.server_profile.general_log_file_path = general_log_file_path or os.path.join(self.server_profile.datadir, hostname + '.log')
+ request_save_profile = True
-- 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 ''
- if self.server_profile.slow_log_file_path != slow_query_log_file:
- self.server_profile.slow_log_file_path = slow_query_log_file or os.path.join(self.server_profile.datadir, hostname + '.slow')
- request_save_profile = True
+- 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 ''
+ slow_query_log_file = normpath(slow_query_log_file)
+ if self.server_profile.slow_log_file_path != slow_query_log_file:
+ self.server_profile.slow_log_file_path = slow_query_log_file or os.path.join(self.server_profile.datadir, hostname + '.slow')
diff --git a/mysql-workbench-desktop.patch b/mysql-workbench-desktop.patch
deleted file mode 100644
index 3e34986..0000000
--- a/mysql-workbench-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mysql-workbench-gpl-5.2.38-src/MySQLWorkbench.desktop.in.wiget 2012-03-29 09:29:49.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/MySQLWorkbench.desktop.in 2012-03-29 09:33:26.656122014 +0200
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Name=MySQL Workbench
- Comment=MySQL Database Design, Administration and Development Tool
--Exec=#bindir#/mysql-workbench
-+Exec=mysql-workbench
- Terminal=false
- Type=Application
- Icon=mysql-workbench
diff --git a/mysql-workbench-posix.patch b/mysql-workbench-posix.patch
deleted file mode 100644
index b1b5d59..0000000
--- a/mysql-workbench-posix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- mysql-workbench-gpl-5.2.34-src/configure.in~ 2011-07-14 20:03:23.000000000 +0200
-+++ mysql-workbench-gpl-5.2.34-src/configure.in 2011-07-14 20:28:45.034453169 +0200
-@@ -68,9 +68,9 @@
- std_edition=$enableval, std_edition=no)
-
- if test x$std_edition = xyes; then
-- echo -en "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#define EDITION_SE\n#define COMMERCIAL_CODE\n#endif\n" > wb_config.h
-+ printf "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#define EDITION_SE\n#define COMMERCIAL_CODE\n#endif\n" > wb_config.h
- else
-- echo -en "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#undef COMMERCIAL_CODE\n#define EDITION_OSS\n#endif\n" > wb_config.h
-+ printf "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#undef COMMERCIAL_CODE\n#define EDITION_OSS\n#endif\n" > wb_config.h
- fi
-
- AC_CHECK_HEADERS([sys/select.h])
diff --git a/mysql-workbench-python_libs.patch b/mysql-workbench-python_libs.patch
deleted file mode 100644
index 2ae3663..0000000
--- a/mysql-workbench-python_libs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Patch from Gentoo
-Use a simpler check for Python's libs that return an actual linker
-invocation (e.g. -lpython2.6) instead of the .so file. This fixes the
-case with forced as-needed where the .so gets re-ordered to the front
-during link.
-http://git.overlays.gentoo.org/gitweb/?p=user/wish.git;a=blob;f=dev-db/mysql-workbench/files/mysql-workbench-5.2.17-python-libs.patch;h=8fb6b71e91b0c5e14bb542e05f2bab1da4dbc60d;hb=6c2a287fc8cd60b3806ec3d5b058a513c4b417b5
---- mysql-workbench-gpl-5.2.37-src/configure.in~ 2011-12-22 23:37:36.000000000 +0100
-+++ mysql-workbench-gpl-5.2.37-src/configure.in 2011-12-29 14:47:02.360222574 +0100
-@@ -245,14 +245,9 @@
- AC_CHECK_PROG(PYTHON27, python2.7, [yes])
- # Python headers
- AC_MSG_CHECKING(for Python libraries)
--PYTHON_LIBS=[$(python -c "from distutils import sysconfig
--import os
--cfg=sysconfig.get_config_vars()
--lib = os.path.join(cfg['LIBDIR'], cfg['LDLIBRARY'])
--if os.path.exists(lib):
-- print \"-L\" + cfg['LIBDIR'] + \" -l\" + cfg['LDLIBRARY'].lstrip(\"lib\").rstrip(\".so\")")]
-+PYTHON_LIBS=[$(python -c 'import sys; print("-lpython%s.%s" % sys.version_info[:2])')]
- PYTHON_CFLAGS=[$(python -c "from distutils import sysconfig
- print sysconfig.get_python_inc()")]
- PYTHON_CFLAGS="-I$PYTHON_CFLAGS"
- if test "$PYTHON_LIBS" = ""; then
- AC_MSG_RESULT(not found)
-
diff --git a/pld-profile.patch b/pld-profile.patch
index a5e2b9b..c5aa3af 100644
--- a/pld-profile.patch
+++ b/pld-profile.patch
@@ -1,10 +1,10 @@
---- mysql-workbench-gpl-5.2.38-src/res/mysql.profiles/Makefile.am~ 2012-02-21 18:53:45.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/res/mysql.profiles/Makefile.am 2012-05-11 11:46:32.197808250 +0300
-@@ -9,6 +9,7 @@
- Linux_(Custom).xml\
- MacOS_X_(MySQL_Package).xml\
- OpenSolaris_(MySQL_Package).xml\
-+PLD_Linux_(MySQL_Package).xml \
- RHEL_(MySQL_Package).xml\
- SLES_(MySQL_Package).xml\
- Ubuntu_Linux_(MySQL_Package).xml\
+--- mysql-workbench-community-6.1.4-nodocs-src/res/mysql.profiles/CMakeLists.txt~ 2014-03-26 17:47:23.000000000 +0200
++++ mysql-workbench-community-6.1.4-nodocs-src/res/mysql.profiles/CMakeLists.txt 2014-05-04 00:23:21.709685131 +0300
+@@ -8,6 +8,7 @@
+ "Linux_(Custom).xml"
+ "MacOS_X_(MySQL_Package).xml"
+ "OpenSolaris_(MySQL_Package).xml"
++ "PLD_Linux_(MySQL_Package).xml"
+ "RHEL_(MySQL_Package).xml"
+ "Oracle_Linux_6_(MySQL_Package).xml"
+ "SLES_(MySQL_Package).xml"
diff --git a/system-antlr.patch b/system-antlr.patch
deleted file mode 100644
index 0db40e9..0000000
--- a/system-antlr.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mysql-workbench-gpl-5.2.44-src/ext/Makefile.am~ 2012-09-26 23:50:42.000000000 +0300
-+++ mysql-workbench-gpl-5.2.44-src/ext/Makefile.am 2012-10-04 23:12:21.247796323 +0300
-@@ -4,7 +4,7 @@
- endif
-
- if BUILD_ANTLR_RUNTIME
--antlr_dirs=antlr-runtime
-+antlr_dirs=
- endif
-
- SUBDIRS=scintilla/gtk cppconn vsqlite++ $(antlr_dirs) $(ctemplate_dirs)
diff --git a/system-cppconn.patch b/system-cppconn.patch
deleted file mode 100644
index d5abdef..0000000
--- a/system-cppconn.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-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/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>
-
-
-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
--ext/cppconn/Makefile
--ext/cppconn/driver/Makefile
- ext/vsqlite++/Makefile
- ext/vsqlite++/src/sqlite/Makefile
- backend/Makefile
-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_dirs) $(ctemplate_dirs)
-+SUBDIRS=scintilla/gtk vsqlite++ $(antlr_dirs) $(ctemplate_dirs)
-
- if BUNDLE_UTILITIES
- all-am:
---- mysql-workbench-gpl-5.2.45-src/frontend/linux/workbench/Makefile.am~ 2012-12-31 11:46:37.000000000 +0200
-+++ mysql-workbench-gpl-5.2.45-src/frontend/linux/workbench/Makefile.am 2012-12-31 11:47:02.801997914 +0200
-@@ -53,14 +53,13 @@
- $(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/mysql-parser/libmysqlparser.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");
--#ifdef _WIN32
-- library.append(".dll");
--#elif defined(__APPLE__)
-- library.append(".dylib");
--#else
-- library.append(".so");
--#endif
-+
-+ // Patch : use library in standard path
-+ 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);
-+ if (p) {
-+ gmodule = g_module_open(std::string(p).append(".6").c_str(), G_MODULE_BIND_LOCAL);
-+ g_free(p);
-+ }
-+
- if (NULL == gmodule)
- {
- fprintf(stderr, "Error: %s", g_module_error());
-- throw SQLException(std::string("Database driver: Failed to open library '").append(_driver_path + "/" + library).append("'. Check settings.").c_str());
-+ throw SQLException(std::string("Database driver: Failed to open library '").append(library).append("'. Check settings.").c_str());
- }
-
- Driver *(* get_driver_instance)()= NULL;
diff --git a/wrapper-exec.patch b/wrapper-exec.patch
index 4c64767..d845989 100644
--- a/wrapper-exec.patch
+++ b/wrapper-exec.patch
@@ -1,12 +1,12 @@
---- 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"
+--- mysql-workbench-community-6.1.4-nodocs-src/frontend/linux/workbench/mysql-workbench.in~ 2014-03-26 17:47:23.000000000 +0200
++++ mysql-workbench-community-6.1.4-nodocs-src/frontend/linux/workbench/mysql-workbench.in 2014-05-04 00:46:34.728331575 +0300
+@@ -51,7 +51,7 @@
+ export MWB_BINARIES_DIR="$destdir at WB_INSTALL_DIR_EXECUTABLE@"
if type -p catchsegv > /dev/null; then
--catchsegv $basedirname/$libexecdir/mysql-workbench-bin "$@"
-+exec catchsegv $basedirname/$libexecdir/mysql-workbench-bin "$@"
+-catchsegv $MWB_BINARIES_DIR/mysql-workbench-bin "$@"
++exec catchsegv $MWB_BINARIES_DIR/mysql-workbench-bin "$@"
else
--$basedirname/$libexecdir/mysql-workbench-bin "$@"
-+exec $basedirname/$libexecdir/mysql-workbench-bin "$@"
+-$MWB_BINARIES_DIR/mysql-workbench-bin "$@"
++exec $MWB_BINARIES_DIR/mysql-workbench-bin "$@"
fi
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql-workbench.git/commitdiff/95c846d83c7b58ba3e5ccae63819499984a2b052
More information about the pld-cvs-commit
mailing list