Hello community, here is the log from the commit of package mysql-workbench for openSUSE:Factory checked in at 2014-07-10 14:55:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old) and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-workbench" Changes: -------- --- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes 2014-05-03 16:56:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes 2014-07-10 14:55:37.000000000 +0200 @@ -1,0 +2,13 @@ +Sun Jul 6 14:46:08 UTC 2014 - [email protected] + +- update to version 6.1.7 +- Fix compilation issues on several distribution +- Added patch fixing build error inexistant mysql_option4 + mysql-workbench-mysql_options4.patch +- Added patch to remove help check for upgrade + mysql-workbench-no-check-for-updates.patch +- Added patch to fix deprecate call ctemplate + mysql-workbench-ctemplate.patch + upstream bug http://bugs.mysql.com/72585 + +------------------------------------------------------------------- Old: ---- mysql-workbench-community-6.1.4-src.tar.gz New: ---- mysql-workbench-community-6.1.7-src.tar.gz mysql-workbench-ctemplate.patch mysql-workbench-mysql_options4.patch mysql-workbench-no-check-for-updates.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-workbench.spec ++++++ --- /var/tmp/diff_new_pack.78mGGJ/_old 2014-07-10 14:55:39.000000000 +0200 +++ /var/tmp/diff_new_pack.78mGGJ/_new 2014-07-10 14:55:39.000000000 +0200 @@ -26,7 +26,7 @@ License: GPL-2.0+ Group: Productivity/Databases/Clients Name: mysql-workbench -Version: 6.1.4 +Version: 6.1.7 Release: 0 Url: http://wb.mysql.com Source: %{name}-%{edition}-%{version}-src.tar.gz @@ -34,6 +34,16 @@ #Patches Patch0: patch-desktop-categories.patch +# fix deprecated calls to tpl->ReloadIfChanged +# http://bugs.mysql.com/72585 +Patch1: mysql-workbench-ctemplate.patch +# Remove check for update in help +Patch2: mysql-workbench-no-check-for-updates.patch +# Fix build error +# copytable.cpp:1638: undefined reference to `mysql_options4' +# This only exist in mysql 5.6.x but the if code didn't work +# So disable it +Patch3: mysql-workbench-mysql_options4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Keep them alphabetic order @@ -56,7 +66,9 @@ BuildRequires: libglade2-devel BuildRequires: libgnome-devel BuildRequires: libiodbc-devel +BuildRequires: libmysqlclient-devel BuildRequires: libmysqlcppconn-devel +BuildRequires: libmysqld-devel BuildRequires: libsigc++2-devel BuildRequires: libtool BuildRequires: libxml2-devel @@ -91,7 +103,6 @@ Requires(post): desktop-file-utils Requires(postun): desktop-file-utils -Requires: libmysqlclient-devel Requires: python-paramiko Requires: python-pexpect @@ -124,31 +135,49 @@ # Add the -D flag if you don't want to delete the source root on each build %setup -q -n %{name}-%{edition}-%{version}-src %patch0 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build +# FIX this is too much on obs Out of Memory use +# %%{?_smp_mflags} could it be in _constraint ? +# make %%{?jobs:-j2} export PATH=$PWD/bin:$PATH -export CFLAGS="%{optflags}" -export CXXFLAGS="$CFLAGS" -LIB_SUFFIX=%{_lib} -LIB_SUFFIX=${LIB_SUFFIX#lib} -cmake \ - -DLIB_INSTALL_DIR=%{_libdir} \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DLIB_SUFFIX=$LIB_SUFFIX \ +%if 0%{?suse_version} >= 1310 +# Make things more secure, but only on new version + export LDFLAGS="-Wl,-z,relro,-z,now -pie" + export CFLAGS="%{optflags} -fPIE -pie" + export CXXFLAGS="%{optflags} -fPIE -pie" + %cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DMYSQL_CONFIG_PATH=%{_bindir}/mysql_config \ + -DLIB_INSTALL_DIR=%{_lib} \ -DCMAKE_BUILD_TYPE=%{edition} \ -DREAL_EXECUTABLE_DIR=%{_libdir}/%{name} \ - -DUSE_UNIXODBC=FALSE - -#%%__make %%{?_smp_mflags} - -#if too much FIX this is too much on obs Out of Memory use -make %{?jobs:-j2} + -DUSE_UNIXODBC=FALSE \ + .. + make VERBOSE=1 %{?jobs:-j2} +%else + pushd build + cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DMYSQL_CONFIG_PATH=%{_bindir}/mysql_config \ + -DLIB_INSTALL_DIR=%{_lib} \ + -DCMAKE_BUILD_TYPE=%{edition} \ + -DREAL_EXECUTABLE_DIR=%{_libdir}/%{name} \ + -DUSE_UNIXODBC=FALSE \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_SKIP_INSTALL_RPATH=ON \ + -DCMAKE_NO_BUILTIN_CHRPATH=ON \ + .. + make VERBOSE=1 %{?jobs:-j2} + popd +%endif %install -%__make install DESTDIR=%{buildroot} - +pushd build +make VERBOSE=1 DESTDIR=%{buildroot} %{?jobs:-j2} install +popd #Can't we split that in a -doc package ? #rm -fr %%{buildroot}/usr/share/doc/%%{name} ++++++ mysql-workbench-community-6.1.4-src.tar.gz -> mysql-workbench-community-6.1.7-src.tar.gz ++++++ /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench-community-6.1.4-src.tar.gz /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench-community-6.1.7-src.tar.gz differ: char 5, line 1 ++++++ mysql-workbench-ctemplate.patch ++++++ diff -rup a/backend/wbpublic/sqlide/recordset_text_storage.cpp b/backend/wbpublic/sqlide/recordset_text_storage.cpp --- a/backend/wbpublic/sqlide/recordset_text_storage.cpp 2014-06-20 21:18:09.000000000 +0200 +++ b/backend/wbpublic/sqlide/recordset_text_storage.cpp 2014-07-06 14:01:10.349533464 +0200 @@ -205,7 +205,7 @@ void Recordset_text_storage::do_serializ if (!pre_tpl) g_warning("Failed to open template file: `%s`", pre_tpl_path.c_str()); else - pre_tpl->ReloadIfChanged(); + ctemplate::Template::ReloadAllIfChanged(); } if (g_file_test((name+".post.tpl").c_str(), G_FILE_TEST_EXISTS)) { @@ -214,8 +214,8 @@ void Recordset_text_storage::do_serializ if (!post_tpl) g_warning("Failed to open template file: `%s`", post_tpl_path.c_str()); else - post_tpl->ReloadIfChanged(); - } + ctemplate::Template::ReloadAllIfChanged(); + } } { @@ -223,7 +223,7 @@ void Recordset_text_storage::do_serializ throw std::runtime_error(strfmt("Failed to open output file: `%s`", _file_path.c_str())); } - tpl->ReloadIfChanged(); + ctemplate::Template::ReloadAllIfChanged(); std::auto_ptr<TemplateDictionary> dict(new TemplateDictionary("/")); BOOST_FOREACH (const Parameters::value_type ¶m, _parameters) ++++++ mysql-workbench-mysql_options4.patch ++++++ diff --git a/plugins/migration/copytable/copytable.cpp b/plugins/migration/copytable/copytable.cpp index b273287..77c227b 100644 --- a/plugins/migration/copytable/copytable.cpp +++ b/plugins/migration/copytable/copytable.cpp @@ -1633,11 +1633,16 @@ MySQLCopyDataTarget::MySQLCopyDataTarget(const std::string &hostname, int port, _truncate = false; mysql_init(&_mysql); + /* This is optional has compiled in for MySQL >= 5.6.6 + * Looks like MariaDB does not support this as supposed, + * so disable completly. */ +#if 0 #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH) #if MYSQL_CHECK_VERSION(5,6,6) mysql_options4(&_mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", app_name.c_str()); #endif #endif +#endif // _bulk_insert_record is used to prepare a single record string, the connection // is needed to escape binary data properly ++++++ mysql-workbench-no-check-for-updates.patch ++++++ diff --git a/res/wbdata/main_menu.xml b/res/wbdata/main_menu.xml index 3bfb79a..7efa4e7 100644 --- a/res/wbdata/main_menu.xml +++ b/res/wbdata/main_menu.xml @@ -2665,6 +2665,7 @@ value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.view.fkhili <value type="string" key="itemType">action</value> </value> + <!-- We build a package that should be updated via pacman, so disable this check. <value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.checkver"> <value type="string" key="itemType">separator</value> </value> @@ -2675,7 +2676,7 @@ value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.view.fkhili <value type="string" key="name">checkUpdate</value> <value type="string" key="command">plugin:wb.tools.checkForUpdates</value> <value type="string" key="itemType">action</value> - </value> + </value> //--> <value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.report_a_bug"> <value type="string" key="itemType">separator</value> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
