Hello community, here is the log from the commit of package mysql-workbench for openSUSE:Factory checked in at Fri May 22 00:06:37 CEST 2009. -------- --- mysql-workbench/mysql-workbench.changes 2009-02-20 18:19:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/mysql-workbench/mysql-workbench.changes 2009-05-19 14:55:48.000000000 +0200 @@ -1,0 +2,17 @@ +Tue May 19 14:55:10 CEST 2009 - mhrusecky@suse.cz + +- fixed gcc 4.4 compilation errors + +------------------------------------------------------------------- +Fri May 15 18:32:38 CEST 2009 - mhrusecky@suse.cz + +- updated to the version 5.1.12 (no release notes available) + - using new version of ctemplates correctly + - added return statements to non-void functions + +------------------------------------------------------------------- +Thu Apr 21 18:07:47 CEST 2009 - mhrusecky@suse.cz + +- updated to the version 5.1.10 (no release notes available) + +------------------------------------------------------------------- @@ -4 +21 @@ -- updated to the last version (5.1.7) (no release notes available) +- updated to the version 5.1.7 (no release notes available) calling whatdependson for head-i586 Old: ---- mysql-workbench-5.1.5-alpha-title.patch mysql-workbench-5.1.5-lib-and-data-path-fix.patch mysql-workbench-5.1.5-nochdir-save.patch mysql-workbench-5.1.7-alpha-warning.patch mysql-workbench-5.1.7-disable-bundled.patch mysql-workbench-5.1.7-noext.tar.bz2 New: ---- mysql-workbench-5.1.10-alpha-title.patch mysql-workbench-5.1.10-alpha-warning.patch mysql-workbench-5.1.10-lib-and-data-path-fix.patch mysql-workbench-5.1.12-code-cleanup.patch mysql-workbench-5.1.12-disable-bundled.patch mysql-workbench-5.1.12-gcc-44.patch mysql-workbench-noext-oss-5.1.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-workbench.spec ++++++ --- /var/tmp/diff_new_pack.Zi8953/_old 2009-05-22 00:02:24.000000000 +0200 +++ /var/tmp/diff_new_pack.Zi8953/_new 2009-05-22 00:02:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package mysql-workbench (Version 5.1.7) +# spec file for package mysql-workbench (Version 5.1.12) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,28 +20,35 @@ Name: mysql-workbench Summary: A MySQL visual modeling tool -Version: 5.1.7 +Version: 5.1.12 Release: 1 Group: Productivity/Databases/Clients License: GPL v2 or later Url: http://www.mysql.com/products/tools/query-browser/ -Source: %{name}-%{version}-noext.tar.bz2 -Patch1: %{name}-5.1.7-disable-bundled.patch +# Upstream tarball without ext directory (rm -rf ext) +Source: %{name}-noext-oss-%{version}.tar.bz2 +Patch1: %{name}-5.1.12-disable-bundled.patch Patch2: %{name}-5.1.5-desktop.patch -Patch4: %{name}-5.1.5-lib-and-data-path-fix.patch -Patch5: %{name}-5.1.5-nochdir-save.patch +Patch4: %{name}-5.1.10-lib-and-data-path-fix.patch Patch6: %{name}-5.1.5-silent-mode-without-debug.patch -Patch7: %{name}-5.1.5-alpha-title.patch -Patch8: %{name}-5.1.7-alpha-warning.patch +Patch7: %{name}-5.1.10-alpha-title.patch +Patch8: %{name}-5.1.10-alpha-warning.patch +# PATCH-FIX-UPSTREAM mysql-workbench-5.1.12-code-cleanup.patch [ upstream#44906 ] mhrusecky@suse.cz -- Adds missing return statements to non-void functions +# http://bugs.mysql.com/44906 +Patch9: %{name}-5.1.12-code-cleanup.patch +# PATCH-FIX-UPSTREAM mysql-workbench-5.1.12-gcc-44.patch [] mhrusecky@suse.cz -- Adds missing includes +# +Patch10: %{name}-5.1.12-gcc-44.patch Summary: A MySQL visual modeling tool Group: Productivity/Databases/Clients BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: boost-devel gcc-c++ lua-devel -BuildRequires: glib2-devel libctemplate-devel libscintilla-devel libsigc++2-devel libxml2-devel mysql-devel +BuildRequires: glib2-devel libscintilla-devel libsigc++2-devel libxml2-devel mysql-devel BuildRequires: FastCGI-devel java-devel libgnome-devel libzip-devel pcre-devel python-devel readline-devel -BuildRequires: Mesa-devel cairomm-devel glitz-devel gtkmm24-devel libglade2-devel php-devel +BuildRequires: Mesa-devel cairomm-devel glitz-devel gtkmm24-devel libglade2-devel libmysqlcppconn-devel php-devel BuildRequires: dos2unix fdupes update-desktop-files BuildRequires: cairo-devel >= 1.5.12 +BuildRequires: libctemplate-devel %description MySQL Workbench is modeling tool that allows you to design and generate @@ -53,18 +60,18 @@ %prep -%setup -q -n %{name}-oss-%{version} -%patch1 -p1 +%setup -q -n %{name}-noext-oss-%{version} +%patch1 %patch2 -%patch4 -#%patch5 +%patch4 -p1 %patch6 -%patch7 +%patch7 -p1 %patch8 -p1 -# remove bundled libraries +%patch9 +%patch10 +# remove bundled libraries (not present in modified tarball) rm -rf ext # other small fixes -mv frontend/linux/workbench/mysql-workbench frontend/linux/workbench/mysql-workbench.in touch po/POTFILES.in %build @@ -110,8 +117,16 @@ %{_datadir}/pixmaps/%{name}.png %changelog +* Tue May 19 2009 mhrusecky@suse.cz +- fixed gcc 4.4 compilation errors +* Fri May 15 2009 mhrusecky@suse.cz +- updated to the version 5.1.12 (no release notes available) + - using new version of ctemplates correctly + - added return statements to non-void functions +* Tue Apr 21 2009 mhrusecky@suse.cz +- updated to the version 5.1.10 (no release notes available) * Fri Feb 20 2009 mhrusecky@suse.cz -- updated to the last version (5.1.7) (no release notes available) +- updated to the version 5.1.7 (no release notes available) * Tue Jan 20 2009 mhrusecky@suse.cz - fixed file saving (not using chdir anymore) - added big warning about alpha version ++++++ mysql-workbench-5.1.5-alpha-title.patch -> mysql-workbench-5.1.10-alpha-title.patch ++++++ --- mysql-workbench/mysql-workbench-5.1.5-alpha-title.patch 2009-01-19 17:21:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/mysql-workbench/mysql-workbench-5.1.10-alpha-title.patch 2009-04-17 21:40:42.000000000 +0200 @@ -1,12 +1,14 @@ ---- backend/workbench/wb_context_ui.cpp -+++ backend/workbench/wb_context_ui.cpp -@@ -1121,9 +1121,9 @@ - std::string WBContextUI::get_title() +diff -Naru mysql-workbench-oss-5.1.10-bak//backend/wbprivate/workbench/wb_context_ui.cpp mysql-workbench-oss-5.1.10/backend/wbprivate/workbench/wb_context_ui.cpp +--- mysql-workbench-oss-5.1.10-bak//backend/wbprivate/workbench/wb_context_ui.cpp 2009-04-14 21:20:14.000000000 +0200 ++++ mysql-workbench-oss-5.1.10/backend/wbprivate/workbench/wb_context_ui.cpp 2009-04-17 17:08:05.000000000 +0200 +@@ -1186,10 +1186,10 @@ { + #ifndef __APPLE__ if (_wb->has_unsaved_changes()) - return get_document_name() + "* - MySQL Workbench"; + return get_document_name() + "* - MySQL Workbench - Alpha Version !!!"; else + #endif - return get_document_name() + " - MySQL Workbench"; + return get_document_name() + " - MySQL Workbench - Alpha Version !!!"; } ++++++ mysql-workbench-5.1.7-alpha-warning.patch -> mysql-workbench-5.1.10-alpha-warning.patch ++++++ --- mysql-workbench/mysql-workbench-5.1.7-alpha-warning.patch 2009-02-12 15:02:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/mysql-workbench/mysql-workbench-5.1.10-alpha-warning.patch 2009-04-21 18:07:33.000000000 +0200 @@ -1,10 +1,10 @@ -diff -Naru mysql-workbench-oss-5.1.7-bak/backend/workbench/wb_context.cpp mysql-workbench-oss-5.1.7/backend/workbench/wb_context.cpp ---- mysql-workbench-oss-5.1.7-bak/backend/workbench/wb_context.cpp 2009-02-12 14:07:34.000000000 +0100 -+++ mysql-workbench-oss-5.1.7/backend/workbench/wb_context.cpp 2009-02-12 14:07:34.000000000 +0100 -@@ -478,6 +478,13 @@ +diff -Naru mysql-workbench-oss-5.1.10-bak//backend/wbprivate/workbench/wb_context.cpp mysql-workbench-oss-5.1.10/backend/wbprivate/workbench/wb_context.cpp +--- mysql-workbench-oss-5.1.10-bak//backend/wbprivate/workbench/wb_context.cpp 2009-04-14 21:20:14.000000000 +0200 ++++ mysql-workbench-oss-5.1.10/backend/wbprivate/workbench/wb_context.cpp 2009-04-17 17:14:14.000000000 +0200 +@@ -538,6 +538,14 @@ + else new_document(); - show_status_text(_("Ready.")); + if (get_wb_options().get_int("workbench.AlphaWarning", 1)) + this->show_warning(_("Alpha Version"),_("This version of the MySQL Workbench is an alpha version. " + "This means that not all functionality is yet completed and that the tool may still suffer from " @@ -12,27 +12,29 @@ + "Before you proceed please make sure you have a backup of ALL your databases so you do not lose " + "any importand data.\n\n" + "You can disable this warning in Tool->Options")); - - return true; - } -@@ -752,6 +759,7 @@ ++ + block_user_interaction(false); + + show_status_text(_("Ready.")); +@@ -817,6 +825,7 @@ set_default(options, "workbench:OSSHideMissing", 0); - set_default(options, "workbench:UndoEntries", 0); + set_default(options, "workbench:UndoEntries", DEFAULT_UNDO_STACK_SIZE); set_default(options, "workbench.AutoReopenLastModel", 0); + set_default(options, "workbench.AlphaWarning", 1); set_default(options, "workbench.physical:DeleteObjectConfirmation", "ask"); -diff -Naru mysql-workbench-oss-5.1.7-bak/frontend/common/preferences_form.cpp mysql-workbench-oss-5.1.7/frontend/common/preferences_form.cpp ---- mysql-workbench-oss-5.1.7-bak/frontend/common/preferences_form.cpp 2009-02-12 14:07:34.000000000 +0100 -+++ mysql-workbench-oss-5.1.7/frontend/common/preferences_form.cpp 2009-02-12 14:07:34.000000000 +0100 -@@ -299,6 +299,9 @@ - mforms::CheckBox *check= new_checkbox_option("workbench.AutoReopenLastModel"); - check->set_text(_("Automatically Reopen Previous Model When Started")); - table->add(check, 1, 2, 1, 2, mforms::HFillFlag); -+ check= new_checkbox_option("workbench.AlphaWarning"); +diff -Naru mysql-workbench-oss-5.1.10-bak//frontend/common/preferences_form.cpp mysql-workbench-oss-5.1.10/frontend/common/preferences_form.cpp +--- mysql-workbench-oss-5.1.10-bak//frontend/common/preferences_form.cpp 2009-04-14 21:20:14.000000000 +0200 ++++ mysql-workbench-oss-5.1.10/frontend/common/preferences_form.cpp 2009-04-17 17:13:03.000000000 +0200 +@@ -366,7 +366,10 @@ + + + table->add(new_label(_("Interactive GRT Shell Language:"), true), 0, 1, 2, 3, mforms::HFillFlag); + table->add(hbox, 1, 2, 2, 3, mforms::HFillFlag); ++ mforms::CheckBox *check= new_checkbox_option("workbench.AlphaWarning"); + check->set_text(_("Warn About Alpha Version When Started")); -+ table->add(check, 1, 2, 2, 3, mforms::HFillFlag); ++ table->add(check, 0, 2, 3, 4, mforms::HFillFlag); } _tabview.add_page(table, _("General")); ++++++ mysql-workbench-5.1.5-lib-and-data-path-fix.patch -> mysql-workbench-5.1.10-lib-and-data-path-fix.patch ++++++ --- mysql-workbench/mysql-workbench-5.1.5-lib-and-data-path-fix.patch 2009-01-14 16:05:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/mysql-workbench/mysql-workbench-5.1.10-lib-and-data-path-fix.patch 2009-04-17 21:40:50.000000000 +0200 @@ -1,36 +1,23 @@ ---- configure.in -+++ configure.in -@@ -416,6 +416,7 @@ +diff -Naru mysql-workbench-oss-5.1.10-bak//configure.in mysql-workbench-oss-5.1.10/configure.in +--- mysql-workbench-oss-5.1.10-bak//configure.in 2009-04-14 21:20:15.000000000 +0200 ++++ mysql-workbench-oss-5.1.10/configure.in 2009-04-14 21:27:50.000000000 +0200 +@@ -400,6 +400,7 @@ frontend/linux/shell/Makefile frontend/linux/linux_utilities/Makefile frontend/linux/workbench/Makefile +frontend/linux/workbench/mysql-workbench generated/Makefile - testing/tut/Params.inc ]) ---- frontend/linux/workbench/mysql-workbench -+++ frontend/linux/workbench/mysql-workbench -@@ -4,14 +4,18 @@ +diff -Naru mysql-workbench-oss-5.1.10-bak//frontend/linux/workbench/mysql-workbench.in mysql-workbench-oss-5.1.10/frontend/linux/workbench/mysql-workbench.in +--- mysql-workbench-oss-5.1.10-bak//frontend/linux/workbench/mysql-workbench.in 2009-04-14 21:20:14.000000000 +0200 ++++ mysql-workbench-oss-5.1.10/frontend/linux/workbench/mysql-workbench.in 2009-04-14 21:26:58.000000000 +0200 +@@ -5,7 +5,7 @@ bindirname=`dirname $program_path` basedirname=$(cd "$bindirname/..";pwd) -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+datadir=@datarootdir@ --export LD_LIBRARY_PATH="$basedirname/lib/mysql-workbench:$LD_LIBRARY_PATH" -+export LD_LIBRARY_PATH="$libdir/mysql-workbench:$LD_LIBRARY_PATH" +-libdir=$(basename #libdir#) ++libdir=$(basename @libdir@) --export MWB_DATA_DIR="$basedirname/share/mysql-workbench" --export MWB_MODULE_DIR="$basedirname/lib/mysql-workbench/modules" --export MWB_PLUGIN_DIR="$basedirname/lib/mysql-workbench/plugins" -+export MWB_DATA_DIR="$datadir/mysql-workbench" -+export MWB_MODULE_DIR="$libdir/mysql-workbench/modules" -+export MWB_PLUGIN_DIR="$libdir/mysql-workbench/plugins" + export LD_LIBRARY_PATH="$basedirname/$libdir/mysql-workbench:$LD_LIBRARY_PATH" --export DBC_DRIVER_PATH="$basedirname/lib/mysql-workbench" -+export DBC_DRIVER_PATH="$libdir/mysql-workbench" - - if type -p catchsegv > /dev/null; then - catchsegv $bindirname/mysql-workbench-bin $* ++++++ mysql-workbench-5.1.12-code-cleanup.patch ++++++ Index: frontend/linux/workbench/toolbar_manager.cpp =================================================================== --- frontend/linux/workbench/toolbar_manager.cpp.orig +++ frontend/linux/workbench/toolbar_manager.cpp @@ -309,7 +309,9 @@ bool ToolbarManager::on_searchitem_key_r { _search_text = e->get_text(); _be->activate_command("builtin:searchbox"); + return true; } + return false; } Index: plugins/db.mysql.editors/linux/mysql_routinegroup_editor_fe.cpp =================================================================== --- plugins/db.mysql.editors/linux/mysql_routinegroup_editor_fe.cpp.orig +++ plugins/db.mysql.editors/linux/mysql_routinegroup_editor_fe.cpp @@ -137,6 +137,7 @@ bool DbMySQLRoutineGroupEditor::switch_e refresh_form_data(); delete old_be; + return true; } //------------------------------------------------------------------------------ ++++++ mysql-workbench-5.1.7-disable-bundled.patch -> mysql-workbench-5.1.12-disable-bundled.patch ++++++ --- mysql-workbench/mysql-workbench-5.1.7-disable-bundled.patch 2009-02-12 14:33:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/mysql-workbench/mysql-workbench-5.1.12-disable-bundled.patch 2009-05-15 15:44:58.000000000 +0200 @@ -1,24 +1,21 @@ -diff -Naru mysql-workbench-oss-5.1.7-bak/backend/grt/Makefile.am mysql-workbench-oss-5.1.7/backend/grt/Makefile.am ---- mysql-workbench-oss-5.1.7-bak/backend/grt/Makefile.am 2009-02-12 14:26:52.000000000 +0100 -+++ mysql-workbench-oss-5.1.7/backend/grt/Makefile.am 2009-02-12 14:26:53.000000000 +0100 -@@ -5,8 +5,7 @@ - INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@\ - -I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/utilities/src\ - -I$(top_srcdir)/backend -I$(top_srcdir)/generated\ -- -I$(top_srcdir)/library -I$(top_srcdir)/modules\ -- -I$(top_srcdir)/ext -+ -I$(top_srcdir)/library -I$(top_srcdir)/modules - - libgrtbe_la_SOURCES=\ - editor_base.cpp\ -diff -Naru mysql-workbench-oss-5.1.7-bak/configure.in mysql-workbench-oss-5.1.7/configure.in ---- mysql-workbench-oss-5.1.7-bak/configure.in 2009-02-12 14:26:53.000000000 +0100 -+++ mysql-workbench-oss-5.1.7/configure.in 2009-02-12 14:26:53.000000000 +0100 -@@ -44,12 +44,10 @@ +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 +@@ -45,11 +45,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"])) ] ) @@ -31,28 +28,42 @@ -@@ -354,8 +352,6 @@ +@@ -111,6 +110,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") +@@ -354,10 +355,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/grt/Makefile - backend/grtdb/Makefile -@@ -411,7 +407,5 @@ - generated/Makefile - ]) + backend/wbpublic/Makefile + backend/wbprivate/Makefile +@@ -412,9 +409,3 @@ generated/Makefile --AC_CONFIG_SUBDIRS(ext/ctemplate/ctemplate-src) -- AC_OUTPUT() -diff -Naru mysql-workbench-oss-5.1.7-bak/frontend/linux/linux_utilities/Makefile.am mysql-workbench-oss-5.1.7/frontend/linux/linux_utilities/Makefile.am ---- mysql-workbench-oss-5.1.7-bak/frontend/linux/linux_utilities/Makefile.am 2009-02-12 14:26:52.000000000 +0100 -+++ mysql-workbench-oss-5.1.7/frontend/linux/linux_utilities/Makefile.am 2009-02-12 14:26:53.000000000 +0100 -@@ -4,7 +4,7 @@ - noinst_LTLIBRARIES=liblinux_utilities.la +-( +- 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 @@ -60,18 +71,18 @@ INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_CFLAGS@\ -I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/utilities/src \ -@@ -13,7 +13,6 @@ - -I$(top_srcdir)/backend/grt\ - -I$(top_srcdir)/frontend/linux/gtk_utilities\ + -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\ -diff -Naru mysql-workbench-oss-5.1.7-bak/frontend/linux/sqlide/Makefile.am mysql-workbench-oss-5.1.7/frontend/linux/sqlide/Makefile.am ---- mysql-workbench-oss-5.1.7-bak/frontend/linux/sqlide/Makefile.am 2009-02-12 14:26:52.000000000 +0100 -+++ mysql-workbench-oss-5.1.7/frontend/linux/sqlide/Makefile.am 2009-02-12 14:30:26.000000000 +0100 -@@ -3,7 +3,7 @@ +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 @@ -80,7 +91,7 @@ INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_CFLAGS@\ -I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/utilities/src \ -@@ -13,8 +13,7 @@ +@@ -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\ @@ -90,19 +101,113 @@ libsqlide_la_SOURCES=\ sql_editor_fe.cpp\ -diff -Naru mysql-workbench-oss-5.1.7-bak/Makefile.am mysql-workbench-oss-5.1.7/Makefile.am ---- mysql-workbench-oss-5.1.7-bak/Makefile.am 2009-02-12 14:26:53.000000000 +0100 -+++ mysql-workbench-oss-5.1.7/Makefile.am 2009-02-12 14:26:53.000000000 +0100 -@@ -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 +Index: frontend/linux/workbench/Makefile.am +=================================================================== +--- frontend/linux/workbench/Makefile.am.orig ++++ frontend/linux/workbench/Makefile.am +@@ -42,7 +42,7 @@ mysql_workbench_bin_LDADD=\ + $(top_srcdir)/library/sql-parser/source/libsqlparser.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 @@ - tests: - DEST_DIR=$(prefix) TEST_MODULES_DIR=$(prefix)/lib/mysql-workbench/modules make -C testing/tut test -diff -Naru mysql-workbench-oss-5.1.7-bak/modules/db.mysql/Makefile.am mysql-workbench-oss-5.1.7/modules/db.mysql/Makefile.am ---- mysql-workbench-oss-5.1.7-bak/modules/db.mysql/Makefile.am 2009-02-12 14:26:53.000000000 +0100 -+++ mysql-workbench-oss-5.1.7/modules/db.mysql/Makefile.am 2009-02-12 14:26:53.000000000 +0100 -@@ -21,7 +21,6 @@ + #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\ @@ -110,12 +215,22 @@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ -diff -Naru mysql-workbench-oss-5.1.7-bak/modules/wb.model/Makefile.am mysql-workbench-oss-5.1.7/modules/wb.model/Makefile.am ---- mysql-workbench-oss-5.1.7-bak/modules/wb.model/Makefile.am 2009-02-12 14:26:53.000000000 +0100 -+++ mysql-workbench-oss-5.1.7/modules/wb.model/Makefile.am 2009-02-12 14:26:53.000000000 +0100 -@@ -62,12 +62,10 @@ +@@ -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)/backend/grtdb\ -I$(top_srcdir)/library/tinyxml\ - -I$(top_srcdir)/ext/ctemplate/ctemplate-src/src\ @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @@ -126,32 +241,43 @@ wb_model_grt_la_SOURCES=src/graph_renderer.cpp \ src/reporting.cpp \ -diff -Naru mysql-workbench-oss-5.1.7-bak/modules/wb.mysql.validation/Makefile.am mysql-workbench-oss-5.1.7/modules/wb.mysql.validation/Makefile.am ---- mysql-workbench-oss-5.1.7-bak/modules/wb.mysql.validation/Makefile.am 2009-02-12 14:26:53.000000000 +0100 -+++ mysql-workbench-oss-5.1.7/modules/wb.mysql.validation/Makefile.am 2009-02-12 14:26:53.000000000 +0100 -@@ -7,7 +7,6 @@ - -I$(top_srcdir)/backend\ +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\ -diff -Naru mysql-workbench-oss-5.1.7-bak/modules/wb.validation/Makefile.am mysql-workbench-oss-5.1.7/modules/wb.validation/Makefile.am ---- mysql-workbench-oss-5.1.7-bak/modules/wb.validation/Makefile.am 2009-02-12 14:26:53.000000000 +0100 -+++ mysql-workbench-oss-5.1.7/modules/wb.validation/Makefile.am 2009-02-12 14:26:53.000000000 +0100 -@@ -8,7 +8,6 @@ - -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\ -diff -Naru mysql-workbench-oss-5.1.7-bak/plugins/db.mysql.editors/linux/Makefile.am mysql-workbench-oss-5.1.7/plugins/db.mysql.editors/linux/Makefile.am ---- mysql-workbench-oss-5.1.7-bak/plugins/db.mysql.editors/linux/Makefile.am 2009-02-12 14:26:53.000000000 +0100 -+++ mysql-workbench-oss-5.1.7/plugins/db.mysql.editors/linux/Makefile.am 2009-02-12 14:26:53.000000000 +0100 -@@ -28,13 +28,12 @@ +@@ -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 +@@ -26,13 +26,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\ @@ -166,3 +292,83 @@ 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\ + @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_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,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\ ++++++ mysql-workbench-5.1.12-gcc-44.patch ++++++ Index: library/canvas/src/mdc_common.h =================================================================== --- library/canvas/src/mdc_common.h.orig +++ library/canvas/src/mdc_common.h @@ -6,6 +6,7 @@ #include <list> #include <vector> #include <string> +#include <stdio.h> #include <map> #include <set> #include <stdexcept> Index: library/forms/filechooser.cpp =================================================================== --- library/forms/filechooser.cpp.orig +++ library/forms/filechooser.cpp @@ -2,6 +2,7 @@ #include "stdafx.h" #include <mforms/mforms.h> +#include <stdio.h> using namespace mforms; Index: library/forms/mforms.cpp =================================================================== --- library/forms/mforms.cpp.orig +++ library/forms/mforms.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include <string.h> +#include <stdio.h> #include "mforms/mforms.h" #include "mforms/simpleform.h" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org