summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mysql-workbench-5.2.16-scintilla.patch221
-rw-r--r--mysql-workbench-5.2.27-ctemplate.patch34
-rw-r--r--mysql-workbench-5.2.27-dnl.patch21
-rw-r--r--mysql-workbench-5.2.28-cppconn.patch145
-rw-r--r--mysql-workbench-5.2.28-python.patch58
-rw-r--r--mysql-workbench-5.2.32-ctemplate.patch15
-rw-r--r--mysql-workbench-5.2.32-tinyxml.patch64
-rw-r--r--mysql-workbench-5.2.37-automake.patch47
-rw-r--r--mysql-workbench-5.2.41-antlr.patch23
-rw-r--r--mysql-workbench-5.2.41-cppconn.patch173
-rw-r--r--mysql-workbench-5.2.41-ctemplate.patch15
-rw-r--r--mysql-workbench-5.2.41-glib.patch12
-rw-r--r--mysql-workbench.spec39
13 files changed, 250 insertions, 617 deletions
diff --git a/mysql-workbench-5.2.16-scintilla.patch b/mysql-workbench-5.2.16-scintilla.patch
deleted file mode 100644
index 5eb41fe..0000000
--- a/mysql-workbench-5.2.16-scintilla.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-diff -up mysql-workbench-oss-5.2.16/configure.in.orig mysql-workbench-oss-5.2.16/configure.in
---- mysql-workbench-oss-5.2.16/configure.in.orig 2010-02-17 18:07:16.000000000 +0100
-+++ mysql-workbench-oss-5.2.16/configure.in 2010-02-17 18:07:28.000000000 +0100
-@@ -412,7 +412,6 @@ res/wbdata/Makefile
- res/mysql.profiles/Makefile
- res/sqlidedata/Makefile
- ext/Makefile
--ext/scintilla/gtk/Makefile
- backend/Makefile
- backend/wbpublic/Makefile
- backend/wbprivate/Makefile
-diff -up mysql-workbench-oss-5.2.16/ext/Makefile.am.orig mysql-workbench-oss-5.2.16/ext/Makefile.am
---- mysql-workbench-oss-5.2.16/ext/Makefile.am.orig 2010-02-17 18:03:58.000000000 +0100
-+++ mysql-workbench-oss-5.2.16/ext/Makefile.am 2010-02-17 18:05:16.000000000 +0100
-@@ -1 +1 @@
--SUBDIRS=ctemplate scintilla/gtk
-+SUBDIRS=ctemplate
-diff -up mysql-workbench-oss-5.2.16/ext/Makefile.in.orig mysql-workbench-oss-5.2.16/ext/Makefile.in
---- mysql-workbench-oss-5.2.16/ext/Makefile.in.orig 2010-02-17 18:04:03.000000000 +0100
-+++ mysql-workbench-oss-5.2.16/ext/Makefile.in 2010-02-17 18:05:14.000000000 +0100
-@@ -213,7 +213,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = ctemplate scintilla/gtk
-+SUBDIRS = ctemplate
- all: all-recursive
-
- .SUFFIXES:
-diff -up mysql-workbench-oss-5.2.16/frontend/linux/linux_utilities/Makefile.am.orig mysql-workbench-oss-5.2.16/frontend/linux/linux_utilities/Makefile.am
---- mysql-workbench-oss-5.2.16/frontend/linux/linux_utilities/Makefile.am.orig 2010-02-17 18:39:59.000000000 +0100
-+++ mysql-workbench-oss-5.2.16/frontend/linux/linux_utilities/Makefile.am 2010-02-17 18:40:40.000000000 +0100
-@@ -4,14 +4,14 @@ AM_CXXFLAGS=-rdynamic
- pkglib_LTLIBRARIES=liblinux_utilities.la
-
- liblinux_utilities_la_LIBADD=$(top_srcdir)/frontend/linux/sqlide/libsqlide.la\
-- $(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la
-+ -lscintilla
-
- INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_CFLAGS@\
- -I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/base/src \
- -I$(top_srcdir)/backend/wbpublic -I$(top_srcdir)/generated -I$(top_srcdir)/library/canvas/src\
- -I$(top_srcdir)/frontend/linux/workbench\
- -I$(top_srcdir)/frontend/linux/sqlide\
-- -I$(top_srcdir)/ext/scintilla/include\
-+ -I/usr/include/scintilla\
- -I$(top_srcdir)/ext\
- -I$(top_srcdir)/library/forms\
- -I$(top_srcdir)/library/forms/gtk\
-diff -up mysql-workbench-oss-5.2.16/frontend/linux/linux_utilities/Makefile.in.orig mysql-workbench-oss-5.2.16/frontend/linux/linux_utilities/Makefile.in
---- mysql-workbench-oss-5.2.16/frontend/linux/linux_utilities/Makefile.in.orig 2010-02-17 18:40:09.000000000 +0100
-+++ mysql-workbench-oss-5.2.16/frontend/linux/linux_utilities/Makefile.in 2010-02-17 18:41:09.000000000 +0100
-@@ -51,8 +51,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir
- pkglibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(pkglib_LTLIBRARIES)
- liblinux_utilities_la_DEPENDENCIES = \
-- $(top_srcdir)/frontend/linux/sqlide/libsqlide.la \
-- $(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la
-+ $(top_srcdir)/frontend/linux/sqlide/libsqlide.la
- am_liblinux_utilities_la_OBJECTS = custom_renderers.lo \
- listmodel_wrapper.lo treemodel_wrapper.lo \
- plugin_editor_base.lo image_cache.lo gtk_helpers.lo \
-@@ -237,14 +236,14 @@ top_srcdir = @top_srcdir@
- AM_CXXFLAGS = -rdynamic
- pkglib_LTLIBRARIES = liblinux_utilities.la
- liblinux_utilities_la_LIBADD = $(top_srcdir)/frontend/linux/sqlide/libsqlide.la\
-- $(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la
-+ -lscintilla
-
- INCLUDES = @GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_CFLAGS@\
- -I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/base/src \
- -I$(top_srcdir)/backend/wbpublic -I$(top_srcdir)/generated -I$(top_srcdir)/library/canvas/src\
- -I$(top_srcdir)/frontend/linux/workbench\
- -I$(top_srcdir)/frontend/linux/sqlide\
-- -I$(top_srcdir)/ext/scintilla/include\
-+ -I/usr/include/scintilla\
- -I$(top_srcdir)/ext\
- -I$(top_srcdir)/library/forms\
- -I$(top_srcdir)/library/forms/gtk\
-diff -up mysql-workbench-oss-5.2.16/frontend/linux/sqlide/Makefile.am.orig mysql-workbench-oss-5.2.16/frontend/linux/sqlide/Makefile.am
---- mysql-workbench-oss-5.2.16/frontend/linux/sqlide/Makefile.am.orig 2010-02-17 18:36:21.000000000 +0100
-+++ mysql-workbench-oss-5.2.16/frontend/linux/sqlide/Makefile.am 2010-02-17 18:38:36.000000000 +0100
-@@ -5,7 +5,7 @@ res/query_sidebar.glade
-
- pkglib_LTLIBRARIES=libsqlide.la
-
--libsqlide_la_LIBADD=$(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la
-+libsqlide_la_LIBADD=-lscintilla
-
- INCLUDES=\
- -I$(top_srcdir)/frontend/linux\
-@@ -19,7 +19,7 @@ INCLUDES=\
- -I$(top_srcdir)/library/dbc/src\
- -I$(top_srcdir)/ext/cppconn\
- -I$(top_srcdir)/library/vsqlite++/include\
---I$(top_srcdir)/ext/scintilla/include\
-+-I/usr/include/scintilla\
- @GRT_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@
-
- libsqlide_la_SOURCES=\
-diff -up mysql-workbench-oss-5.2.16/frontend/linux/sqlide/Makefile.in.orig mysql-workbench-oss-5.2.16/frontend/linux/sqlide/Makefile.in
---- mysql-workbench-oss-5.2.16/frontend/linux/sqlide/Makefile.in.orig 2010-02-17 18:36:33.000000000 +0100
-+++ mysql-workbench-oss-5.2.16/frontend/linux/sqlide/Makefile.in 2010-02-17 18:37:34.000000000 +0100
-@@ -51,8 +51,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.
- am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(pkgdatadir)"
- pkglibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(pkglib_LTLIBRARIES)
--libsqlide_la_DEPENDENCIES = \
-- $(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la
-+libsqlide_la_DEPENDENCIES =
- am_libsqlide_la_OBJECTS = sql_editor_fe.lo errors_list.lo \
- grid_view_model.lo grid_view.lo recordset_view.lo \
- sqlide_form.lo sql_snippets_view.lo query_sidebar.lo \
-@@ -241,7 +240,7 @@ res/db_sql_editor_view.glade\
- res/query_sidebar.glade
-
- pkglib_LTLIBRARIES = libsqlide.la
--libsqlide_la_LIBADD = $(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la
-+libsqlide_la_LIBADD = -lscintilla
- INCLUDES = \
- -I$(top_srcdir)/frontend/linux\
- -I$(top_srcdir)/backend/wbpublic\
-@@ -254,7 +253,7 @@ INCLUDES = \
- -I$(top_srcdir)/library/dbc/src\
- -I$(top_srcdir)/ext/cppconn\
- -I$(top_srcdir)/library/vsqlite++/include\
---I$(top_srcdir)/ext/scintilla/include\
-+-I/usr/include/scintilla\
- @GRT_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@
-
- libsqlide_la_SOURCES = \
-diff -up mysql-workbench-oss-5.2.16/modules/wb.model/Makefile.am.orig mysql-workbench-oss-5.2.16/modules/wb.model/Makefile.am
---- mysql-workbench-oss-5.2.16/modules/wb.model/Makefile.am.orig 2010-02-17 18:08:14.000000000 +0100
-+++ mysql-workbench-oss-5.2.16/modules/wb.model/Makefile.am 2010-02-17 18:34:14.000000000 +0100
-@@ -65,8 +65,7 @@ INCLUDES=-I$(top_srcdir)/generated\
- -I$(top_srcdir)/library/sql-parser/source/linux\
- -I$(top_srcdir)/ext/silvercity/src\
- -I$(top_srcdir)/library/tinyxml\
-- -I$(top_srcdir)/ext/scintilla/include\
-- -I$(top_srcdir)/ext/scintilla/src\
-+ -I/usr/include/scintilla\
- -I$(top_srcdir)/ext\
- -I$(top_srcdir)/modules/db.mysql.sqlide/src\
- -I$(top_srcdir)/ext/ctemplate/ctemplate-src/src\
-@@ -74,7 +73,7 @@ INCLUDES=-I$(top_srcdir)/generated\
-
-
- wb_model_grt_la_LDFLAGS=-module
--#wb_model_grt_la_LIBADD=$(top_srcdir)/ext/ctemplate
-+wb_model_grt_la_LIBADD=-lscintilla
-
- wb_model_grt_la_SOURCES=src/graph_renderer.cpp \
- src/reporting.cpp \
-diff -up mysql-workbench-oss-5.2.16/modules/wb.model/Makefile.in.orig mysql-workbench-oss-5.2.16/modules/wb.model/Makefile.in
---- mysql-workbench-oss-5.2.16/modules/wb.model/Makefile.in.orig 2010-02-17 18:08:19.000000000 +0100
-+++ mysql-workbench-oss-5.2.16/modules/wb.model/Makefile.in 2010-02-17 18:35:08.000000000 +0100
-@@ -306,15 +306,14 @@ INCLUDES = -I$(top_srcdir)/generated\
- -I$(top_srcdir)/library/sql-parser/source/linux\
- -I$(top_srcdir)/ext/silvercity/src\
- -I$(top_srcdir)/library/tinyxml\
-- -I$(top_srcdir)/ext/scintilla/include\
-- -I$(top_srcdir)/ext/scintilla/src\
-+ -I/usr/include/scintilla\
- -I$(top_srcdir)/ext\
- -I$(top_srcdir)/modules/db.mysql.sqlide/src\
- -I$(top_srcdir)/ext/ctemplate/ctemplate-src/src\
- @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@
-
- wb_model_grt_la_LDFLAGS = -module
--#wb_model_grt_la_LIBADD=$(top_srcdir)/ext/ctemplate
-+wb_model_grt_la_LIBADD=-lscintilla
- wb_model_grt_la_SOURCES = src/graph_renderer.cpp \
- src/reporting.cpp \
- src/wb_model.cpp \
-diff -up mysql-workbench-oss-5.2.16/plugins/db.mysql.editors/linux/Makefile.am.orig mysql-workbench-oss-5.2.16/plugins/db.mysql.editors/linux/Makefile.am
---- mysql-workbench-oss-5.2.16/plugins/db.mysql.editors/linux/Makefile.am.orig 2010-02-17 18:41:58.000000000 +0100
-+++ mysql-workbench-oss-5.2.16/plugins/db.mysql.editors/linux/Makefile.am 2010-02-17 18:43:10.000000000 +0100
-@@ -28,13 +28,13 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t
- -I$(top_srcdir)/frontend/linux/workbench\
- -I$(top_srcdir)/frontend/linux/linux_utilities\
- -I$(top_srcdir)/frontend/linux/sqlide\
-- -I$(top_srcdir)/ext/scintilla/include\
-+ -I/usr/include/scintilla\
- @GRT_CFLAGS@ @GLIB_CFLAGS@ @GNOME_CFLAGS@ @SIGC_CFLAGS@
-
-
- db_mysql_editors_wbp_la_LDFLAGS=-module
- db_mysql_editors_wbp_la_LIBADD=$(top_srcdir)/frontend/linux/linux_utilities/liblinux_utilities.la\
-- $(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la
-+ -lscintilla
-
- db_mysql_editors_wbp_la_SOURCES=\
- ../backend/mysql_relationship_editor.cpp\
-diff -up mysql-workbench-oss-5.2.16/plugins/db.mysql.editors/linux/Makefile.in.orig mysql-workbench-oss-5.2.16/plugins/db.mysql.editors/linux/Makefile.in
---- mysql-workbench-oss-5.2.16/plugins/db.mysql.editors/linux/Makefile.in.orig 2010-02-17 18:42:08.000000000 +0100
-+++ mysql-workbench-oss-5.2.16/plugins/db.mysql.editors/linux/Makefile.in 2010-02-17 18:42:42.000000000 +0100
-@@ -51,8 +51,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir
- "$(DESTDIR)$(plugindatadir)"
- pkglibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(pkglib_LTLIBRARIES)
--db_mysql_editors_wbp_la_DEPENDENCIES = $(top_srcdir)/frontend/linux/linux_utilities/liblinux_utilities.la \
-- $(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la
-+db_mysql_editors_wbp_la_DEPENDENCIES = $(top_srcdir)/frontend/linux/linux_utilities/liblinux_utilities.la
- am_db_mysql_editors_wbp_la_OBJECTS = mysql_relationship_editor.lo \
- mysql_routine_editor.lo mysql_routinegroup_editor.lo \
- mysql_schema_editor.lo mysql_table_editor.lo \
-@@ -276,12 +275,12 @@ INCLUDES = -I$(top_srcdir)/generated -I$
- -I$(top_srcdir)/frontend/linux/workbench\
- -I$(top_srcdir)/frontend/linux/linux_utilities\
- -I$(top_srcdir)/frontend/linux/sqlide\
-- -I$(top_srcdir)/ext/scintilla/include\
-+ -I/usr/include/scintilla\
- @GRT_CFLAGS@ @GLIB_CFLAGS@ @GNOME_CFLAGS@ @SIGC_CFLAGS@
-
- db_mysql_editors_wbp_la_LDFLAGS = -module
- db_mysql_editors_wbp_la_LIBADD = $(top_srcdir)/frontend/linux/linux_utilities/liblinux_utilities.la\
-- $(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la
-+ -lscintilla
-
- db_mysql_editors_wbp_la_SOURCES = \
- ../backend/mysql_relationship_editor.cpp\
diff --git a/mysql-workbench-5.2.27-ctemplate.patch b/mysql-workbench-5.2.27-ctemplate.patch
deleted file mode 100644
index 86906f7..0000000
--- a/mysql-workbench-5.2.27-ctemplate.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -up mysql-workbench-gpl-5.2.27/ext/Makefile.am.ctemplate mysql-workbench-gpl-5.2.27/ext/Makefile.am
---- mysql-workbench-gpl-5.2.27/ext/Makefile.am.ctemplate 2010-09-18 16:17:13.681151167 +0200
-+++ mysql-workbench-gpl-5.2.27/ext/Makefile.am 2010-09-18 16:17:13.688131149 +0200
-@@ -1,7 +1,4 @@
-
--if BUILD_CTEMPLATE
--else
--ctemplate_dirs=ctemplate
--endif
-
--SUBDIRS=scintilla/gtk $(ctemplate_dirs)
-+SUBDIRS=scintilla/gtk
-+
-diff -up mysql-workbench-gpl-5.2.27/ext/Makefile.in.ctemplate mysql-workbench-gpl-5.2.27/ext/Makefile.in
---- mysql-workbench-gpl-5.2.27/ext/Makefile.in.ctemplate 2010-09-18 16:17:13.000000000 +0200
-+++ mysql-workbench-gpl-5.2.27/ext/Makefile.in 2010-09-18 16:19:17.531005859 +0200
-@@ -53,7 +53,8 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
- distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
--DIST_SUBDIRS = scintilla/gtk ctemplate
-+@BUILD_CTEMPLATE_FALSE@ctemplate_dirs = ctemplate
-+DIST_SUBDIRS = scintilla/gtk $(ctemplate_dirs)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -213,7 +214,6 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--@BUILD_CTEMPLATE_FALSE@ctemplate_dirs = ctemplate
- SUBDIRS = scintilla/gtk $(ctemplate_dirs)
- all: all-recursive
-
diff --git a/mysql-workbench-5.2.27-dnl.patch b/mysql-workbench-5.2.27-dnl.patch
deleted file mode 100644
index 0f12cd1..0000000
--- a/mysql-workbench-5.2.27-dnl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up mysql-workbench-gpl-5.2.27/modules/db/Makefile.am.dnl mysql-workbench-gpl-5.2.27/modules/db/Makefile.am
---- mysql-workbench-gpl-5.2.27/modules/db/Makefile.am.dnl 2010-09-18 17:06:10.582256133 +0200
-+++ mysql-workbench-gpl-5.2.27/modules/db/Makefile.am 2010-09-18 17:07:37.070380972 +0200
-@@ -11,4 +11,4 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t
-
- dbutils_grt_la_SOURCES=src/dbutils.cpp
- dbutils_grt_la_LDFLAGS=-module
--dnl dbutils_grt_la_LIBADD=$(top_srcdir)/backend/grtdb/libgrtdbbe.la $(top_srcdir)/backend/grt/libgrtbe.la
-+#dbutils_grt_la_LIBADD=$(top_srcdir)/backend/grtdb/libgrtdbbe.la $(top_srcdir)/backend/grt/libgrtbe.la
-diff -up mysql-workbench-gpl-5.2.27/modules/db/Makefile.in.dnl mysql-workbench-gpl-5.2.27/modules/db/Makefile.in
---- mysql-workbench-gpl-5.2.27/modules/db/Makefile.in.dnl 2010-09-18 17:06:15.708005899 +0200
-+++ mysql-workbench-gpl-5.2.27/modules/db/Makefile.in 2010-09-18 17:07:07.737130492 +0200
-@@ -523,7 +523,7 @@ uninstall-am: uninstall-pkglibLTLIBRARIE
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
-
--dnl dbutils_grt_la_LIBADD=$(top_srcdir)/backend/grtdb/libgrtdbbe.la $(top_srcdir)/backend/grt/libgrtbe.la
-+#dbutils_grt_la_LIBADD=$(top_srcdir)/backend/grtdb/libgrtdbbe.la $(top_srcdir)/backend/grt/libgrtbe.la
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/mysql-workbench-5.2.28-cppconn.patch b/mysql-workbench-5.2.28-cppconn.patch
deleted file mode 100644
index 65d177f..0000000
--- a/mysql-workbench-5.2.28-cppconn.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-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 @@
- // 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"
-
-diff -up mysql-workbench-gpl-5.2.26/configure.in.cppconn mysql-workbench-gpl-5.2.26/configure.in
---- mysql-workbench-gpl-5.2.26/configure.in.cppconn 2010-08-05 15:33:27.000000000 +0200
-+++ mysql-workbench-gpl-5.2.26/configure.in 2010-08-07 08:11:56.906643649 +0200
-@@ -462,8 +462,6 @@ res/mysql.profiles/Makefile
- res/sqlidedata/Makefile
- ext/Makefile
- ext/scintilla/gtk/Makefile
--ext/cppconn/Makefile
--ext/cppconn/driver/Makefile
- backend/Makefile
- backend/wbpublic/Makefile
- backend/wbprivate/Makefile
-diff -up mysql-workbench-gpl-5.2.26/ext/Makefile.am.cppconn mysql-workbench-gpl-5.2.26/ext/Makefile.am
---- mysql-workbench-gpl-5.2.26/ext/Makefile.am.cppconn 2010-08-05 15:33:23.000000000 +0200
-+++ mysql-workbench-gpl-5.2.26/ext/Makefile.am 2010-08-07 08:11:56.907643461 +0200
-@@ -4,4 +4,4 @@ else
- ctemplate_dirs=ctemplate
- endif
-
--SUBDIRS=scintilla/gtk cppconn $(ctemplate_dirs)
-+SUBDIRS=scintilla/gtk $(ctemplate_dirs)
-diff -up mysql-workbench-gpl-5.2.26/ext/Makefile.in.cppconn mysql-workbench-gpl-5.2.26/ext/Makefile.in
---- mysql-workbench-gpl-5.2.26/ext/Makefile.in.cppconn 2010-08-05 15:33:32.000000000 +0200
-+++ mysql-workbench-gpl-5.2.26/ext/Makefile.in 2010-08-07 08:11:56.907643461 +0200
-@@ -53,7 +53,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
- distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
--DIST_SUBDIRS = scintilla/gtk cppconn ctemplate
-+DIST_SUBDIRS = scintilla/gtk ctemplate
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -214,7 +214,7 @@ target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @BUILD_CTEMPLATE_FALSE@ctemplate_dirs = ctemplate
--SUBDIRS = scintilla/gtk cppconn $(ctemplate_dirs)
-+SUBDIRS = scintilla/gtk $(ctemplate_dirs)
- all: all-recursive
-
- .SUFFIXES:
-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
- 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(".5").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 -up mysql-workbench-gpl-5.2.28-src/frontend/linux/workbench/Makefile.am.cppconn mysql-workbench-gpl-5.2.28-src/frontend/linux/workbench/Makefile.am
---- mysql-workbench-gpl-5.2.28-src/frontend/linux/workbench/Makefile.am.cppconn 2010-09-20 22:02:44.930765082 +0200
-+++ mysql-workbench-gpl-5.2.28-src/frontend/linux/workbench/Makefile.am 2010-09-20 22:03:42.489372852 +0200
-@@ -48,13 +48,11 @@ mysql_workbench_bin_LDADD=\
- $(top_srcdir)/library/base/src/libwbbase.la\
- $(top_srcdir)/library/grt/src/libgrt.la\
- $(top_srcdir)/library/dbc/libcdbc.la\
-- $(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la\
- $(top_srcdir)/library/canvas/src/libmdcanvasgtk.la\
- $(top_srcdir)/library/canvas/src/libmdcanvas.la\
-- $(top_srcdir)/ext/cppconn/driver/mysqlcppconn.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.28-src/frontend/linux/workbench/Makefile.in.cppconn mysql-workbench-gpl-5.2.28-src/frontend/linux/workbench/Makefile.in
---- mysql-workbench-gpl-5.2.28-src/frontend/linux/workbench/Makefile.in.cppconn 2010-09-20 22:02:34.683084613 +0200
-+++ mysql-workbench-gpl-5.2.28-src/frontend/linux/workbench/Makefile.in 2010-09-20 22:03:30.266939988 +0200
-@@ -71,10 +71,8 @@ mysql_workbench_bin_DEPENDENCIES = \
- $(top_srcdir)/library/base/src/libwbbase.la \
- $(top_srcdir)/library/grt/src/libgrt.la \
- $(top_srcdir)/library/dbc/libcdbc.la \
-- $(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la \
- $(top_srcdir)/library/canvas/src/libmdcanvasgtk.la \
-- $(top_srcdir)/library/canvas/src/libmdcanvas.la \
-- $(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la
-+ $(top_srcdir)/library/canvas/src/libmdcanvas.la
- binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
- SCRIPTS = $(bin_SCRIPTS)
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-@@ -305,13 +303,11 @@ mysql_workbench_bin_LDADD = \
- $(top_srcdir)/library/base/src/libwbbase.la\
- $(top_srcdir)/library/grt/src/libgrt.la\
- $(top_srcdir)/library/dbc/libcdbc.la\
-- $(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la\
- $(top_srcdir)/library/canvas/src/libmdcanvasgtk.la\
- $(top_srcdir)/library/canvas/src/libmdcanvas.la\
-- $(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la\
- @CTEMPLATE_LIBS@\
- @GNOME_LIBS@ @GRT_LIBS@ @PCRE_LIBS@ @GLIB_LIBS@ @CAIRO_LIBS@ @ZIP_LIBS@ @MYSQL_LIBS@ @SQLITE3_LIBS@\
-- -lX11
-+ -lmysqlcppconn -lX11
-
- mysql_workbench_bin_SOURCES = \
- main.cpp\
diff --git a/mysql-workbench-5.2.28-python.patch b/mysql-workbench-5.2.28-python.patch
deleted file mode 100644
index 1e872d2..0000000
--- a/mysql-workbench-5.2.28-python.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- mysql-workbench-oss-5.2.22/res/scripts/snippets/shell_snippets.py.orig 2010-06-04 21:38:58.639945233 +0200
-+++ mysql-workbench-oss-5.2.22/res/scripts/snippets/shell_snippets.py 2010-06-04 21:39:15.835195627 +0200
-@@ -1,19 +1,19 @@
-- # iterate through all schemas
-- for schema in grt.root.wb.doc.physicalModels[0].catalog.schemata:
-+# iterate through all schemas
-+for schema in grt.root.wb.doc.physicalModels[0].catalog.schemata:
- print schema.name
-
-- # iterate through all tables from schema
-- schema = grt.root.wb.doc.physicalModels[0].catalog.schemata[0]
-- for table in schema.tables:
-+# iterate through all tables from schema
-+schema = grt.root.wb.doc.physicalModels[0].catalog.schemata[0]
-+for table in schema.tables:
- print table.name
-
-- # iterate through columns from schema
-- schema = grt.root.wb.doc.physicalModels[0].catalog.schemata[0]
-- for table in schema.tables:
-+# iterate through columns from schema
-+schema = grt.root.wb.doc.physicalModels[0].catalog.schemata[0]
-+for table in schema.tables:
- for column in table.columns:
- print table.name, column.name
-
-- # iterate through all figures of a diagram
-- diagram = grt.root.wb.doc.physicalModels[0].diagram
-- for figure in diagram.figures:
-+# iterate through all figures of a diagram
-+diagram = grt.root.wb.doc.physicalModels[0].diagram
-+for figure in diagram.figures:
- print figure.__grtclassname__, figure.left, figure.top
---- mysql-workbench-gpl-5.2.28-src/res/scripts/snippets/shell_snippets.py.orig 2010-09-21 17:38:45.243356701 +0200
-+++ mysql-workbench-gpl-5.2.28-src/res/scripts/snippets/shell_snippets.py 2010-09-21 17:38:59.850746929 +0200
-@@ -18,14 +18,14 @@
- for figure in diagram.figures:
- print figure.__grtclassname__, figure.left, figure.top
-
-- # iterate through all resultset rows
-- resultset = grt.root.wb.sqlEditors[0].activeResultset
-- flag = resultset.goToFirst()
-- while flag:
-+# iterate through all resultset rows
-+resultset = grt.root.wb.sqlEditors[0].activeResultset
-+flag = resultset.goToFirst()
-+while flag:
- print resultset.stringFieldValue(0)
- flag = resultset.nextRow()
-
-- # replace sql editor contents
-- editor = grt.root.wb.sqlEditors[0].activeQueryBuffer
-- new_text = editor.sql
-- editor.replaceContents(new_text)
-+# replace sql editor contents
-+editor = grt.root.wb.sqlEditors[0].activeQueryBuffer
-+new_text = editor.sql
-+editor.replaceContents(new_text)
diff --git a/mysql-workbench-5.2.32-ctemplate.patch b/mysql-workbench-5.2.32-ctemplate.patch
deleted file mode 100644
index 1106494..0000000
--- a/mysql-workbench-5.2.32-ctemplate.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up mysql-workbench-gpl-5.2.32-src/ext/Makefile.am.ctemplate mysql-workbench-gpl-5.2.32-src/ext/Makefile.am
---- mysql-workbench-gpl-5.2.32-src/ext/Makefile.am.ctemplate 2011-03-04 01:54:51.000000000 +0100
-+++ mysql-workbench-gpl-5.2.32-src/ext/Makefile.am 2011-03-09 16:15:36.132686915 +0100
-@@ -1,10 +1,5 @@
-
--if BUILD_CTEMPLATE
--else
--ctemplate_dirs=ctemplate
--endif
--
--SUBDIRS=scintilla/gtk cppconn vsqlite++ $(ctemplate_dirs)
-+SUBDIRS=scintilla/gtk cppconn vsqlite++
-
- if BUNDLE_UTILITIES
- all-am:
diff --git a/mysql-workbench-5.2.32-tinyxml.patch b/mysql-workbench-5.2.32-tinyxml.patch
deleted file mode 100644
index 9479f01..0000000
--- a/mysql-workbench-5.2.32-tinyxml.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- mysql-workbench-gpl-5.2.32-src/library/forms/Makefile.am.tinyxml 2011-03-09 17:29:40.830185016 +0100
-+++ mysql-workbench-gpl-5.2.32-src/library/forms/Makefile.am 2011-03-09 17:29:58.392510545 +0100
-@@ -67,7 +67,7 @@
- gtk/src/lf_menu.cpp\
- gtk/src/lf_menubar.cpp
-
--libmforms_la_LIBADD=@GNOME_LIBS@ @GNOME_KEYRING_LIBS@
-+libmforms_la_LIBADD=@GNOME_LIBS@ @GNOME_KEYRING_LIBS@ -ltinyxml
-
- INCLUDES=@GNOME_CFLAGS@ @SIGC_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_KEYRING_CFLAGS@ \
- -I$(top_srcdir)/library/forms\
-@@ -79,7 +79,6 @@
- -I$(top_srcdir)/ext/vsqlite\
- -I$(top_srcdir)/library/\
- -I$(top_srcdir)/ext\
---I$(top_srcdir)/ext/tinyxml\
- -I$(top_srcdir)/ext/scintilla/include
-
-
---- mysql-workbench-gpl-5.2.32-src/modules/wb.mysql.import/Makefile.am.tinyxml 2011-03-04 01:54:41.000000000 +0100
-+++ mysql-workbench-gpl-5.2.32-src/modules/wb.mysql.import/Makefile.am 2011-03-09 17:21:41.863136166 +0100
-@@ -17,7 +17,6 @@
- -I$(top_srcdir)/library/sql-parser/source/linux\
- -I$(top_srcdir)/ext/vsqlite\
- -I$(top_srcdir)/ext/vsqlite++/include\
-- -I$(top_srcdir)/ext/tinyxml\
- @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@
-
-
-@@ -26,8 +25,4 @@
-
- wb_mysql_import_grt_la_SOURCES=\
- src/wb_mysql_import.cpp\
-- src/wb_mysql_import_dbd4.cpp\
-- $(top_srcdir)/ext/tinyxml/tinyxmlparser.cpp\
-- $(top_srcdir)/ext/tinyxml/tinyxml.cpp\
-- $(top_srcdir)/ext/tinyxml/tinystr.cpp\
-- $(top_srcdir)/ext/tinyxml/tinyxmlerror.cpp
-+ src/wb_mysql_import_dbd4.cpp
---- mysql-workbench-gpl-5.2.32-src/backend/wbprivate/Makefile.am.tinyxml 2011-03-04 01:54:50.000000000 +0100
-+++ mysql-workbench-gpl-5.2.32-src/backend/wbprivate/Makefile.am 2011-03-09 17:21:41.860136279 +0100
-@@ -13,8 +13,7 @@
- -I$(top_srcdir)/ext/cppconn/ -I$(top_srcdir)/library/dbc/src\
- -I$(top_srcdir)/ext/scintilla/include\
- -I$(top_srcdir)/ext/vsqlite++/include\
-- -I$(top_srcdir)/ext/vsqlite\
-- -I$(top_srcdir)/ext/tinyxml
-+ -I$(top_srcdir)/ext/vsqlite
-
- libwbprivate_a_SOURCES=\
- model/canvas_floater.cpp\
-@@ -74,11 +73,7 @@
- $(top_srcdir)/frontend/common/grt_shell_window.cpp\
- $(top_srcdir)/frontend/common/grt_code_editor.cpp\
- $(top_srcdir)/frontend/common/grt_python_debugger.cpp\
-- $(top_srcdir)/frontend/common/plugin_manager_window.cpp\
-- $(top_srcdir)/ext/tinyxml/tinyxmlparser.cpp\
-- $(top_srcdir)/ext/tinyxml/tinyxml.cpp\
-- $(top_srcdir)/ext/tinyxml/tinystr.cpp\
-- $(top_srcdir)/ext/tinyxml/tinyxmlerror.cpp
-+ $(top_srcdir)/frontend/common/plugin_manager_window.cpp
-
- #BUILT_SOURCES=stdafx.h.gch
- #stdafx.h.gch: workbench/stdafx.h
diff --git a/mysql-workbench-5.2.37-automake.patch b/mysql-workbench-5.2.37-automake.patch
deleted file mode 100644
index f6a3142..0000000
--- a/mysql-workbench-5.2.37-automake.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -up mysql-workbench-gpl-5.2.37-src/library/forms/swig/Makefile.am.auto mysql-workbench-gpl-5.2.37-src/library/forms/swig/Makefile.am
---- mysql-workbench-gpl-5.2.37-src/library/forms/swig/Makefile.am.auto 2012-02-04 19:38:01.000000000 +0100
-+++ mysql-workbench-gpl-5.2.37-src/library/forms/swig/Makefile.am 2012-02-04 19:38:57.000000000 +0100
-@@ -2,7 +2,7 @@
- pkglib_LTLIBRARIES=_mforms.la
-
- pkglibdir=$(libdir)/@PACKAGE@/modules
--pkglib_DATA=mforms.py
-+pkgdata_DATA=mforms.py
-
- _mforms_la_SOURCES=\
- mforms_wrap.cxx
-diff -up mysql-workbench-gpl-5.2.37-src/modules/wb.utils/Makefile.am.auto mysql-workbench-gpl-5.2.37-src/modules/wb.utils/Makefile.am
---- mysql-workbench-gpl-5.2.37-src/modules/wb.utils/Makefile.am.auto 2012-02-04 19:37:49.000000000 +0100
-+++ mysql-workbench-gpl-5.2.37-src/modules/wb.utils/Makefile.am 2012-02-04 19:38:39.000000000 +0100
-@@ -1,6 +1,6 @@
-
- pkglibdir=$(libdir)/@PACKAGE@/modules
-
--pkglib_DATA=catalog_utils.grt.lua tools.grt.lua wb_utils_grt.py sqlide_grt.py text_grt.py sql_reformatter.py\
-+pkgdata_DATA=catalog_utils.grt.lua tools.grt.lua wb_utils_grt.py sqlide_grt.py text_grt.py sql_reformatter.py\
- wb_dev_utils_grt.py table_utils_grt.py code_utils_grt.py
-
-diff -up mysql-workbench-gpl-5.2.37-src/plugins/wb.admin/frontend/Makefile.am.auto mysql-workbench-gpl-5.2.37-src/plugins/wb.admin/frontend/Makefile.am
---- mysql-workbench-gpl-5.2.37-src/plugins/wb.admin/frontend/Makefile.am.auto 2012-02-04 19:38:14.000000000 +0100
-+++ mysql-workbench-gpl-5.2.37-src/plugins/wb.admin/frontend/Makefile.am 2012-02-04 19:39:08.000000000 +0100
-@@ -1,7 +1,7 @@
-
- pkglibdir=$(libdir)/@PACKAGE@/modules
-
--pkglib_DATA=\
-+pkgdata_DATA=\
- wb_admin_grt.py\
- wb_admin_monitor.py\
- wb_admin_utils.py\
-diff -up mysql-workbench-gpl-5.2.37-src/plugins/wb.doclib/Makefile.am.auto mysql-workbench-gpl-5.2.37-src/plugins/wb.doclib/Makefile.am
---- mysql-workbench-gpl-5.2.37-src/plugins/wb.doclib/Makefile.am.auto 2012-02-04 19:38:08.000000000 +0100
-+++ mysql-workbench-gpl-5.2.37-src/plugins/wb.doclib/Makefile.am 2012-02-04 19:39:02.000000000 +0100
-@@ -1,7 +1,7 @@
-
- pkglibdir=$(libdir)/@PACKAGE@/modules
-
--pkglib_DATA=\
-+pkgdata_DATA=\
- mysqldoclib.py\
- wb_doclib_grt.py
-
diff --git a/mysql-workbench-5.2.41-antlr.patch b/mysql-workbench-5.2.41-antlr.patch
new file mode 100644
index 0000000..69ef249
--- /dev/null
+++ b/mysql-workbench-5.2.41-antlr.patch
@@ -0,0 +1,23 @@
+diff -up mysql-workbench-gpl-5.2.41-src/configure.in.antlr mysql-workbench-gpl-5.2.41-src/configure.in
+--- mysql-workbench-gpl-5.2.41-src/configure.in.antlr 2012-08-11 09:16:26.180997691 +0200
++++ mysql-workbench-gpl-5.2.41-src/configure.in 2012-08-11 09:16:26.201997764 +0200
+@@ -377,7 +377,8 @@ AC_SUBST(ODBC_LIBS)
+ AC_CHECK_HEADER([antlr3.h], ac_system_antlr_runtime=yes, ac_system_antlr_runtime=no)
+ if test "$ac_system_antlr_runtime" = yes; then
+ AC_RUN_IFELSE([AC_LANG_SOURCE([#include <antlr3config.h>
+-int main() { return strcmp(PACKAGE_VERSION, "3.4") >= 0; }
++#include <string.h>
++int main() { return strcmp(PACKAGE_VERSION, "3.4") < 0; }
+ ])],
+ AC_MSG_RESULT([antlr runtimes for C >= 3.4 found]),
+ [AC_MSG_RESULT([required antlr runtimes not found, using bundled])
+diff -up mysql-workbench-gpl-5.2.41-src/ext/Makefile.am.antlr mysql-workbench-gpl-5.2.41-src/ext/Makefile.am
+--- mysql-workbench-gpl-5.2.41-src/ext/Makefile.am.antlr 2012-08-11 09:17:06.014135012 +0200
++++ mysql-workbench-gpl-5.2.41-src/ext/Makefile.am 2012-08-11 09:17:18.452177547 +0200
+@@ -1,5 +1,5 @@
+
+-SUBDIRS=scintilla/gtk vsqlite++ antlr-runtime
++SUBDIRS=scintilla/gtk vsqlite++
+
+ if BUNDLE_UTILITIES
+ all-am:
diff --git a/mysql-workbench-5.2.41-cppconn.patch b/mysql-workbench-5.2.41-cppconn.patch
new file mode 100644
index 0000000..7d6d3a7
--- /dev/null
+++ b/mysql-workbench-5.2.41-cppconn.patch
@@ -0,0 +1,173 @@
+diff -up mysql-workbench-gpl-5.2.41-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.cppconn mysql-workbench-gpl-5.2.41-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp
+--- mysql-workbench-gpl-5.2.41-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.cppconn 2012-07-25 05:07:39.000000000 +0200
++++ mysql-workbench-gpl-5.2.41-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp 2012-08-11 08:31:17.262756837 +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.41-src/configure.in.cppconn mysql-workbench-gpl-5.2.41-src/configure.in
+--- mysql-workbench-gpl-5.2.41-src/configure.in.cppconn 2012-07-25 05:07:43.000000000 +0200
++++ mysql-workbench-gpl-5.2.41-src/configure.in 2012-08-11 08:32:04.937900117 +0200
+@@ -488,8 +488,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.41-src/ext/Makefile.am.cppconn mysql-workbench-gpl-5.2.41-src/ext/Makefile.am
+--- mysql-workbench-gpl-5.2.41-src/ext/Makefile.am.cppconn 2012-07-25 05:07:41.000000000 +0200
++++ mysql-workbench-gpl-5.2.41-src/ext/Makefile.am 2012-08-11 08:32:44.674022530 +0200
+@@ -4,7 +4,7 @@ else
+ ctemplate_dirs=ctemplate
+ endif
+
+-SUBDIRS=scintilla/gtk cppconn vsqlite++ antlr-runtime $(ctemplate_dirs)
++SUBDIRS=scintilla/gtk vsqlite++ antlr-runtime $(ctemplate_dirs)
+
+ if BUNDLE_UTILITIES
+ all-am:
+diff -up mysql-workbench-gpl-5.2.41-src/ext/Makefile.in.cppconn mysql-workbench-gpl-5.2.41-src/ext/Makefile.in
+--- mysql-workbench-gpl-5.2.41-src/ext/Makefile.in.cppconn 2012-07-25 05:07:51.000000000 +0200
++++ mysql-workbench-gpl-5.2.41-src/ext/Makefile.in 2012-08-11 08:33:21.593138333 +0200
+@@ -53,7 +53,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
+ distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = scintilla/gtk cppconn vsqlite++ antlr-runtime ctemplate
++DIST_SUBDIRS = scintilla/gtk vsqlite++ antlr-runtime ctemplate
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMTAR = @AMTAR@
+@@ -222,7 +222,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ unixodbc = @unixodbc@
+ @BUILD_CTEMPLATE_FALSE@ctemplate_dirs = ctemplate
+-SUBDIRS = scintilla/gtk cppconn vsqlite++ antlr-runtime $(ctemplate_dirs)
++SUBDIRS = scintilla/gtk vsqlite++ antlr-runtime $(ctemplate_dirs)
+ all: all-recursive
+
+ .SUFFIXES:
+diff -up mysql-workbench-gpl-5.2.41-src/frontend/linux/workbench/Makefile.am.cppconn mysql-workbench-gpl-5.2.41-src/frontend/linux/workbench/Makefile.am
+--- mysql-workbench-gpl-5.2.41-src/frontend/linux/workbench/Makefile.am.cppconn 2012-07-25 05:07:40.000000000 +0200
++++ mysql-workbench-gpl-5.2.41-src/frontend/linux/workbench/Makefile.am 2012-08-11 08:39:25.157340958 +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.41-src/frontend/linux/workbench/Makefile.in.cppconn mysql-workbench-gpl-5.2.41-src/frontend/linux/workbench/Makefile.in
+--- mysql-workbench-gpl-5.2.41-src/frontend/linux/workbench/Makefile.in.cppconn 2012-07-25 05:07:52.000000000 +0200
++++ mysql-workbench-gpl-5.2.41-src/frontend/linux/workbench/Makefile.in 2012-08-11 08:40:25.500548195 +0200
+@@ -71,7 +71,6 @@ mysql_workbench_bin_DEPENDENCIES = \
+ $(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 \
+@@ -304,7 +303,6 @@ INCLUDES = @GLIB_CFLAGS@ @SIGC_CFLAGS@ @
+ -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\
+@@ -320,14 +318,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
+
+ mysql_workbench_bin_SOURCES = \
+ main.cpp\
+diff -up mysql-workbench-gpl-5.2.41-src/library/dbc/src/driver_manager.cpp.cppconn mysql-workbench-gpl-5.2.41-src/library/dbc/src/driver_manager.cpp
+--- mysql-workbench-gpl-5.2.41-src/library/dbc/src/driver_manager.cpp.cppconn 2012-07-25 05:07:35.000000000 +0200
++++ mysql-workbench-gpl-5.2.41-src/library/dbc/src/driver_manager.cpp 2012-08-11 08:37:39.612984727 +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;
+--- mysql-workbench-gpl-5.2.41-src/backend/wbpublic/grtdb/diff_dbobjectmatch.cpp.cppconn 2012-08-11 09:25:04.192665300 +0200
++++ mysql-workbench-gpl-5.2.41-src/backend/wbpublic/grtdb/diff_dbobjectmatch.cpp 2012-08-11 09:25:41.106778794 +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 --git a/mysql-workbench-5.2.41-ctemplate.patch b/mysql-workbench-5.2.41-ctemplate.patch
new file mode 100644
index 0000000..0debab1
--- /dev/null
+++ b/mysql-workbench-5.2.41-ctemplate.patch
@@ -0,0 +1,15 @@
+diff -up mysql-workbench-gpl-5.2.41-src/ext/Makefile.am.ctemplate mysql-workbench-gpl-5.2.41-src/ext/Makefile.am
+--- mysql-workbench-gpl-5.2.41-src/ext/Makefile.am.ctemplate 2012-08-11 09:13:36.000000000 +0200
++++ mysql-workbench-gpl-5.2.41-src/ext/Makefile.am 2012-08-11 09:14:05.756513523 +0200
+@@ -1,10 +1,5 @@
+
+-if BUILD_CTEMPLATE
+-else
+-ctemplate_dirs=ctemplate
+-endif
+-
+-SUBDIRS=scintilla/gtk vsqlite++ antlr-runtime $(ctemplate_dirs)
++SUBDIRS=scintilla/gtk vsqlite++ antlr-runtime
+
+ if BUNDLE_UTILITIES
+ all-am:
diff --git a/mysql-workbench-5.2.41-glib.patch b/mysql-workbench-5.2.41-glib.patch
new file mode 100644
index 0000000..0798bfc
--- /dev/null
+++ b/mysql-workbench-5.2.41-glib.patch
@@ -0,0 +1,12 @@
+diff -up mysql-workbench-gpl-5.2.41-src/backend/wbpublic/sqlide/autocomplete_object_name_cache.cpp.glib mysql-workbench-gpl-5.2.41-src/backend/wbpublic/sqlide/autocomplete_object_name_cache.cpp
+--- mysql-workbench-gpl-5.2.41-src/backend/wbpublic/sqlide/autocomplete_object_name_cache.cpp.glib 2012-08-11 09:34:13.454462374 +0200
++++ mysql-workbench-gpl-5.2.41-src/backend/wbpublic/sqlide/autocomplete_object_name_cache.cpp 2012-08-11 09:34:19.431483470 +0200
+@@ -22,7 +22,7 @@
+ #include <sqlite/execute.hpp>
+ #include <sqlite/query.hpp>
+
+-#include <glib/gthread.h>
++#include <glib.h>
+
+ #include "autocomplete_object_name_cache.h"
+ #include "base/log.h"
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index 7034343..8e1c500 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -3,7 +3,7 @@
%global tarversion gpl-%{version}-src
# Use system cppconn if a compatible upstream version exists
-#global cppconnver 1.1.0-0.3.bzr895
+%global cppconnver 1.1.1
# "script_templates" (and some others) shouldn't be compiled
%global _python_bytecompile_errors_terminate_build 0
@@ -22,12 +22,13 @@ URL: http://wb.mysql.com
Source: http://gd.tuwien.ac.at/db/mysql/Downloads/MySQLGUITools/%{name}-%{tarversion}.tar.gz
# don't build extension, use system one
-# !!! This patch use versioned soname (libmysqlcppconn.so.5) !!!
-Patch1: %{name}-5.2.28-cppconn.patch
-Patch2: %{name}-5.2.32-ctemplate.patch
+# !!! This patch use versioned soname (libmysqlcppconn.so.6) !!!
+Patch1: %{name}-5.2.41-cppconn.patch
+Patch2: %{name}-5.2.41-ctemplate.patch
Patch3: %{name}-5.2.41-tinyxml.patch
-# http://bugs.mysql.com/63898 - fix for automake >= 1.11.2
-Patch8: %{name}-5.2.37-automake.patch
+Patch4: %{name}-5.2.41-antlr.patch
+# http://bugs.mysql.com/63705
+Patch5: %{name}-5.2.41-glib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pcre-devel >= 3.9
@@ -67,6 +68,9 @@ BuildRequires: desktop-file-utils
BuildRequires: tinyxml-devel >= 2.6.0
%endif
BuildRequires: libiodbc-devel
+%if 0%{?fedora} >= 17
+BuildRequires: antlr3-C-devel >= 3.4
+%endif
Requires: python-paramiko pexpect
%if 0%{?fedora} < 17
@@ -74,9 +78,9 @@ Requires: python-sqlite2
%endif
Requires: mysql-utilities
# requires mysql client pkg (for mysqldump and mysql cmdline client)
-Requires: mysql gnome-keyring
+Requires: mysql%{?_isa} gnome-keyring%{?_isa}
%if 0%{?cppconnver:1}
-Requires: mysql-connector-c++ >= %{cppconnver}
+Requires: mysql-connector-c++%{?_isa} >= %{cppconnver}
%endif
# Official upstream builds (name changes quite often)
Conflicts: mysql-workbench-oss
@@ -109,7 +113,7 @@ rm -rf ext/cppconn
%endif
%if 0%{?fedora} >= 12
-#patch2 -p1 -b .ctemplate
+%patch2 -p1 -b .ctemplate
rm -rf ext/ctemplate
%endif
@@ -118,8 +122,12 @@ rm -rf ext/ctemplate
rm -rf library/tinyxml
%endif
-#patch8 -p1 -b .automake
+%if 0%{?fedora} >= 17
+%patch4 -p1 -b .antlr
+rm -rf ext/antlr-runtime
+%endif
+%patch5 -p1 -b .glib
touch -r COPYING .timestamp4rpm
sed -i -e 's/\r//g' COPYING
@@ -136,7 +144,7 @@ touch po/POTFILES.in
%build
-#NOCONFIGURE=yes ./autogen.sh
+NOCONFIGURE=yes ./autogen.sh
export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive"
%configure \
--disable-debug \
@@ -167,6 +175,11 @@ desktop-file-install --vendor="" \
--dir=%{buildroot}%{_datadir}/applications/ \
MySQLWorkbench.desktop
+# move binary and fix launcher http://bugs.mysql.com/66322
+mv %{buildroot}%{_bindir}/%{name}-bin %{buildroot}%{_libdir}/%{name}/%{name}-bin
+sed -e 's:bindirname/mysql-workbench-bin:wblibdir/mysql-workbench-bin:' \
+ -i %{buildroot}%{_bindir}/%{name}
+
%clean
rm -rf %{buildroot}
@@ -192,7 +205,7 @@ fi
# NEWS and ChangeLog are empty or outdated
%doc AUTHORS COPYING COPYING.LGPL README samples
%{_bindir}/%{name}
-%{_bindir}/%{name}-bin
+%{_bindir}/wbcopytables
%{_datadir}/applications/MySQLWorkbench.desktop
%{_datadir}/icons/hicolor/*/mimetypes/*%{name}*.png
%{_datadir}/icons/hicolor/*/apps/%{name}.png
@@ -207,6 +220,8 @@ fi
* Sun Aug 05 2012 Remi Collet <remi@fedoraproject.org> 5.2.41-1
- update to 5.2.41 Community (OSS) Edition (GPL)
http://dev.mysql.com/doc/workbench/en/wb-news-5-2-41.html
+- use system cppconn and antlr
+- move binary to libdir (only launcher in bindir)
* Tue May 15 2012 Remi Collet <remi@fedoraproject.org> 5.2.40-1
- update to 5.2.40 Community (OSS) Edition (GPL)
generated by cgit (git 2.34.1) at 2024-11-22 14:14:17 +0000