Hello community, here is the log from the commit of package mysql-workbench for openSUSE:Factory checked in at Mon Sep 19 21:24:53 CEST 2011.
-------- --- mysql-workbench/mysql-workbench.changes 2010-12-20 16:42:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/mysql-workbench/mysql-workbench.changes 2011-09-17 19:22:53.000000000 +0200 @@ -1,0 +2,20 @@ +Tue Sep 13 16:11:04 CEST 2011 - [email protected] + +- fixed openSUSE configuration + +------------------------------------------------------------------- +Sun Sep 11 08:03:58 CEST 2011 - [email protected] + +- readded patches +- enabled command line utilities + +------------------------------------------------------------------- +Mon Sep 5 15:57:24 UTC 2011 - [email protected] + +- Upgraded to version 5.2.34 + see http://dev.mysql.com/doc/workbench/en/wb-news-5-2-34.html + see http://dev.mysql.com/doc/workbench/en/wb-news-5-2-33.html + see http://dev.mysql.com/doc/workbench/en/wb-news-5-2-32.html +- removed all patches + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mysql-workbench-gpl-5.2.30-disable-bundled.patch mysql-workbench-gpl-5.2.31-avoid-version.patch mysql-workbench-noext-oss-5.2.31.tar.bz2 openSUSE_(MySQL_Package).xml New: ---- mysql-workbench-gpl-5.2.34-avoid-version.patch mysql-workbench-gpl-5.2.34-ctemplate-fix.patch mysql-workbench-noext-oss-5.2.34.tar.bz2 openSUSE_(Vendor_Package).xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-workbench.spec ++++++ --- /var/tmp/diff_new_pack.440hER/_old 2011-09-19 21:24:46.000000000 +0200 +++ /var/tmp/diff_new_pack.440hER/_new 2011-09-19 21:24:46.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package mysql-workbench (Version 5.2.31) +# spec file for package mysql-workbench # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,16 +20,16 @@ Name: mysql-workbench Summary: A MySQL visual modeling tool -Version: 5.2.31 +Version: 5.2.34 Release: 1 Group: Productivity/Databases/Clients License: GPLv2+ Url: http://dev.mysql.com/downloads/workbench # Upstream tarball without ext directory (rm -rf ext) Source: %{name}-noext-oss-%{version}.tar.bz2 -Source1: openSUSE_(MySQL_Package).xml -Patch0: mysql-workbench-gpl-5.2.30-disable-bundled.patch -Patch1: mysql-workbench-gpl-5.2.31-avoid-version.patch +Source1: openSUSE_(Vendor_Package).xml +Patch0: mysql-workbench-gpl-5.2.34-ctemplate-fix.patch +Patch1: mysql-workbench-gpl-5.2.34-avoid-version.patch Summary: A MySQL visual modeling tool Group: Productivity/Databases/Clients BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -51,7 +51,7 @@ BuildRequires: PolicyKit-gnome %endif %endif -BuildRequires: boost-devel libctemplate-devel +BuildRequires: libctemplate-devel BuildRequires: cairo-devel >= 1.5.12 Requires: python-paramiko python-pexpect Provides: mysql-gui-tools=%{version} @@ -71,7 +71,7 @@ %prep %setup -q -n %{name}-gpl-%{version}-src %patch0 -%patch1 +%patch1 -p1 %build export SUSE_ASNEEDED=0 @@ -87,14 +87,15 @@ --disable-static \ --with-gnu-ld \ --enable-grt-generation \ - --with-system-ctemplate + --enable-mysql-utilities make %{?jobs:-j%jobs} %install make DESTDIR=%{buildroot} install cp plugins/README README.plugins cp modules/README README.modules -rm -rf %{buildroot}%{_libdir}/%{name}{,/modules,/plugins}/*.la +rm -f %{buildroot}%{_libdir}/%{name}{,/modules,/plugins}/*.la +rm -f %{buildroot}%{_libdir}/%{name}/lib*.so install -D -m 0644 images/icons/MySQLWorkbench-48.png %{buildroot}%{_datadir}/pixmaps/%{name}.png install -D -m 0644 "%{S:1}" %{buildroot}%{_datadir}/%{name}/mysql.profiles rm -f "$RPM_SOURCE_DIR"/*.desktop ++++++ mysql-workbench-gpl-5.2.31-avoid-version.patch -> mysql-workbench-gpl-5.2.34-avoid-version.patch ++++++ --- mysql-workbench/mysql-workbench-gpl-5.2.31-avoid-version.patch 2010-12-10 01:32:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/mysql-workbench/mysql-workbench-gpl-5.2.34-avoid-version.patch 2011-09-11 15:57:01.000000000 +0200 @@ -1,214 +1,249 @@ -Index: modules/db.checks/Makefile.am +Index: mysql-workbench-gpl-5.2.34-src/ext/cppconn/driver/Makefile.am =================================================================== ---- modules/db.checks/Makefile.am.orig -+++ modules/db.checks/Makefile.am +--- mysql-workbench-gpl-5.2.34-src.orig/ext/cppconn/driver/Makefile.am ++++ mysql-workbench-gpl-5.2.34-src/ext/cppconn/driver/Makefile.am +@@ -28,4 +28,4 @@ mysqlcppconn_la_SOURCES=\ + + INCLUDES=-I.. @MYSQL_INCLUDE@ -I./nativeapi -DMYSQLCLIENT_STATIC_BINDING=1 -I../cppconn -I../.. + +-mysqlcppconn_la_LDFLAGS=-module @MYSQL_LIBS@ ++mysqlcppconn_la_LDFLAGS=-avoid-version -module @MYSQL_LIBS@ +Index: mysql-workbench-gpl-5.2.34-src/library/forms/swig/Makefile.am +=================================================================== +--- mysql-workbench-gpl-5.2.34-src.orig/library/forms/swig/Makefile.am ++++ mysql-workbench-gpl-5.2.34-src/library/forms/swig/Makefile.am +@@ -14,6 +14,6 @@ INCLUDES=@SIGC_CFLAGS@ @PYTHON_CFLAGS@ @ + -I$(top_srcdir)/library/base\ + -I$(top_srcdir)/backend/wbpublic/ + +-_mforms_la_LDFLAGS=-module ++_mforms_la_LDFLAGS=-avoid-version -module + + +Index: mysql-workbench-gpl-5.2.34-src/modules/db.checks/Makefile.am +=================================================================== +--- mysql-workbench-gpl-5.2.34-src.orig/modules/db.checks/Makefile.am ++++ mysql-workbench-gpl-5.2.34-src/modules/db.checks/Makefile.am @@ -14,7 +14,7 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t -I$(top_srcdir)/modules/db.mysql/src\ @GRT_CFLAGS@ @GLIB_CFLAGS@ @GNOME_CFLAGS@ @SIGC_CFLAGS@ -db_checks_wbp_la_LDFLAGS=-module -+db_checks_wbp_la_LDFLAGS=-module -avoid-version ++db_checks_wbp_la_LDFLAGS=-avoid-version -module db_checks_wbp_la_SOURCES=\ ./register_plugin.cpp \ -Index: modules/db.mysql.query/Makefile.am +Index: mysql-workbench-gpl-5.2.34-src/modules/db.mysql.query/Makefile.am =================================================================== ---- modules/db.mysql.query/Makefile.am.orig -+++ modules/db.mysql.query/Makefile.am +--- mysql-workbench-gpl-5.2.34-src.orig/modules/db.mysql.query/Makefile.am ++++ mysql-workbench-gpl-5.2.34-src/modules/db.mysql.query/Makefile.am @@ -11,4 +11,4 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t db_mysql_query_grt_la_SOURCES=src/dbquery.cpp -db_mysql_query_grt_la_LDFLAGS=-module -+db_mysql_query_grt_la_LDFLAGS=-module -avoid-version -Index: modules/db.mysql.sqlide/Makefile.am ++db_mysql_query_grt_la_LDFLAGS=-avoid-version -module +Index: mysql-workbench-gpl-5.2.34-src/modules/db.mysql.sqlide/Makefile.am =================================================================== ---- modules/db.mysql.sqlide/Makefile.am.orig -+++ modules/db.mysql.sqlide/Makefile.am +--- mysql-workbench-gpl-5.2.34-src.orig/modules/db.mysql.sqlide/Makefile.am ++++ mysql-workbench-gpl-5.2.34-src/modules/db.mysql.sqlide/Makefile.am @@ -23,7 +23,7 @@ INCLUDES=\ @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ -db_mysql_sqlide_grt_la_LDFLAGS=-module -+db_mysql_sqlide_grt_la_LDFLAGS=-module -avoid-version ++db_mysql_sqlide_grt_la_LDFLAGS=-avoid-version -module #db_mysql_sqlide_grt_la_LIBADD= db_mysql_sqlide_grt_la_SOURCES=\ -Index: modules/db.mysql.sqlparser/Makefile.am +Index: mysql-workbench-gpl-5.2.34-src/modules/db.mysql.sqlparser/Makefile.am =================================================================== ---- modules/db.mysql.sqlparser/Makefile.am.orig -+++ modules/db.mysql.sqlparser/Makefile.am +--- mysql-workbench-gpl-5.2.34-src.orig/modules/db.mysql.sqlparser/Makefile.am ++++ mysql-workbench-gpl-5.2.34-src/modules/db.mysql.sqlparser/Makefile.am @@ -18,7 +18,7 @@ INCLUDES=\ - -I$(top_srcdir)/library/base/src\ + -I$(top_srcdir)/library/base\ @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @PCRE_CFLAGS@ @SIGC_CFLAGS@ -db_mysql_sqlparser_grt_la_LDFLAGS=-module -+db_mysql_sqlparser_grt_la_LDFLAGS=-module -avoid-version ++db_mysql_sqlparser_grt_la_LDFLAGS=-avoid-version -module db_mysql_sqlparser_grt_la_SOURCES=\ src/db.mysql.sqlparser.cpp\ -Index: modules/db.mysql/Makefile.am +Index: mysql-workbench-gpl-5.2.34-src/modules/db.mysql/Makefile.am =================================================================== ---- modules/db.mysql/Makefile.am.orig -+++ modules/db.mysql/Makefile.am +--- mysql-workbench-gpl-5.2.34-src.orig/modules/db.mysql/Makefile.am ++++ mysql-workbench-gpl-5.2.34-src/modules/db.mysql/Makefile.am @@ -32,7 +32,7 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t # db_mysql_statement_parser_fe.cpp # -db_mysql_grt_la_LDFLAGS=-module -+db_mysql_grt_la_LDFLAGS=-module -avoid-version ++db_mysql_grt_la_LDFLAGS=-avoid-version -module #ctemplate linked to main binary #db_mysql_grt_la_LIBADD=-L$(top_srcdir)/ext/ctemplate/ctemplate-src/ $(top_srcdir)/ext/ctemplate/ctemplate-src/libctemplate_wb.la -Index: modules/db/Makefile.am +Index: mysql-workbench-gpl-5.2.34-src/modules/db/Makefile.am =================================================================== ---- modules/db/Makefile.am.orig -+++ modules/db/Makefile.am +--- mysql-workbench-gpl-5.2.34-src.orig/modules/db/Makefile.am ++++ mysql-workbench-gpl-5.2.34-src/modules/db/Makefile.am @@ -10,5 +10,5 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t dbutils_grt_la_SOURCES=src/dbutils.cpp -dbutils_grt_la_LDFLAGS=-module -+dbutils_grt_la_LDFLAGS=-module -avoid-version ++dbutils_grt_la_LDFLAGS=-avoid-version -module # dbutils_grt_la_LIBADD=$(top_srcdir)/backend/grtdb/libgrtdbbe.la $(top_srcdir)/backend/grt/libgrtbe.la -Index: modules/grt.forms/Makefile.am +Index: mysql-workbench-gpl-5.2.34-src/modules/grt.forms/Makefile.am =================================================================== ---- modules/grt.forms/Makefile.am.orig -+++ modules/grt.forms/Makefile.am +--- mysql-workbench-gpl-5.2.34-src.orig/modules/grt.forms/Makefile.am ++++ mysql-workbench-gpl-5.2.34-src/modules/grt.forms/Makefile.am @@ -11,5 +11,5 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t forms_grt_la_SOURCES=src/grt_forms.cpp -forms_grt_la_LDFLAGS=-module -+forms_grt_la_LDFLAGS=-module -avoid-version ++forms_grt_la_LDFLAGS=-avoid-version -module -Index: modules/wb.model/Makefile.am +Index: mysql-workbench-gpl-5.2.34-src/modules/wb.model/Makefile.am =================================================================== ---- modules/wb.model/Makefile.am.orig -+++ modules/wb.model/Makefile.am +--- mysql-workbench-gpl-5.2.34-src.orig/modules/wb.model/Makefile.am ++++ mysql-workbench-gpl-5.2.34-src/modules/wb.model/Makefile.am @@ -73,7 +73,7 @@ INCLUDES=-I$(top_srcdir)/generated\ @CTEMPLATE_CFLAGS@ @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ -wb_model_grt_la_LDFLAGS=-module -+wb_model_grt_la_LDFLAGS=-module -avoid-version ++wb_model_grt_la_LDFLAGS=-avoid-version -module #wb_model_grt_la_LIBADD=$(top_srcdir)/ext/ctemplate wb_model_grt_la_SOURCES=src/graph_renderer.cpp \ -Index: modules/wb.mysql.import/Makefile.am +Index: mysql-workbench-gpl-5.2.34-src/modules/wb.mysql.import/Makefile.am =================================================================== ---- modules/wb.mysql.import/Makefile.am.orig -+++ modules/wb.mysql.import/Makefile.am -@@ -20,7 +20,7 @@ INCLUDES=\ +--- mysql-workbench-gpl-5.2.34-src.orig/modules/wb.mysql.import/Makefile.am ++++ mysql-workbench-gpl-5.2.34-src/modules/wb.mysql.import/Makefile.am +@@ -21,7 +21,7 @@ INCLUDES=\ @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ -wb_mysql_import_grt_la_LDFLAGS=-module -+wb_mysql_import_grt_la_LDFLAGS=-module -avoid-version ++wb_mysql_import_grt_la_LDFLAGS=-avoid-version -module #wb_mysql_import_grt_la_LIBADD= wb_mysql_import_grt_la_SOURCES=\ -Index: modules/wb.mysql.validation/Makefile.am +Index: mysql-workbench-gpl-5.2.34-src/modules/wb.mysql.validation/Makefile.am =================================================================== ---- modules/wb.mysql.validation/Makefile.am.orig -+++ modules/wb.mysql.validation/Makefile.am +--- mysql-workbench-gpl-5.2.34-src.orig/modules/wb.mysql.validation/Makefile.am ++++ mysql-workbench-gpl-5.2.34-src/modules/wb.mysql.validation/Makefile.am @@ -20,7 +20,7 @@ INCLUDES=-I$(top_srcdir)/generated\ @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ -wb_mysql_validation_grt_la_LDFLAGS=-module -+wb_mysql_validation_grt_la_LDFLAGS=-module -avoid-version ++wb_mysql_validation_grt_la_LDFLAGS=-avoid-version -module #wb_mysql_import_grt_la_LIBADD=$(top_srcdir) wb_mysql_validation_grt_la_LIBADD=@GRT_LIBS@ @GLIB_LIBS@ @SIGC_LIBS@ -Index: modules/wb.validation/Makefile.am +Index: mysql-workbench-gpl-5.2.34-src/modules/wb.validation/Makefile.am =================================================================== ---- modules/wb.validation/Makefile.am.orig -+++ modules/wb.validation/Makefile.am +--- mysql-workbench-gpl-5.2.34-src.orig/modules/wb.validation/Makefile.am ++++ mysql-workbench-gpl-5.2.34-src/modules/wb.validation/Makefile.am @@ -18,7 +18,7 @@ INCLUDES=-I$(top_srcdir)/generated\ @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ -wb_validation_grt_la_LDFLAGS=-module -+wb_validation_grt_la_LDFLAGS=-module -avoid-version ++wb_validation_grt_la_LDFLAGS=-avoid-version -module #wb_mysql_import_grt_la_LIBADD=$(top_srcdir)/backend/grtdb/libgrtdbbe.la wb_validation_grt_la_LIBADD=@GRT_LIBS@ @GLIB_LIBS@ @SIGC_LIBS@ -Index: plugins/db.mysql.diff.reporting/frontend/Makefile.am +Index: mysql-workbench-gpl-5.2.34-src/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 +--- mysql-workbench-gpl-5.2.34-src.orig/plugins/db.mysql.diff.reporting/frontend/Makefile.am ++++ mysql-workbench-gpl-5.2.34-src/plugins/db.mysql.diff.reporting/frontend/Makefile.am @@ -22,7 +22,7 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @CAIRO_CFLAGS@ -db_mysql_diff_reporting_wbp_la_LDFLAGS=-module -+db_mysql_diff_reporting_wbp_la_LDFLAGS=-module -avoid-version ++db_mysql_diff_reporting_wbp_la_LDFLAGS=-avoid-version -module db_mysql_diff_reporting_wbp_la_SOURCES=\ ../backend/db_mysql_diff_reporting.cpp\ -Index: plugins/db.mysql.editors/linux/Makefile.am +Index: mysql-workbench-gpl-5.2.34-src/plugins/db.mysql.editors/linux/Makefile.am =================================================================== ---- plugins/db.mysql.editors/linux/Makefile.am.orig -+++ plugins/db.mysql.editors/linux/Makefile.am +--- mysql-workbench-gpl-5.2.34-src.orig/plugins/db.mysql.editors/linux/Makefile.am ++++ mysql-workbench-gpl-5.2.34-src/plugins/db.mysql.editors/linux/Makefile.am @@ -32,7 +32,7 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t @GRT_CFLAGS@ @GLIB_CFLAGS@ @GNOME_CFLAGS@ @SIGC_CFLAGS@ -db_mysql_editors_wbp_la_LDFLAGS=-module -+db_mysql_editors_wbp_la_LDFLAGS=-module -avoid-version ++db_mysql_editors_wbp_la_LDFLAGS=-avoid-version -module db_mysql_editors_wbp_la_LIBADD=$(top_srcdir)/frontend/linux/linux_utilities/liblinux_utilities.la\ $(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la -Index: plugins/db.mysql/frontend/Makefile.am +Index: mysql-workbench-gpl-5.2.34-src/plugins/db.mysql/frontend/Makefile.am =================================================================== ---- plugins/db.mysql/frontend/Makefile.am.orig -+++ plugins/db.mysql/frontend/Makefile.am +--- mysql-workbench-gpl-5.2.34-src.orig/plugins/db.mysql/frontend/Makefile.am ++++ mysql-workbench-gpl-5.2.34-src/plugins/db.mysql/frontend/Makefile.am @@ -25,7 +25,7 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @CAIRO_CFLAGS@ -db_mysql_wbp_la_LDFLAGS=-module -+db_mysql_wbp_la_LDFLAGS=-module -avoid-version ++db_mysql_wbp_la_LDFLAGS=-avoid-version -module db_mysql_wbp_la_SOURCES=\ ../backend/db_frw_eng_be.cpp\ -Index: plugins/wb.model.editors/linux/Makefile.am +Index: mysql-workbench-gpl-5.2.34-src/plugins/wb.model.editors/linux/Makefile.am =================================================================== ---- plugins/wb.model.editors/linux/Makefile.am.orig -+++ plugins/wb.model.editors/linux/Makefile.am +--- mysql-workbench-gpl-5.2.34-src.orig/plugins/wb.model.editors/linux/Makefile.am ++++ mysql-workbench-gpl-5.2.34-src/plugins/wb.model.editors/linux/Makefile.am @@ -21,7 +21,7 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @GNOME_CFLAGS@ -wb_model_editors_wbp_la_LDFLAGS=-module -+wb_model_editors_wbp_la_LDFLAGS=-module -avoid-version ++wb_model_editors_wbp_la_LDFLAGS=-avoid-version -module wb_model_editors_wbp_la_LIBADD=$(top_srcdir)/frontend/linux/linux_utilities/liblinux_utilities.la wb_model_editors_wbp_la_SOURCES=\ -Index: plugins/wb.model.reporting/frontend/Makefile.am +Index: mysql-workbench-gpl-5.2.34-src/plugins/wb.model.reporting/frontend/Makefile.am =================================================================== ---- plugins/wb.model.reporting/frontend/Makefile.am.orig -+++ plugins/wb.model.reporting/frontend/Makefile.am +--- mysql-workbench-gpl-5.2.34-src.orig/plugins/wb.model.reporting/frontend/Makefile.am ++++ mysql-workbench-gpl-5.2.34-src/plugins/wb.model.reporting/frontend/Makefile.am @@ -17,7 +17,7 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ -wb_model_reporting_wbp_la_LDFLAGS=-module -+wb_model_reporting_wbp_la_LDFLAGS=-module -avoid-version ++wb_model_reporting_wbp_la_LDFLAGS=-avoid-version -module wb_model_reporting_wbp_la_SOURCES=\ ../backend/wb_model_reporting.cpp\ -Index: plugins/wb.printing/linux/Makefile.am +Index: mysql-workbench-gpl-5.2.34-src/plugins/wb.model.snippets/Makefile.am +=================================================================== +--- mysql-workbench-gpl-5.2.34-src.orig/plugins/wb.model.snippets/Makefile.am ++++ mysql-workbench-gpl-5.2.34-src/plugins/wb.model.snippets/Makefile.am +@@ -22,7 +22,7 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t + @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @CAIRO_CFLAGS@ + + +-wb_model_snippets_wbp_la_LDFLAGS=-module ++wb_model_snippets_wbp_la_LDFLAGS=-avoid-version -module + + wb_model_snippets_wbp_la_SOURCES=\ + include_model_wizard.cpp\ +Index: mysql-workbench-gpl-5.2.34-src/plugins/wb.printing/linux/Makefile.am =================================================================== ---- plugins/wb.printing/linux/Makefile.am.orig -+++ plugins/wb.printing/linux/Makefile.am +--- mysql-workbench-gpl-5.2.34-src.orig/plugins/wb.printing/linux/Makefile.am ++++ mysql-workbench-gpl-5.2.34-src/plugins/wb.printing/linux/Makefile.am @@ -20,7 +20,7 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @GNOME_CFLAGS@ -wb_printing_wbp_la_LDFLAGS=-module -+wb_printing_wbp_la_LDFLAGS=-module -avoid-version ++wb_printing_wbp_la_LDFLAGS=-avoid-version -module wb_printing_wbp_la_LIBADD=$(top_srcdir)/frontend/linux/linux_utilities/liblinux_utilities.la wb_printing_wbp_la_SOURCES=\ ++++++ mysql-workbench-gpl-5.2.34-ctemplate-fix.patch ++++++ Index: configure.in =================================================================== --- configure.in.orig +++ configure.in @@ -319,7 +319,7 @@ AC_SUBST(CTEMPLATE_LIBS) #AM_CONDITIONAL(BUILD_PHP, test "x$enable_php" = "xyes") AM_CONDITIONAL(USE_READLINE, test "x$use_readline" = "xyes") #AM_CONDITIONAL(BUILD_FASTCGI, test "x$enable_cgi" = "xyes") -AM_CONDITIONAL(BUILD_CTEMPLATE, test "x$ac_system_ctemplate" = "xyes") +AM_CONDITIONAL(BUILD_CTEMPLATE, test "x$ac_system_ctemplate" \!= "xyes") AM_CONDITIONAL(BUILD_SE, test "x$std_edition" = "xyes") AM_CONDITIONAL(BUNDLE_UTILITIES, test "x$bundle_utilities" = "xyes") Index: ext/Makefile.am =================================================================== --- ext/Makefile.am.orig +++ ext/Makefile.am @@ -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: ++++++ mysql-workbench-noext-oss-5.2.31.tar.bz2 -> mysql-workbench-noext-oss-5.2.34.tar.bz2 ++++++ mysql-workbench/mysql-workbench-noext-oss-5.2.31.tar.bz2 /mounts/work_src_done/STABLE/mysql-workbench/mysql-workbench-noext-oss-5.2.34.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
