File mysql-workbench-5.1.16-disable-bundled.patch of Package mysql-workbench

Index: Makefile.am
===================================================================
--- Makefile.am.orig
+++ Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=ext library tools/genobj generated backend modules frontend plugins res images
+SUBDIRS=library tools/genobj generated backend modules frontend plugins res images
 
 tests:
 	DEST_DIR=$(prefix) TEST_MODULES_DIR=$(prefix)/lib/mysql-workbench/modules  make -C testing/tut test
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -53,11 +53,10 @@ AC_CHECK_HEADERS([sys/select.h])
 AC_CHECK_HEADERS([tr1/unordered_set tr1/unordered_map])
 
 
-## apparently fedora has hacked the default install dir of ctemplate headers.........
-#AC_CHECK_HEADERS([ctemplate/template.h], AC_DEFINE(CTEMPLATE_NOT_IN_GOOGLE, [], [ctemplate headers not in standard location]) ,
-#	[ AC_CHECK_HEADERS([google/template.h], [],AC_MSG_ERROR(["ctemplate not found"])) ] )
-#AC_ARG_WITH(ctemplate-libs, [  --with-ctemplates-libs=<libdir> ], [], [ac_LIBS=-lctemplate])
-#CTEMPLATE_LIBS=$ac_LIBS
+AC_CHECK_HEADERS([ctemplate/template.h], AC_DEFINE(CTEMPLATE_NOT_IN_GOOGLE, [], [ctemplate headers not in standard location]) ,
+	[ AC_CHECK_HEADERS([google/template.h], [],AC_MSG_ERROR(["ctemplate not found"])) ] )
+AC_ARG_WITH(ctemplate-libs, [  --with-ctemplates-libs=<libdir> ], [], [ac_LIBS=-lctemplate])
+CTEMPLATE_LIBS=$ac_LIBS
 
 
 
@@ -119,6 +118,8 @@ AC_SUBST(GNOME_LIBS)
 #
 # mysql headers
 #
+AC_CHECK_HEADERS([mysql-connector/cppconn/exception.h],[],AC_MSG_ERROR(["MySQL Connector/C++ not found"]))
+
 AC_ARG_WITH(mysql-config,
 [  --with-mysql-config=<path> specifies how to run the mysql_config script [default=mysql_config]],
 		ac_mysql_config_path="$withval", ac_mysql_config_path="mysql_config")
@@ -362,10 +363,6 @@ res/Makefile
 res/grt/Makefile
 res/grtdata/Makefile
 res/wbdata/Makefile
-ext/Makefile
-ext/scintilla/gtk/Makefile
-ext/cppconn/Makefile
-ext/cppconn/driver/Makefile
 backend/Makefile
 backend/wbpublic/Makefile
 backend/wbprivate/Makefile
@@ -420,9 +417,3 @@ generated/Makefile
 
 AC_OUTPUT()
 
-(
-  cd ./ext/ctemplate/ctemplate-src &&
-  autoreconf -i -s; 
-  ./configure --prefix=$prefix --libdir=$libdir/mysql-workbench --disable-dependency-tracking
-)    
-
Index: frontend/linux/linux_utilities/Makefile.am
===================================================================
--- frontend/linux/linux_utilities/Makefile.am.orig
+++ frontend/linux/linux_utilities/Makefile.am
@@ -4,14 +4,13 @@ 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/utilities/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$(top_srcdir)/library/forms\
 	-I$(top_srcdir)/library/forms/gtk\
 	-I$(top_srcdir)/generated/grti\
Index: frontend/linux/sqlide/Makefile.am
===================================================================
--- frontend/linux/sqlide/Makefile.am.orig
+++ frontend/linux/sqlide/Makefile.am
@@ -3,7 +3,7 @@ CXXFLAGS+=-rdynamic
 
 pkglib_LTLIBRARIES=libsqlide.la
 
