Date: Thursday, April 23, 2015 @ 15:01:44 Author: eworm Revision: 132047
upgpkg: mysql-workbench 6.3.3-1 new upstream release Added: mysql-workbench/trunk/0010-mysql-workbench-object.patch Modified: mysql-workbench/trunk/PKGBUILD Deleted: mysql-workbench/trunk/0006-mysql-workbench-column-label.patch mysql-workbench/trunk/0008-mysql-workbench-link-x11.patch -----------------------------------------+ 0006-mysql-workbench-column-label.patch | 44 ------------------------------ 0008-mysql-workbench-link-x11.patch | 25 ----------------- 0010-mysql-workbench-object.patch | 24 ++++++++++++++++ PKGBUILD | 31 +++++++++++---------- 4 files changed, 41 insertions(+), 83 deletions(-) Deleted: 0006-mysql-workbench-column-label.patch =================================================================== --- 0006-mysql-workbench-column-label.patch 2015-04-23 10:38:55 UTC (rev 132046) +++ 0006-mysql-workbench-column-label.patch 2015-04-23 13:01:44 UTC (rev 132047) @@ -1,44 +0,0 @@ -diff --git a/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp b/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp -index 1b69f22..82de11f 100644 ---- a/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp -+++ b/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp -@@ -241,7 +241,11 @@ public: - const int last_column= meta->getColumnCount(); - for (int i = 1; i <= last_column; i++) - { -+#ifdef MYSQLCPPCONN_VERSION_1_1_5 -+ column_by_name[meta->getColumnLabel(i)]= i; -+#else - column_by_name[meta->getColumnName(i)]= i; -+#endif - - std::string type; - switch (meta->getColumnType(i)) -@@ -308,7 +312,11 @@ public: - db_query_ResultsetColumnRef column(aself->get_grt()); - - column->owner(aself); -+#ifdef MYSQLCPPCONN_VERSION_1_1_5 -+ column->name(std::string(meta->getColumnLabel(i))); -+#else - column->name(std::string(meta->getColumnName(i))); -+#endif - column->columnType(type); - - self->columns().insert(column); -diff --git a/modules/db.mysql.query/src/dbquery.cpp b/modules/db.mysql.query/src/dbquery.cpp -index 428bad3..74db1dc 100644 ---- a/modules/db.mysql.query/src/dbquery.cpp -+++ b/modules/db.mysql.query/src/dbquery.cpp -@@ -521,7 +521,11 @@ std::string DbMySQLQueryImpl::resultFieldName(int result, int field) - throw std::invalid_argument("Invalid resultset"); - sql::ResultSet *res = _resultsets[result]; - -+#ifdef MYSQLCPPCONN_VERSION_1_1_5 -+ return res->getMetaData()->getColumnLabel(field); -+#else - return res->getMetaData()->getColumnName(field); -+#endif - } - - Deleted: 0008-mysql-workbench-link-x11.patch =================================================================== --- 0008-mysql-workbench-link-x11.patch 2015-04-23 10:38:55 UTC (rev 132046) +++ 0008-mysql-workbench-link-x11.patch 2015-04-23 13:01:44 UTC (rev 132047) @@ -1,25 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 76a886e..773d804 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -32,6 +32,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/build/cmake/Modu - - find_package(PkgConfig REQUIRED) - -+find_package(X11) -+ - find_package(GTK2 2.20 REQUIRED gtk gtkmm) - pkg_check_modules(GTHREAD REQUIRED gthread-2.0) - pkg_check_modules(GMODULE REQUIRED gmodule-2.0) -diff --git a/frontend/linux/workbench/CMakeLists.txt b/frontend/linux/workbench/CMakeLists.txt -index b9c16c8..d52c34a 100644 ---- a/frontend/linux/workbench/CMakeLists.txt -+++ b/frontend/linux/workbench/CMakeLists.txt -@@ -92,6 +92,7 @@ target_link_libraries(mysql-workbench-bin - mysqlparser - ${MYSQLCPPCONN_LIBRARIES} - ${CTEMPLATE_LIBRARIES} -+ ${X11_LIBRARIES} - ${GTK2_LIBRARIES} - ${SIGC++_LIBRARIES} - ${GRT_LIBRARIES} Added: 0010-mysql-workbench-object.patch =================================================================== --- 0010-mysql-workbench-object.patch (rev 0) +++ 0010-mysql-workbench-object.patch 2015-04-23 13:01:44 UTC (rev 132047) @@ -0,0 +1,24 @@ +diff --git a/plugins/migration/copytable/copytable.cpp b/plugins/migration/copytable/copytable.cpp +index 7b760e0..ec05d11 100644 +--- a/plugins/migration/copytable/copytable.cpp ++++ b/plugins/migration/copytable/copytable.cpp +@@ -1922,7 +1922,7 @@ MySQLCopyDataTarget::MySQLCopyDataTarget(const std::string &hostname, int port, + mysql_init(&_mysql); + #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH) + #if MYSQL_CHECK_VERSION(5,6,6) +- if (is_mysql_version_at_least(5,6,6)) ++ if (_target->is_mysql_version_at_least(5,6,6)) + mysql_options4(&_mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", app_name.c_str()); + #endif + #endif +@@ -2871,8 +2871,8 @@ bool MySQLCopyDataTarget::InsertBuffer::append_escaped(const char *data, size_t + // This function is used to create a legal SQL string that you can use in an SQL statement + // This is needed because the escaping depends on the character set in use by the server + #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH) +- #if MYSQL_CHECK_VERSION(5,7,6) +- if (is_mysql_version_at_least(5,7,6)) ++ #if MYSQL_CHECK_VERSION(5,7,6) && not defined(MARIADB_BASE_VERSION) ++ if (_target->is_mysql_version_at_least(5,7,6)) + length += mysql_real_escape_string_quote(_mysql, buffer + length, data, (unsigned long)dlength); + else + length += mysql_real_escape_string(_mysql, buffer + length, data, (unsigned long)dlength); Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-04-23 10:38:55 UTC (rev 132046) +++ PKGBUILD 2015-04-23 13:01:44 UTC (rev 132047) @@ -6,8 +6,8 @@ # Contributor: Ionut Biru <ib...@archlinux.org> pkgname=mysql-workbench -pkgver=6.2.5 -pkgrel=3 +pkgver=6.3.3 +pkgrel=1 pkgdesc='A cross-platform, visual database design tool developed by MySQL' arch=('i686' 'x86_64') url='https://www.mysql.com/products/workbench/' @@ -20,25 +20,23 @@ 'libantlr3c') optdepends=('gnome-keyring: store SSH/MySQL passwords in GNOME password manager' 'python2-pyodbc: database migration') -makedepends=('cmake' 'boost' 'curl' 'mesa' 'swig2' 'java-runtime') +makedepends=('cmake' 'boost' 'curl' 'mesa' 'swig2' 'java-runtime' 'imagemagick') install=mysql-workbench.install validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5') source=("http://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${pkgver}-src.tar.gz"{,.asc} 'http://www.antlr3.org/download/antlr-3.4-complete.jar' '0001-mysql-workbench-no-check-for-updates.patch' - '0006-mysql-workbench-column-label.patch' '0007-mysql-workbench-no-set-gtid-purged.patch' - '0008-mysql-workbench-link-x11.patch' '0009-mysql-workbench-gnome-keyring.patch' + '0010-mysql-workbench-object.patch' 'arch_linux_profile.xml') -sha256sums=('40a5dbf72b55441ea3e9466dce2de47611777c88da2b65b748f10b06dfa0794e' +sha256sums=('4511d63145b2a979310d84c9f0ca61b7460af2c87b81787b2f2404fd5095f419' 'SKIP' '9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7' 'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf' - '701c7d9f68b1b0f63e8e8ece0b61cb57c2168f29e10b113c409f7ccfd68251e0' 'b49d4ea352d2c2013b9c5834668c44521a0a2c5f9c7e3fe746ad94ce0d2bb865' - 'bfa0752f08d4641eb475c87373593061a0fe1c872c0d0cc1ed45ea43cf23fa05' '9c2ae2fe7a4f59502bdcf591a07353c350b0ba29c3935c8242d97848cc0e50d3' + '3c74b06707d32047e66fedafdfd7e88e57014fa2df4f2f51719ca31b60831331' '28724c4b4cec29ce19aada08279df1b086381cd788fef7ae07c1860f7d17af7e') prepare() { @@ -48,18 +46,15 @@ # Updates are provided via Arch Linux packages patch -Np1 < "${srcdir}"/0001-mysql-workbench-no-check-for-updates.patch - # fix schema and table inspector with mysql-connector-c++ >= 1.1.5 - patch -Np1 < "${srcdir}"/0006-mysql-workbench-column-label.patch - # mysqldump from mariadb (currently 1.0.16) does not support --set-gtid-purged patch -Np1 < "${srcdir}"/0007-mysql-workbench-no-set-gtid-purged.patch - # link against X11 - patch -Np1 < "${srcdir}"/0008-mysql-workbench-link-x11.patch - # fix gnome-keyring patch -Np1 < "${srcdir}"/0009-mysql-workbench-gnome-keyring.patch + # fix cannot call member function without object + patch -Np1 < "${srcdir}"/0010-mysql-workbench-object.patch + # fix GDAL sed -i '/#include/s|gdal/||' backend/wbpublic/grtui/geom_draw_box.h backend/wbpublic/grt/spatial_handler.h @@ -82,6 +77,14 @@ make DESTDIR="${pkgdir}" install + # icons + for SIZE in 16 24 32 48 64 96 128; do + convert -scale ${SIZE} \ + images/icons/linux/128x128/apps/mysql-workbench.png \ + ${srcdir}/mysql-workbench.png + install -D -m0644 ${srcdir}/mysql-workbench.png "${pkgdir}/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/mysql-workbench.png" + done + install -D -m 0644 "${srcdir}"/arch_linux_profile.xml \ "${pkgdir}"/usr/share/mysql-workbench/mysql.profiles/Arch_Linux_\(MariaDB_5.5_Package\).xml }