diff options
-rw-r--r-- | mysql-workbench-5.2.28-tinyxml.patch | 385 | ||||
-rw-r--r-- | mysql-workbench-5.2.34-tinyxml.patch | 67 | ||||
-rw-r--r-- | mysql-workbench-gpl-5.2.34-spec | 106 | ||||
-rw-r--r-- | mysql-workbench.spec | 31 |
4 files changed, 192 insertions, 397 deletions
diff --git a/mysql-workbench-5.2.28-tinyxml.patch b/mysql-workbench-5.2.28-tinyxml.patch deleted file mode 100644 index a9aeff1..0000000 --- a/mysql-workbench-5.2.28-tinyxml.patch +++ /dev/null @@ -1,385 +0,0 @@ -diff -up mysql-workbench-gpl-5.2.28-src/backend/wbprivate/Makefile.in.tinyxml mysql-workbench-gpl-5.2.28-src/backend/wbprivate/Makefile.in ---- mysql-workbench-gpl-5.2.28-src/backend/wbprivate/Makefile.in.tinyxml 2010-09-24 17:18:17.482615772 +0200 -+++ mysql-workbench-gpl-5.2.28-src/backend/wbprivate/Makefile.in 2010-09-24 17:28:06.014345863 +0200 -@@ -44,7 +44,7 @@ CONFIG_CLEAN_FILES = - LIBRARIES = $(noinst_LIBRARIES) - ARFLAGS = cru - libwbprivate_a_AR = $(AR) $(ARFLAGS) --libwbprivate_a_LIBADD = -+libwbprivate_a_LIBADD = -ltinyxml - am_libwbprivate_a_OBJECTS = canvas_floater.$(OBJEXT) \ - mini_view.$(OBJEXT) relationship_canvas_floater.$(OBJEXT) \ - wb_catalog_tree.$(OBJEXT) wb_component.$(OBJEXT) \ -@@ -80,9 +80,7 @@ am_libwbprivate_a_OBJECTS = canvas_float - user_defined_type_editor.$(OBJEXT) \ - edit_sql_script_wizard.$(OBJEXT) \ - edit_table_data_wizard.$(OBJEXT) grt_shell_window.$(OBJEXT) \ -- grt_code_editor.$(OBJEXT) plugin_manager_window.$(OBJEXT) \ -- tinyxmlparser.$(OBJEXT) tinyxml.$(OBJEXT) tinystr.$(OBJEXT) \ -- tinyxmlerror.$(OBJEXT) -+ grt_code_editor.$(OBJEXT) plugin_manager_window.$(OBJEXT) - libwbprivate_a_OBJECTS = $(am_libwbprivate_a_OBJECTS) - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp -@@ -270,7 +268,6 @@ INCLUDES = @GLIB_CFLAGS@ @SIGC_CFLAGS@ @ - -I$(top_srcdir)/ext/cppconn/ -I$(top_srcdir)/library/dbc/src\ - -I$(top_srcdir)/ext/scintilla/include\ - -I$(top_srcdir)/library/vsqlite++/include\ -- -I$(top_srcdir)/library/tinyxml - - libwbprivate_a_SOURCES = \ - model/canvas_floater.cpp\ -@@ -329,11 +326,7 @@ libwbprivate_a_SOURCES = \ - $(top_srcdir)/frontend/common/edit_table_data_wizard.cpp\ - $(top_srcdir)/frontend/common/grt_shell_window.cpp\ - $(top_srcdir)/frontend/common/grt_code_editor.cpp\ -- $(top_srcdir)/frontend/common/plugin_manager_window.cpp\ -- $(top_srcdir)/library/tinyxml/tinyxmlparser.cpp\ -- $(top_srcdir)/library/tinyxml/tinyxml.cpp\ -- $(top_srcdir)/library/tinyxml/tinystr.cpp\ -- $(top_srcdir)/library/tinyxml/tinyxmlerror.cpp -+ $(top_srcdir)/frontend/common/plugin_manager_window.cpp - - all: all-am - -@@ -400,10 +393,6 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recordset_export_form.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/relationship_canvas_floater.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/starter_popup.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinystr.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxml.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxmlerror.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxmlparser.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upgrade_helper.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/user_defined_type_editor.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wb_catalog_tree.Po@am__quote@ -@@ -1233,62 +1222,6 @@ plugin_manager_window.obj: $(top_srcdir) - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o plugin_manager_window.obj `if test -f '$(top_srcdir)/frontend/common/plugin_manager_window.cpp'; then $(CYGPATH_W) '$(top_srcdir)/frontend/common/plugin_manager_window.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/frontend/common/plugin_manager_window.cpp'; fi` - --tinyxmlparser.o: $(top_srcdir)/library/tinyxml/tinyxmlparser.cpp --@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlparser.o -MD -MP -MF $(DEPDIR)/tinyxmlparser.Tpo -c -o tinyxmlparser.o `test -f '$(top_srcdir)/library/tinyxml/tinyxmlparser.cpp' || echo '$(srcdir)/'`$(top_srcdir)/library/tinyxml/tinyxmlparser.cpp --@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/tinyxmlparser.Tpo $(DEPDIR)/tinyxmlparser.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/library/tinyxml/tinyxmlparser.cpp' object='tinyxmlparser.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlparser.o `test -f '$(top_srcdir)/library/tinyxml/tinyxmlparser.cpp' || echo '$(srcdir)/'`$(top_srcdir)/library/tinyxml/tinyxmlparser.cpp -- --tinyxmlparser.obj: $(top_srcdir)/library/tinyxml/tinyxmlparser.cpp --@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlparser.obj -MD -MP -MF $(DEPDIR)/tinyxmlparser.Tpo -c -o tinyxmlparser.obj `if test -f '$(top_srcdir)/library/tinyxml/tinyxmlparser.cpp'; then $(CYGPATH_W) '$(top_srcdir)/library/tinyxml/tinyxmlparser.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/library/tinyxml/tinyxmlparser.cpp'; fi` --@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/tinyxmlparser.Tpo $(DEPDIR)/tinyxmlparser.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/library/tinyxml/tinyxmlparser.cpp' object='tinyxmlparser.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlparser.obj `if test -f '$(top_srcdir)/library/tinyxml/tinyxmlparser.cpp'; then $(CYGPATH_W) '$(top_srcdir)/library/tinyxml/tinyxmlparser.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/library/tinyxml/tinyxmlparser.cpp'; fi` -- --tinyxml.o: $(top_srcdir)/library/tinyxml/tinyxml.cpp --@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxml.o -MD -MP -MF $(DEPDIR)/tinyxml.Tpo -c -o tinyxml.o `test -f '$(top_srcdir)/library/tinyxml/tinyxml.cpp' || echo '$(srcdir)/'`$(top_srcdir)/library/tinyxml/tinyxml.cpp --@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/tinyxml.Tpo $(DEPDIR)/tinyxml.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/library/tinyxml/tinyxml.cpp' object='tinyxml.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxml.o `test -f '$(top_srcdir)/library/tinyxml/tinyxml.cpp' || echo '$(srcdir)/'`$(top_srcdir)/library/tinyxml/tinyxml.cpp -- --tinyxml.obj: $(top_srcdir)/library/tinyxml/tinyxml.cpp --@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxml.obj -MD -MP -MF $(DEPDIR)/tinyxml.Tpo -c -o tinyxml.obj `if test -f '$(top_srcdir)/library/tinyxml/tinyxml.cpp'; then $(CYGPATH_W) '$(top_srcdir)/library/tinyxml/tinyxml.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/library/tinyxml/tinyxml.cpp'; fi` --@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/tinyxml.Tpo $(DEPDIR)/tinyxml.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/library/tinyxml/tinyxml.cpp' object='tinyxml.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxml.obj `if test -f '$(top_srcdir)/library/tinyxml/tinyxml.cpp'; then $(CYGPATH_W) '$(top_srcdir)/library/tinyxml/tinyxml.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/library/tinyxml/tinyxml.cpp'; fi` -- --tinystr.o: $(top_srcdir)/library/tinyxml/tinystr.cpp --@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinystr.o -MD -MP -MF $(DEPDIR)/tinystr.Tpo -c -o tinystr.o `test -f '$(top_srcdir)/library/tinyxml/tinystr.cpp' || echo '$(srcdir)/'`$(top_srcdir)/library/tinyxml/tinystr.cpp --@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/tinystr.Tpo $(DEPDIR)/tinystr.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/library/tinyxml/tinystr.cpp' object='tinystr.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinystr.o `test -f '$(top_srcdir)/library/tinyxml/tinystr.cpp' || echo '$(srcdir)/'`$(top_srcdir)/library/tinyxml/tinystr.cpp -- --tinystr.obj: $(top_srcdir)/library/tinyxml/tinystr.cpp --@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinystr.obj -MD -MP -MF $(DEPDIR)/tinystr.Tpo -c -o tinystr.obj `if test -f '$(top_srcdir)/library/tinyxml/tinystr.cpp'; then $(CYGPATH_W) '$(top_srcdir)/library/tinyxml/tinystr.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/library/tinyxml/tinystr.cpp'; fi` --@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/tinystr.Tpo $(DEPDIR)/tinystr.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/library/tinyxml/tinystr.cpp' object='tinystr.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinystr.obj `if test -f '$(top_srcdir)/library/tinyxml/tinystr.cpp'; then $(CYGPATH_W) '$(top_srcdir)/library/tinyxml/tinystr.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/library/tinyxml/tinystr.cpp'; fi` -- --tinyxmlerror.o: $(top_srcdir)/library/tinyxml/tinyxmlerror.cpp --@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlerror.o -MD -MP -MF $(DEPDIR)/tinyxmlerror.Tpo -c -o tinyxmlerror.o `test -f '$(top_srcdir)/library/tinyxml/tinyxmlerror.cpp' || echo '$(srcdir)/'`$(top_srcdir)/library/tinyxml/tinyxmlerror.cpp --@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/tinyxmlerror.Tpo $(DEPDIR)/tinyxmlerror.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/library/tinyxml/tinyxmlerror.cpp' object='tinyxmlerror.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlerror.o `test -f '$(top_srcdir)/library/tinyxml/tinyxmlerror.cpp' || echo '$(srcdir)/'`$(top_srcdir)/library/tinyxml/tinyxmlerror.cpp -- --tinyxmlerror.obj: $(top_srcdir)/library/tinyxml/tinyxmlerror.cpp --@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlerror.obj -MD -MP -MF $(DEPDIR)/tinyxmlerror.Tpo -c -o tinyxmlerror.obj `if test -f '$(top_srcdir)/library/tinyxml/tinyxmlerror.cpp'; then $(CYGPATH_W) '$(top_srcdir)/library/tinyxml/tinyxmlerror.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/library/tinyxml/tinyxmlerror.cpp'; fi` --@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/tinyxmlerror.Tpo $(DEPDIR)/tinyxmlerror.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/library/tinyxml/tinyxmlerror.cpp' object='tinyxmlerror.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlerror.obj `if test -f '$(top_srcdir)/library/tinyxml/tinyxmlerror.cpp'; then $(CYGPATH_W) '$(top_srcdir)/library/tinyxml/tinyxmlerror.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/library/tinyxml/tinyxmlerror.cpp'; fi` -- - mostlyclean-libtool: - -rm -f *.lo - -diff -up mysql-workbench-gpl-5.2.28-src/modules/db.mysql.sqlide/Makefile.am.tinyxml mysql-workbench-gpl-5.2.28-src/modules/db.mysql.sqlide/Makefile.am ---- mysql-workbench-gpl-5.2.28-src/modules/db.mysql.sqlide/Makefile.am.tinyxml 2010-09-24 17:18:15.967881159 +0200 -+++ mysql-workbench-gpl-5.2.28-src/modules/db.mysql.sqlide/Makefile.am 2010-09-24 17:19:04.509171348 +0200 -@@ -19,7 +19,6 @@ INCLUDES=\ - -I$(top_srcdir)/library/sql-parser/source/linux\ - -I$(top_srcdir)/library/vsqlite++/include\ - -I$(top_srcdir)/backend/grtdb\ ---I$(top_srcdir)/library/tinyxml\ - @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ - - -diff -up mysql-workbench-gpl-5.2.28-src/modules/db.mysql.sqlide/Makefile.in.tinyxml mysql-workbench-gpl-5.2.28-src/modules/db.mysql.sqlide/Makefile.in ---- mysql-workbench-gpl-5.2.28-src/modules/db.mysql.sqlide/Makefile.in.tinyxml 2010-09-24 17:18:15.855900747 +0200 -+++ mysql-workbench-gpl-5.2.28-src/modules/db.mysql.sqlide/Makefile.in 2010-09-24 17:18:49.770858939 +0200 -@@ -253,7 +253,6 @@ INCLUDES = \ - -I$(top_srcdir)/library/sql-parser/source/linux\ - -I$(top_srcdir)/library/vsqlite++/include\ - -I$(top_srcdir)/backend/grtdb\ ---I$(top_srcdir)/library/tinyxml\ - @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ - - db_mysql_sqlide_grt_la_LDFLAGS = -module -diff -up mysql-workbench-gpl-5.2.28-src/modules/db.mysql.sqlparser/Makefile.am.tinyxml mysql-workbench-gpl-5.2.28-src/modules/db.mysql.sqlparser/Makefile.am ---- mysql-workbench-gpl-5.2.28-src/modules/db.mysql.sqlparser/Makefile.am.tinyxml 2010-09-24 17:18:16.369810766 +0200 -+++ mysql-workbench-gpl-5.2.28-src/modules/db.mysql.sqlparser/Makefile.am 2010-09-24 17:19:23.799601744 +0200 -@@ -14,7 +14,6 @@ INCLUDES=\ - -I$(top_srcdir)/library/sql-parser/source\ - -I$(top_srcdir)/library/sql-parser/source/linux\ - -I$(top_srcdir)/library/vsqlite++/include\ -- -I$(top_srcdir)/library/tinyxml\ - -I$(top_srcdir)/library/base/src\ - @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @PCRE_CFLAGS@ @SIGC_CFLAGS@ - -diff -up mysql-workbench-gpl-5.2.28-src/modules/db.mysql.sqlparser/Makefile.in.tinyxml mysql-workbench-gpl-5.2.28-src/modules/db.mysql.sqlparser/Makefile.in ---- mysql-workbench-gpl-5.2.28-src/modules/db.mysql.sqlparser/Makefile.in.tinyxml 2010-09-24 17:18:16.166846315 +0200 -+++ mysql-workbench-gpl-5.2.28-src/modules/db.mysql.sqlparser/Makefile.in 2010-09-24 17:19:14.336359995 +0200 -@@ -265,7 +265,6 @@ INCLUDES = \ - -I$(top_srcdir)/library/sql-parser/source\ - -I$(top_srcdir)/library/sql-parser/source/linux\ - -I$(top_srcdir)/library/vsqlite++/include\ -- -I$(top_srcdir)/library/tinyxml\ - -I$(top_srcdir)/library/base/src\ - @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @PCRE_CFLAGS@ @SIGC_CFLAGS@ - -diff -up mysql-workbench-gpl-5.2.28-src/modules/wb.model/Makefile.am.tinyxml mysql-workbench-gpl-5.2.28-src/modules/wb.model/Makefile.am ---- mysql-workbench-gpl-5.2.28-src/modules/wb.model/Makefile.am.tinyxml 2010-09-24 17:18:16.651761384 +0200 -+++ mysql-workbench-gpl-5.2.28-src/modules/wb.model/Makefile.am 2010-09-24 17:19:36.363247095 +0200 -@@ -64,7 +64,6 @@ INCLUDES=-I$(top_srcdir)/generated\ - -I$(top_srcdir)/library/sql-parser/source\ - -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$(top_srcdir)/ext/scintilla/lexlib\ -diff -up mysql-workbench-gpl-5.2.28-src/modules/wb.model/Makefile.in.tinyxml mysql-workbench-gpl-5.2.28-src/modules/wb.model/Makefile.in ---- mysql-workbench-gpl-5.2.28-src/modules/wb.model/Makefile.in.tinyxml 2010-09-24 17:18:16.562776970 +0200 -+++ mysql-workbench-gpl-5.2.28-src/modules/wb.model/Makefile.in 2010-09-24 17:19:29.106609899 +0200 -@@ -305,7 +305,6 @@ INCLUDES = -I$(top_srcdir)/generated\ - -I$(top_srcdir)/library/sql-parser/source\ - -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$(top_srcdir)/ext/scintilla/lexlib\ -diff -up mysql-workbench-gpl-5.2.28-src/modules/wb.mysql.import/Makefile.am.tinyxml mysql-workbench-gpl-5.2.28-src/modules/wb.mysql.import/Makefile.am ---- mysql-workbench-gpl-5.2.28-src/modules/wb.mysql.import/Makefile.am.tinyxml 2010-09-24 17:18:17.403629621 +0200 -+++ mysql-workbench-gpl-5.2.28-src/modules/wb.mysql.import/Makefile.am 2010-09-24 17:26:48.244585673 +0200 -@@ -15,18 +15,14 @@ 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)/library/tinyxml\ - -I$(top_srcdir)/library/vsqlite++/include\ - @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ - - - wb_mysql_import_grt_la_LDFLAGS=-module --#wb_mysql_import_grt_la_LIBADD= -+wb_mysql_import_grt_la_LIBADD=-ltinyxml - - wb_mysql_import_grt_la_SOURCES=\ - src/wb_mysql_import.cpp\ -- src/wb_mysql_import_dbd4.cpp\ -- $(top_srcdir)/library/tinyxml/tinyxmlparser.cpp\ -- $(top_srcdir)/library/tinyxml/tinyxml.cpp\ -- $(top_srcdir)/library/tinyxml/tinystr.cpp\ -- $(top_srcdir)/library/tinyxml/tinyxmlerror.cpp -+ src/wb_mysql_import_dbd4.cpp -+ -diff -up mysql-workbench-gpl-5.2.28-src/modules/wb.mysql.import/Makefile.in.tinyxml mysql-workbench-gpl-5.2.28-src/modules/wb.mysql.import/Makefile.in ---- mysql-workbench-gpl-5.2.28-src/modules/wb.mysql.import/Makefile.in.tinyxml 2010-09-24 17:18:17.200665208 +0200 -+++ mysql-workbench-gpl-5.2.28-src/modules/wb.mysql.import/Makefile.in 2010-09-24 17:22:37.807652768 +0200 -@@ -49,10 +49,9 @@ am__strip_dir = `echo $$p | sed -e 's|^. - am__installdirs = "$(DESTDIR)$(pkglibdir)" - pkglibLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(pkglib_LTLIBRARIES) --wb_mysql_import_grt_la_LIBADD = -+wb_mysql_import_grt_la_LIBADD = -ltinyxml - am_wb_mysql_import_grt_la_OBJECTS = wb_mysql_import.lo \ -- wb_mysql_import_dbd4.lo tinyxmlparser.lo tinyxml.lo tinystr.lo \ -- tinyxmlerror.lo -+ wb_mysql_import_dbd4.lo - wb_mysql_import_grt_la_OBJECTS = $(am_wb_mysql_import_grt_la_OBJECTS) - wb_mysql_import_grt_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -@@ -246,19 +245,14 @@ 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)/library/tinyxml\ - -I$(top_srcdir)/library/vsqlite++/include\ - @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ - - wb_mysql_import_grt_la_LDFLAGS = -module --#wb_mysql_import_grt_la_LIBADD= -+wb_mysql_import_grt_la_LIBADD = -ltinyxml - wb_mysql_import_grt_la_SOURCES = \ - src/wb_mysql_import.cpp\ -- src/wb_mysql_import_dbd4.cpp\ -- $(top_srcdir)/library/tinyxml/tinyxmlparser.cpp\ -- $(top_srcdir)/library/tinyxml/tinyxml.cpp\ -- $(top_srcdir)/library/tinyxml/tinystr.cpp\ -- $(top_srcdir)/library/tinyxml/tinyxmlerror.cpp -+ src/wb_mysql_import_dbd4.cpp - - all: all-am - -@@ -329,10 +323,6 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinystr.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxml.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxmlerror.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxmlparser.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wb_mysql_import.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wb_mysql_import_dbd4.Plo@am__quote@ - -@@ -371,33 +361,6 @@ wb_mysql_import_dbd4.lo: src/wb_mysql_im - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wb_mysql_import_dbd4.lo `test -f 'src/wb_mysql_import_dbd4.cpp' || echo '$(srcdir)/'`src/wb_mysql_import_dbd4.cpp - --tinyxmlparser.lo: $(top_srcdir)/library/tinyxml/tinyxmlparser.cpp --@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlparser.lo -MD -MP -MF $(DEPDIR)/tinyxmlparser.Tpo -c -o tinyxmlparser.lo `test -f '$(top_srcdir)/library/tinyxml/tinyxmlparser.cpp' || echo '$(srcdir)/'`$(top_srcdir)/library/tinyxml/tinyxmlparser.cpp --@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/tinyxmlparser.Tpo $(DEPDIR)/tinyxmlparser.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/library/tinyxml/tinyxmlparser.cpp' object='tinyxmlparser.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlparser.lo `test -f '$(top_srcdir)/library/tinyxml/tinyxmlparser.cpp' || echo '$(srcdir)/'`$(top_srcdir)/library/tinyxml/tinyxmlparser.cpp -- --tinyxml.lo: $(top_srcdir)/library/tinyxml/tinyxml.cpp --@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxml.lo -MD -MP -MF $(DEPDIR)/tinyxml.Tpo -c -o tinyxml.lo `test -f '$(top_srcdir)/library/tinyxml/tinyxml.cpp' || echo '$(srcdir)/'`$(top_srcdir)/library/tinyxml/tinyxml.cpp --@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/tinyxml.Tpo $(DEPDIR)/tinyxml.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/library/tinyxml/tinyxml.cpp' object='tinyxml.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxml.lo `test -f '$(top_srcdir)/library/tinyxml/tinyxml.cpp' || echo '$(srcdir)/'`$(top_srcdir)/library/tinyxml/tinyxml.cpp -- --tinystr.lo: $(top_srcdir)/library/tinyxml/tinystr.cpp --@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinystr.lo -MD -MP -MF $(DEPDIR)/tinystr.Tpo -c -o tinystr.lo `test -f '$(top_srcdir)/library/tinyxml/tinystr.cpp' || echo '$(srcdir)/'`$(top_srcdir)/library/tinyxml/tinystr.cpp --@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/tinystr.Tpo $(DEPDIR)/tinystr.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/library/tinyxml/tinystr.cpp' object='tinystr.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinystr.lo `test -f '$(top_srcdir)/library/tinyxml/tinystr.cpp' || echo '$(srcdir)/'`$(top_srcdir)/library/tinyxml/tinystr.cpp -- --tinyxmlerror.lo: $(top_srcdir)/library/tinyxml/tinyxmlerror.cpp --@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlerror.lo -MD -MP -MF $(DEPDIR)/tinyxmlerror.Tpo -c -o tinyxmlerror.lo `test -f '$(top_srcdir)/library/tinyxml/tinyxmlerror.cpp' || echo '$(srcdir)/'`$(top_srcdir)/library/tinyxml/tinyxmlerror.cpp --@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/tinyxmlerror.Tpo $(DEPDIR)/tinyxmlerror.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/library/tinyxml/tinyxmlerror.cpp' object='tinyxmlerror.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlerror.lo `test -f '$(top_srcdir)/library/tinyxml/tinyxmlerror.cpp' || echo '$(srcdir)/'`$(top_srcdir)/library/tinyxml/tinyxmlerror.cpp - - mostlyclean-libtool: - -rm -f *.lo -diff -up mysql-workbench-gpl-5.2.28-src/modules/wb.mysql.validation/Makefile.am.tinyxml mysql-workbench-gpl-5.2.28-src/modules/wb.mysql.validation/Makefile.am ---- mysql-workbench-gpl-5.2.28-src/modules/wb.mysql.validation/Makefile.am.tinyxml 2010-09-24 17:18:15.694928908 +0200 -+++ mysql-workbench-gpl-5.2.28-src/modules/wb.mysql.validation/Makefile.am 2010-09-24 17:18:40.528525753 +0200 -@@ -15,7 +15,6 @@ INCLUDES=-I$(top_srcdir)/generated\ - -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)/library/tinyxml\ - -I$(top_srcdir)/library/vsqlite++/include\ - @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ - -diff -up mysql-workbench-gpl-5.2.28-src/modules/wb.mysql.validation/Makefile.in.tinyxml mysql-workbench-gpl-5.2.28-src/modules/wb.mysql.validation/Makefile.in ---- mysql-workbench-gpl-5.2.28-src/modules/wb.mysql.validation/Makefile.in.tinyxml 2010-09-24 17:18:15.613943077 +0200 -+++ mysql-workbench-gpl-5.2.28-src/modules/wb.mysql.validation/Makefile.in 2010-09-24 17:18:33.635759153 +0200 -@@ -247,7 +247,6 @@ INCLUDES = -I$(top_srcdir)/generated\ - -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)/library/tinyxml\ - -I$(top_srcdir)/library/vsqlite++/include\ - @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ - -diff -up mysql-workbench-gpl-5.2.28-src/modules/wb.validation/Makefile.am.tinyxml mysql-workbench-gpl-5.2.28-src/modules/wb.validation/Makefile.am ---- mysql-workbench-gpl-5.2.28-src/modules/wb.validation/Makefile.am.tinyxml 2010-09-24 17:18:16.990702020 +0200 -+++ mysql-workbench-gpl-5.2.28-src/modules/wb.validation/Makefile.am 2010-09-24 17:19:53.922919199 +0200 -@@ -14,7 +14,6 @@ INCLUDES=-I$(top_srcdir)/generated\ - -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)/library/tinyxml\ - @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ - - -diff -up mysql-workbench-gpl-5.2.28-src/modules/wb.validation/Makefile.in.tinyxml mysql-workbench-gpl-5.2.28-src/modules/wb.validation/Makefile.in ---- mysql-workbench-gpl-5.2.28-src/modules/wb.validation/Makefile.in.tinyxml 2010-09-24 17:18:16.743745274 +0200 -+++ mysql-workbench-gpl-5.2.28-src/modules/wb.validation/Makefile.in 2010-09-24 17:19:46.149397588 +0200 -@@ -244,7 +244,6 @@ INCLUDES = -I$(top_srcdir)/generated\ - -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)/library/tinyxml\ - @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ - - wb_validation_grt_la_LDFLAGS = -module ---- mysql-workbench-gpl-5.2.28-src/backend/wbprivate/Makefile.am.tinyxml 2010-09-19 15:35:37.000000000 +0200 -+++ mysql-workbench-gpl-5.2.28-src/backend/wbprivate/Makefile.am 2010-09-24 17:33:30.842800818 +0200 -@@ -11,8 +11,7 @@ - -I$(top_srcdir)/backend/wbprivate/workbench \ - -I$(top_srcdir)/ext/cppconn/ -I$(top_srcdir)/library/dbc/src\ - -I$(top_srcdir)/ext/scintilla/include\ -- -I$(top_srcdir)/library/vsqlite++/include\ -- -I$(top_srcdir)/library/tinyxml -+ -I$(top_srcdir)/library/vsqlite++/include - - libwbprivate_a_SOURCES=\ - model/canvas_floater.cpp\ -@@ -71,11 +70,7 @@ - $(top_srcdir)/frontend/common/edit_table_data_wizard.cpp\ - $(top_srcdir)/frontend/common/grt_shell_window.cpp\ - $(top_srcdir)/frontend/common/grt_code_editor.cpp\ -- $(top_srcdir)/frontend/common/plugin_manager_window.cpp\ -- $(top_srcdir)/library/tinyxml/tinyxmlparser.cpp\ -- $(top_srcdir)/library/tinyxml/tinyxml.cpp\ -- $(top_srcdir)/library/tinyxml/tinystr.cpp\ -- $(top_srcdir)/library/tinyxml/tinyxmlerror.cpp -+ $(top_srcdir)/frontend/common/plugin_manager_window.cpp - - #BUILT_SOURCES=stdafx.h.gch - #stdafx.h.gch: workbench/stdafx.h -diff -up mysql-workbench-gpl-5.2.28-src/frontend/linux/workbench/Makefile.am.tinyxml mysql-workbench-gpl-5.2.28-src/frontend/linux/workbench/Makefile.am ---- mysql-workbench-gpl-5.2.28-src/frontend/linux/workbench/Makefile.am.tinyxml 2010-09-24 18:11:29.356728771 +0200 -+++ mysql-workbench-gpl-5.2.28-src/frontend/linux/workbench/Makefile.am 2010-09-24 18:12:11.505231814 +0200 -@@ -52,7 +52,7 @@ mysql_workbench_bin_LDADD=\ - $(top_srcdir)/library/canvas/src/libmdcanvas.la\ - @CTEMPLATE_LIBS@\ - @GNOME_LIBS@ @GRT_LIBS@ @PCRE_LIBS@ @GLIB_LIBS@ @CAIRO_LIBS@ @ZIP_LIBS@ @MYSQL_LIBS@ @SQLITE3_LIBS@\ -- -lmysqlcppconn -lX11 -+ -ltinyxml -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.tinyxml mysql-workbench-gpl-5.2.28-src/frontend/linux/workbench/Makefile.in ---- mysql-workbench-gpl-5.2.28-src/frontend/linux/workbench/Makefile.in.tinyxml 2010-09-24 18:11:35.725750336 +0200 -+++ mysql-workbench-gpl-5.2.28-src/frontend/linux/workbench/Makefile.in 2010-09-24 18:12:34.852612345 +0200 -@@ -307,7 +307,7 @@ mysql_workbench_bin_LDADD = \ - $(top_srcdir)/library/canvas/src/libmdcanvas.la\ - @CTEMPLATE_LIBS@\ - @GNOME_LIBS@ @GRT_LIBS@ @PCRE_LIBS@ @GLIB_LIBS@ @CAIRO_LIBS@ @ZIP_LIBS@ @MYSQL_LIBS@ @SQLITE3_LIBS@\ -- -lmysqlcppconn -lX11 -+ -ltinyxml -lmysqlcppconn -lX11 - - mysql_workbench_bin_SOURCES = \ - main.cpp\ diff --git a/mysql-workbench-5.2.34-tinyxml.patch b/mysql-workbench-5.2.34-tinyxml.patch new file mode 100644 index 0000000..d53b5d8 --- /dev/null +++ b/mysql-workbench-5.2.34-tinyxml.patch @@ -0,0 +1,67 @@ +diff -up mysql-workbench-gpl-5.2.34-src/backend/wbprivate/Makefile.am.tinyxml mysql-workbench-gpl-5.2.34-src/backend/wbprivate/Makefile.am +--- mysql-workbench-gpl-5.2.34-src/backend/wbprivate/Makefile.am.tinyxml 2011-05-24 16:12:57.000000000 +0200 ++++ mysql-workbench-gpl-5.2.34-src/backend/wbprivate/Makefile.am 2011-05-28 08:02:15.299247072 +0200 +@@ -13,8 +13,7 @@ INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GR + -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\ +@@ -75,11 +74,7 @@ libwbprivate_a_SOURCES=\ + $(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)/frontend/common/plugin_install_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_install_window.cpp + + #BUILT_SOURCES=stdafx.h.gch + #stdafx.h.gch: workbench/stdafx.h +diff -up mysql-workbench-gpl-5.2.34-src/library/forms/Makefile.am.tinyxml mysql-workbench-gpl-5.2.34-src/library/forms/Makefile.am +--- mysql-workbench-gpl-5.2.34-src/library/forms/Makefile.am.tinyxml 2011-05-24 16:12:55.000000000 +0200 ++++ mysql-workbench-gpl-5.2.34-src/library/forms/Makefile.am 2011-05-28 08:01:19.473065610 +0200 +@@ -68,7 +68,7 @@ gtk/src/lf_button.cpp\ + 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=@GLIB_CFLAGS@ @GNOME_CFLAGS@ @SIGC_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_KEYRING_CFLAGS@ @PCRE_CFLAGS@ \ + -I$(top_srcdir)/library/forms\ +@@ -80,7 +80,6 @@ INCLUDES=@GLIB_CFLAGS@ @GNOME_CFLAGS@ @S + -I$(top_srcdir)/ext/vsqlite\ + -I$(top_srcdir)/library/\ + -I$(top_srcdir)/ext\ +--I$(top_srcdir)/ext/tinyxml\ + -I$(top_srcdir)/ext/scintilla/include + + +diff -up mysql-workbench-gpl-5.2.34-src/modules/wb.mysql.import/Makefile.am.tinyxml mysql-workbench-gpl-5.2.34-src/modules/wb.mysql.import/Makefile.am +--- mysql-workbench-gpl-5.2.34-src/modules/wb.mysql.import/Makefile.am.tinyxml 2011-05-24 16:12:59.000000000 +0200 ++++ mysql-workbench-gpl-5.2.34-src/modules/wb.mysql.import/Makefile.am 2011-05-28 08:00:15.373887490 +0200 +@@ -17,7 +17,6 @@ INCLUDES=\ + -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_LDFLAGS=-module + + 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 diff --git a/mysql-workbench-gpl-5.2.34-spec b/mysql-workbench-gpl-5.2.34-spec new file mode 100644 index 0000000..0906033 --- /dev/null +++ b/mysql-workbench-gpl-5.2.34-spec @@ -0,0 +1,106 @@ +%if !%{defined version} +%define version 5.2.34 +%endif +%define release 1 +%define edition gpl +%define have_python26 1 +%include %{_rpmconfigdir}/macros.python + +Summary: A MySQL visual database modeling, administration and querying tool. +Name: mysql-workbench-%{edition} +Version: %{version} +Release: %{release}%{targos} +Group: Applications/Databases +Vendor: Oracle Corporation +License: GPL +URL: http://wb.mysql.com +Source: %{name}-%{version}-src.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: pcre-devel >= 3.9 +BuildRequires: lua-devel >= 5.1 +BuildRequires: automake autoconf libtool +BuildRequires: libzip-devel libxml2-devel +BuildRequires: python-devel >= 2.5 +BuildRequires: gnome-keyring-devel +BuildRequires: boost-devel + +%if %_vendor == suse +BuildRequires: libmysqlclient-devel +BuildRequires: Mesa +%else +BuildRequires: mysql-devel >= 5.1 +BuildRequires: gtkmm24-devel +BuildRequires: mesa-libGL-devel +BuildRequires: sqlite-devel +%endif + +%if %_vendor == suse +Requires: python-paramiko python-pexpect +%else +Requires: python-paramiko pexpect +%endif +%if %{defined fc13} +Requires: python-sqlite2 +%endif +# requires mysql client pkg (for mysqldump and mysql cmdline client) +Requires: mysql gnome-keyring + +# our old package name +Obsoletes: mysql-workbench-oss +Conflicts: mysql-workbench-oss +Conflicts: mysql-workbench-com-se + +%description +MySQL Workbench is a modeling tool that allows you to design +and generate MySQL databases graphically. It also has administration +and query development modules where you can manage MySQL server instances +and execute SQL queries. + +%prep +%setup -q -n %{name}-%{version}-src + +%build + +NOCONFIGURE=yes ./autogen.sh +%if %{have_python26} +%configure --disable-debug --enable-mysql-utilities --disable-dependency-tracking +%else +%configure --disable-debug --disable-dependency-tracking +%endif +make + +%install +make install DESTDIR=%{buildroot} +rm -fr %{buildroot}/usr/share/doc/mysql-workbench +%if %{have_python26} +make -C ext install-utils DESTDIR=%{buildroot} +make -C ext install-connector DESTDIR=%{buildroot} +%endif + +find %{buildroot}%{_libdir}/mysql-workbench -name \*.a -exec rm {} \; -print +find %{buildroot}%{_libdir}/mysql-workbench -name \*.la -exec rm {} \; -print + +%if %{defined centos} +for l in libpixman-1.so.0 libcairo.so.2 libatkmm-1.6.so.1 libcairomm-1.0.so.1 libgdkmm-2.4.so.1 libglibmm-2.4.so.1 libgtkmm-2.4.so.1 libpangomm-1.4.so.1 libzip.so.1 libsigc-2.0.so.0; do +cp %{_libdir}/$l %{buildroot}/%{_libdir}/mysql-workbench +/usr/sbin/prelink -u %{buildroot}/%{_libdir}/mysql-workbench/$l || true +done +%endif + +%clean +rm -rf %{buildroot} +rm -rf %{_builddir}/%{name}-%{version}-src + +%files +%defattr(0644, root, root, 0755) +%doc COPYING README +%attr(0755,root,root) %{_bindir}/mysql* +%dir %{_libdir}/mysql-workbench +%{_libdir}/mysql-workbench/* +%{_datadir}/applications/*.desktop +%dir %{_datadir}/mysql-workbench +%{_datadir}/mysql-workbench/* +%{py_sitedir}/* + +%changelog + diff --git a/mysql-workbench.spec b/mysql-workbench.spec index 9e864ec..2c45108 100644 --- a/mysql-workbench.spec +++ b/mysql-workbench.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%global mw_version 5.2.33b -%global tarversion gpl-5.2.33b-src -%global srcversion gpl-5.2.33-src +%global mw_version 5.2.34 +%global tarversion gpl-5.2.34-src +%global srcversion gpl-5.2.34-src # Use system cppconn if a compatible upstream version exists #global cppconnver 1.1.0-0.3.bzr895 @@ -27,9 +27,12 @@ Source: http://gd.tuwien.ac.at/db/mysql/Downloads/MySQLGUITools/%{name}-%{tar # !!! This patch use versioned soname (libmysqlcppconn.so.5) !!! Patch1: %{name}-5.2.28-cppconn.patch Patch2: %{name}-5.2.32-ctemplate.patch -Patch3: %{name}-5.2.32-tinyxml.patch +Patch3: %{name}-5.2.34-tinyxml.patch # http://bugs.mysql.com/60603 -Patch4: %{name}-5.2.33-gcc46.patch +Patch4: %{name}-5.2.34-gcc46.patch +# redirect man page to /usr/share +Patch5: %{name}-5.2.34-man.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pcre-devel >= 3.9 @@ -99,7 +102,7 @@ an integrated tools environment for: Summary: Scripts for managing and administering MySQL servers # Not yet published (else will be package separatly) # see ext/mysql-utilities/CHANGES.txt -Version: 1.0.0 +Version: 1.0.1 Release: 0.%{mw_version}%{?dist} BuildArch: noarch @@ -134,6 +137,8 @@ rm -rf library/tinyxml %endif %patch4 -p1 -b .gcc46 +%patch5 -p1 -b .man + touch -r COPYING .timestamp4rpm %{__sed} -i -e 's/\r//g' COPYING @@ -168,13 +173,8 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} pushd ext/mysql-utilities -%{__install} --directory %{buildroot}%{_prefix}/man/man1 +%{__install} --directory %{buildroot}%{_mandir}/man1 %{__python} setup.py install --skip-profile --root %{buildroot} - -%if 0%{?fedora} >= 14 -%{__install} --directory %{buildroot}%{_mandir} -%{__mv} %{buildroot}%{_prefix}/man/man1 %{buildroot}%{_mandir}/man1 -%endif popd # clean dev files @@ -228,6 +228,7 @@ update-desktop-database &> /dev/null || : %{_bindir}/mysqlprocgrep %{_bindir}/mysqlreplicate %{_bindir}/mysqlserverclone +%{_bindir}/mysqlserverinfo %{_bindir}/mysqluserclone %{python_sitelib}/mysql/utilities %{python_sitelib}/mysql_utilities* @@ -239,6 +240,12 @@ update-desktop-database &> /dev/null || : %changelog +* Wed Mar 23 2011 Remi Collet <Fedora@famillecollet.com> 5.2.34-1 +- update to 5.2.34 Community (OSS) Edition (GPL) + http://dev.mysql.com/doc/workbench/en/wb-news-5-2-34.html + http://wb.mysql.com/?page_id=49 +- mysql-utilities 1.0.1rc1 + * Wed Mar 23 2011 Remi Collet <Fedora@famillecollet.com> 5.2.33b-1 - update to 5.2.33b Community (OSS) Edition (GPL) http://dev.mysql.com/doc/workbench/en/wb-news-5-2-33b.html |