-libsqlide_la_LIBADD=$(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la     
+libsqlide_la_LIBADD=-lscintilla
                              
 INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_CFLAGS@\
 	-I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/utilities/src \
@@ -12,8 +12,7 @@ INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GR
 	-I$(top_srcdir)/library/forms\
 	-I$(top_srcdir)/library/forms/gtk\
 	-I$(top_srcdir)/generated/grti\
-	-I$(top_srcdir)/library/forms/mforms\
-	-I$(top_srcdir)/ext/scintilla/include
+	-I$(top_srcdir)/library/forms/mforms
 
 libsqlide_la_SOURCES=\
         sql_editor_fe.cpp\
Index: frontend/linux/workbench/Makefile.am
===================================================================
--- frontend/linux/workbench/Makefile.am.orig
+++ frontend/linux/workbench/Makefile.am
@@ -41,7 +41,7 @@ mysql_workbench_bin_LDADD=\
 	$(top_srcdir)/library/utilities/src/libguiutil.la\
 	$(top_srcdir)/library/canvas/src/libmdcanvas.la\
 	$(top_srcdir)/library/canvas/src/libmdcanvasgtk.la\
-	$(top_srcdir)/ext/ctemplate/ctemplate-src/.libs/libctemplate_wb.la\
+	-lctemplate \
 	@GNOME_LIBS@ @GRT_LIBS@ @PCRE_LIBS@ @GLIB_LIBS@ @CAIRO_LIBS@ @ZIP_LIBS@ @MYSQL_LIBS@
 
 #precompiled.h.gch: precompiled.h
Index: library/dbc/src/cppdbc.h
===================================================================
--- library/dbc/src/cppdbc.h.orig
+++ library/dbc/src/cppdbc.h
@@ -5,15 +5,15 @@
 #include "driver_manager.h"
 #include "sql_batch_exec.h"
 
-#include <cppconn/connection.h>
-#include <cppconn/driver.h>
-#include <cppconn/exception.h>
-#include <cppconn/metadata.h>
-#include <cppconn/parameter_metadata.h>
-#include <cppconn/prepared_statement.h>
-#include <cppconn/resultset.h>
-#include <cppconn/resultset_metadata.h>
-#include <cppconn/statement.h>
+#include <mysql-connector/cppconn/connection.h>
+#include <mysql-connector/cppconn/driver.h>
+#include <mysql-connector/cppconn/exception.h>
+#include <mysql-connector/cppconn/metadata.h>
+#include <mysql-connector/cppconn/parameter_metadata.h>
+#include <mysql-connector/cppconn/prepared_statement.h>
+#include <mysql-connector/cppconn/resultset.h>
+#include <mysql-connector/cppconn/resultset_metadata.h>
+#include <mysql-connector/cppconn/statement.h>
 
 
 #endif // _CPPDBC_H_
Index: library/dbc/src/driver_manager.cpp
===================================================================
--- library/dbc/src/driver_manager.cpp.orig
+++ library/dbc/src/driver_manager.cpp
@@ -7,9 +7,9 @@
 
 #include "driver_manager.h"
 #include <gmodule.h>
-#include <cppconn/connection.h>
-#include <cppconn/statement.h>
-#include <cppconn/exception.h>
+#include <mysql-connector/cppconn/connection.h>
+#include <mysql-connector/cppconn/statement.h>
+#include <mysql-connector/cppconn/exception.h>
 
 
 namespace sql {
Index: library/dbc/src/driver_manager.h
===================================================================
--- library/dbc/src/driver_manager.h.orig
+++ library/dbc/src/driver_manager.h
@@ -4,7 +4,7 @@
 
 #include "cppdbc_public_interface.h"
 #include "grts/structs.db.mgmt.h"
-#include <cppconn/driver.h>
+#include <mysql-connector/cppconn/driver.h>
 #include <memory>
 
 
Index: library/dbc/src/sql_batch_exec.cpp
===================================================================
--- library/dbc/src/sql_batch_exec.cpp.orig
+++ library/dbc/src/sql_batch_exec.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 
 #include "sql_batch_exec.h"
-#include <cppconn/exception.h>
-#include <cppconn/resultset.h>
+#include <mysql-connector/cppconn/exception.h>
+#include <mysql-connector/cppconn/resultset.h>
 #include <memory>
 
 namespace sql
Index: library/dbc/src/sql_batch_exec.h
===================================================================
--- library/dbc/src/sql_batch_exec.h.orig
+++ library/dbc/src/sql_batch_exec.h
@@ -3,8 +3,8 @@
 
 
 #include "cppdbc_public_interface.h"
-#include <cppconn/statement.h>
-#include <cppconn/connection.h>
+#include <mysql-connector/cppconn/statement.h>
+#include <mysql-connector/cppconn/connection.h>
 #include <sigc++/sigc++.h>
 #include <list>
 #include <string>
Index: modules/db.mysql/Makefile.am
===================================================================
--- modules/db.mysql/Makefile.am.orig
+++ modules/db.mysql/Makefile.am
@@ -21,7 +21,6 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t
                 -I$(top_srcdir)/library/grt/src/diff\
                 -I$(top_srcdir)/library/sql-parser/include\
                 -I$(top_srcdir)/library/sql-parser/source\
-                -I$(top_srcdir)/ext/ctemplate/ctemplate-src/src\
                 @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@
 
 
@@ -32,7 +31,7 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t
 #
 
 db_mysql_grt_la_LDFLAGS=-module 
-db_mysql_grt_la_LIBADD=$(top_srcdir)/ext/ctemplate/ctemplate-src/.libs/libctemplate_wb.la
+db_mysql_grt_la_LIBADD=-lctemplate
 
 
 db_mysql_grt_la_SOURCES=src/db_mysql_catalog_report.cpp\
Index: modules/wb.model/Makefile.am
===================================================================
--- modules/wb.model/Makefile.am.orig
+++ modules/wb.model/Makefile.am
@@ -61,12 +61,10 @@ INCLUDES=-I$(top_srcdir)/generated\
 	-I$(top_srcdir)/library/sql-parser/source\
 	-I$(top_srcdir)/library/sql-parser/source/linux\
 	-I$(top_srcdir)/library/tinyxml\
-	-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_SOURCES=src/graph_renderer.cpp \
 	src/reporting.cpp \
Index: modules/wb.mysql.validation/Makefile.am
===================================================================
--- modules/wb.mysql.validation/Makefile.am.orig
+++ modules/wb.mysql.validation/Makefile.am
@@ -7,7 +7,6 @@ INCLUDES=-I$(top_srcdir)/generated\
 	-I$(top_srcdir)/backend/wbpublic\
 	-I$(top_srcdir)/library/grt/src \
 	-I$(top_srcdir)/library \
-	-I$(top_srcdir)/ext \
 	-I$(top_srcdir)/library/utilities/src\
 	-I$(top_srcdir)/modules\
 	-I$(top_srcdir)/modules/wb.validation/src\
@@ -20,7 +19,6 @@ INCLUDES=-I$(top_srcdir)/generated\
 
 
 wb_mysql_validation_grt_la_LDFLAGS=-module
-#wb_mysql_import_grt_la_LIBADD=$(top_srcdir)
 
 wb_mysql_validation_grt_la_SOURCES=src/register_plugin.cpp\
 	src/wb_module_validation_mysql.cpp\
Index: plugins/db.mysql.diff.reporting/frontend/Makefile.am
===================================================================
--- plugins/db.mysql.diff.reporting/frontend/Makefile.am.orig
+++ plugins/db.mysql.diff.reporting/frontend/Makefile.am
@@ -9,7 +9,6 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t
     -I$(top_srcdir)/backend\
     -I$(top_srcdir)/modules/db.mysql/src\
     -I$(top_srcdir)/library/dbc/src\
-    -I$(top_srcdir)/ext/cppconn\
     -I$(top_srcdir)/modules/interfaces\
     -I$(top_srcdir)/modules/\
     -I$(top_srcdir)/library/grt/src/diff\
Index: plugins/db.mysql.editors/linux/Makefile.am
===================================================================
--- plugins/db.mysql.editors/linux/Makefile.am.orig
+++ plugins/db.mysql.editors/linux/Makefile.am
@@ -27,13 +27,12 @@ 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\
                 @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\
Index: backend/wbprivate/Makefile.am
===================================================================
--- backend/wbprivate/Makefile.am.orig
+++ backend/wbprivate/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GR
 	-I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/utilities/src -I$(top_srcdir)/library/forms\
   -I$(top_srcdir)/modules -I$(top_srcdir)/frontend/common\
 	-I$(top_srcdir)/backend/wbpublic -I$(top_srcdir)/generated -I$(top_srcdir)/library/canvas/src\
-	-I$(top_srcdir)/ext/cppconn/ -I$(top_srcdir)/library/dbc/src
+	-I$(top_srcdir)/library/dbc/src
 
 libwbprivate_a_SOURCES=\
 	workbench/metaclasses.cpp\
Index: backend/wbpublic/Makefile.am
===================================================================
--- backend/wbpublic/Makefile.am.orig
+++ backend/wbpublic/Makefile.am
@@ -9,11 +9,9 @@ INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GR
 	-I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/utilities/src \
 	-I$(top_srcdir)/library/forms\
 	-I$(top_srcdir)/library/canvas/src\
-	-I$(top_srcdir)/ext/cppconn\
 	-I$(top_srcdir)/library/dbc/src\
 	-I$(top_srcdir)/backend/wbpublic -I$(top_srcdir)/generated\
-	-I$(top_srcdir)/modules\
-	-I$(top_srcdir)/ext
+	-I$(top_srcdir)/modules
 
 libwbpublic_la_SOURCES=\
 	grt/refresh_ui.cpp\
Index: library/dbc/Makefile.am
===================================================================
--- library/dbc/Makefile.am.orig
+++ library/dbc/Makefile.am
@@ -11,8 +11,7 @@ src/sql_batch_exec.cpp
 INCLUDES=@CAIRO_CFLAGS@ @GNOME_CFLAGS@ @SIGC_CFLAGS@ -I$(top_srcdir)/backend\
 -I$(top_srcdir)/generated\
 -I$(top_srcdir)/library/grt/src\
--I$(top_srcdir)/library/utilities/src\
--I$(top_srcdir)/ext/cppconn
+-I$(top_srcdir)/library/utilities/src
 
 
 
Index: modules/db.mysql.sqlparser/Makefile.am
===================================================================
--- modules/db.mysql.sqlparser/Makefile.am.orig
+++ modules/db.mysql.sqlparser/Makefile.am
@@ -13,7 +13,6 @@ INCLUDES=\
 	-I$(top_srcdir)/library/sql-parser/include\
 	-I$(top_srcdir)/library/sql-parser/source\
 	-I$(top_srcdir)/library/sql-parser/source/linux\
-	-I$(top_srcdir)/ext\
 	-I$(top_srcdir)/library/tinyxml\
 	-I$(top_srcdir)/library/utilities/src\
 	@MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @PCRE_CFLAGS@ @SIGC_CFLAGS@
Index: modules/wb.validation/Makefile.am
===================================================================
--- modules/wb.validation/Makefile.am.orig
+++ modules/wb.validation/Makefile.am
@@ -8,7 +8,6 @@ INCLUDES=-I$(top_srcdir)/generated\
 	-I$(top_srcdir)/library/grt/src \
 	-I$(top_srcdir)/library \
 	-I$(top_srcdir)/library/utilities/src\
-	-I$(top_srcdir)/ext\
 	-I$(top_srcdir)/modules\
 	-I$(top_srcdir)/library/grt/src/diff\
 	-I$(top_srcdir)/library/sql-parser/include\
Index: plugins/db.mysql/frontend/Makefile.am
===================================================================
--- plugins/db.mysql/frontend/Makefile.am.orig
+++ plugins/db.mysql/frontend/Makefile.am
@@ -9,8 +9,6 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t
     -I$(top_srcdir)/backend\
     -I$(top_srcdir)/modules/db.mysql/src\
     -I$(top_srcdir)/library/dbc/src\
-    -I$(top_srcdir)/ext/cppconn\
-    -I$(top_srcdir)/ext/\
     -I$(top_srcdir)/modules/interfaces\
     -I$(top_srcdir)/modules/\
     -I$(top_srcdir)/library/grt/src/diff\