diff options
| author | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2014-06-18 13:00:13 -0500 |
|---|---|---|
| committer | Erik Hanson <erik@slackbuilds.org> | 2014-06-18 16:19:16 -0500 |
| commit | 6ca56852e0b90283c97be6b79a746c4a2612fc27 (patch) | |
| tree | a9def5678d6c143c79a9e5c75e1d92df2bc323df | |
| parent | a2c9c0ffa09068fdf48a6fbde7763fba8e2a4ea6 (diff) | |
development/mysql-workbench: Updated for version 6.1.6.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
| -rw-r--r-- | development/mysql-workbench/mysql-workbench-ctemplate.patch | 29 | ||||
| -rw-r--r-- | development/mysql-workbench/mysql-workbench.SlackBuild | 6 | ||||
| -rw-r--r-- | development/mysql-workbench/mysql-workbench.info | 6 |
3 files changed, 37 insertions, 4 deletions
diff --git a/development/mysql-workbench/mysql-workbench-ctemplate.patch b/development/mysql-workbench/mysql-workbench-ctemplate.patch new file mode 100644 index 000000000000..ac51ddff6a03 --- /dev/null +++ b/development/mysql-workbench/mysql-workbench-ctemplate.patch @@ -0,0 +1,29 @@ +--- a/backend/wbpublic/sqlide/recordset_text_storage.cpp 2014-03-26 16:47:23.000000000 +0100
++++ b/backend/wbpublic/sqlide/recordset_text_storage.cpp 2014-05-09 01:31:36.099430631 +0200
+@@ -205,7 +205,7 @@
+ 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,7 +214,7 @@
+ 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 @@
+ 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)
\ No newline at end of file diff --git a/development/mysql-workbench/mysql-workbench.SlackBuild b/development/mysql-workbench/mysql-workbench.SlackBuild index 42ec96ae6ff5..2d61cff8902a 100644 --- a/development/mysql-workbench/mysql-workbench.SlackBuild +++ b/development/mysql-workbench/mysql-workbench.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mysql-workbench -VERSION=${VERSION:-6.1.4} +VERSION=${VERSION:-6.1.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -75,6 +75,10 @@ find -L . \ # Patch from Ponce patch -p1 < $CWD/config_and_ifconfig_paths.patch +# Patch to fix deprecated calls to tpl->ReloadIfChanged in ctemplate +# Reserved for ctemplate 2.3 update +# patch -p1 < $CWD/mysql-workbench-ctemplate.patch + mkdir wb-build cd wb-build cmake \ diff --git a/development/mysql-workbench/mysql-workbench.info b/development/mysql-workbench/mysql-workbench.info index 6e5999850549..2721dca25624 100644 --- a/development/mysql-workbench/mysql-workbench.info +++ b/development/mysql-workbench/mysql-workbench.info @@ -1,8 +1,8 @@ PRGNAM="mysql-workbench" -VERSION="6.1.4" +VERSION="6.1.6" HOMEPAGE="https://www.mysql.com/downloads/workbench/" -DOWNLOAD="http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-6.1.4-src.tar.gz" -MD5SUM="ba549ab2300373e21a5da2d3b8230f5d" +DOWNLOAD="http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-6.1.6-src.tar.gz" +MD5SUM="90dfafad31edb42e6e7f1ac363cb3bfa" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="tinyxml ecdsa mysql-connector-c++ vsqlite++ gtkmm ctemplate paramiko pexpect lua wxPython" |