[arch-commits] Commit in mysql-workbench/repos (18 files)

Christian Hesse eworm at archlinux.org
Wed Mar 18 14:15:52 UTC 2015 

    Date: Wednesday, March 18, 2015 @ 15:15:52
  Author: eworm
Revision: 129488

archrelease: copy trunk to community-testing-i686, community-testing-x86_64

Added:
  mysql-workbench/repos/community-testing-i686/
  mysql-workbench/repos/community-testing-i686/0001-mysql-workbench-no-check-for-updates.patch
    (from rev 129487, mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
  mysql-workbench/repos/community-testing-i686/0006-mysql-workbench-column-label.patch
    (from rev 129487, mysql-workbench/trunk/0006-mysql-workbench-column-label.patch)
  mysql-workbench/repos/community-testing-i686/0007-mysql-workbench-no-set-gtid-purged.patch
    (from rev 129487, mysql-workbench/trunk/0007-mysql-workbench-no-set-gtid-purged.patch)
  mysql-workbench/repos/community-testing-i686/0008-mysql-workbench-link-x11.patch
    (from rev 129487, mysql-workbench/trunk/0008-mysql-workbench-link-x11.patch)
  mysql-workbench/repos/community-testing-i686/0009-mysql-workbench-gnome-keyring.patch
    (from rev 129487, mysql-workbench/trunk/0009-mysql-workbench-gnome-keyring.patch)
  mysql-workbench/repos/community-testing-i686/PKGBUILD
    (from rev 129487, mysql-workbench/trunk/PKGBUILD)
  mysql-workbench/repos/community-testing-i686/arch_linux_profile.xml
    (from rev 129487, mysql-workbench/trunk/arch_linux_profile.xml)
  mysql-workbench/repos/community-testing-i686/mysql-workbench.install
    (from rev 129487, mysql-workbench/trunk/mysql-workbench.install)
  mysql-workbench/repos/community-testing-x86_64/
  mysql-workbench/repos/community-testing-x86_64/0001-mysql-workbench-no-check-for-updates.patch
    (from rev 129487, mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
  mysql-workbench/repos/community-testing-x86_64/0006-mysql-workbench-column-label.patch
    (from rev 129487, mysql-workbench/trunk/0006-mysql-workbench-column-label.patch)
  mysql-workbench/repos/community-testing-x86_64/0007-mysql-workbench-no-set-gtid-purged.patch
    (from rev 129487, mysql-workbench/trunk/0007-mysql-workbench-no-set-gtid-purged.patch)
  mysql-workbench/repos/community-testing-x86_64/0008-mysql-workbench-link-x11.patch
    (from rev 129487, mysql-workbench/trunk/0008-mysql-workbench-link-x11.patch)
  mysql-workbench/repos/community-testing-x86_64/0009-mysql-workbench-gnome-keyring.patch
    (from rev 129487, mysql-workbench/trunk/0009-mysql-workbench-gnome-keyring.patch)
  mysql-workbench/repos/community-testing-x86_64/PKGBUILD
    (from rev 129487, mysql-workbench/trunk/PKGBUILD)
  mysql-workbench/repos/community-testing-x86_64/arch_linux_profile.xml
    (from rev 129487, mysql-workbench/trunk/arch_linux_profile.xml)
  mysql-workbench/repos/community-testing-x86_64/mysql-workbench.install
    (from rev 129487, mysql-workbench/trunk/mysql-workbench.install)

--------------------------------------------------------------------------+
 community-testing-i686/0001-mysql-workbench-no-check-for-updates.patch   |   21 ++
 community-testing-i686/0006-mysql-workbench-column-label.patch           |   44 +++++
 community-testing-i686/0007-mysql-workbench-no-set-gtid-purged.patch     |   29 +++
 community-testing-i686/0008-mysql-workbench-link-x11.patch               |   25 ++
 community-testing-i686/0009-mysql-workbench-gnome-keyring.patch          |   17 +
 community-testing-i686/PKGBUILD                                          |   88 ++++++++++
 community-testing-i686/mysql-workbench.install                           |   14 +
 community-testing-x86_64/0001-mysql-workbench-no-check-for-updates.patch |   21 ++
 community-testing-x86_64/0006-mysql-workbench-column-label.patch         |   44 +++++
 community-testing-x86_64/0007-mysql-workbench-no-set-gtid-purged.patch   |   29 +++
 community-testing-x86_64/0008-mysql-workbench-link-x11.patch             |   25 ++
 community-testing-x86_64/0009-mysql-workbench-gnome-keyring.patch        |   17 +
 community-testing-x86_64/PKGBUILD                                        |   88 ++++++++++
 community-testing-x86_64/mysql-workbench.install                         |   14 +
 14 files changed, 476 insertions(+)

Copied: mysql-workbench/repos/community-testing-i686/0001-mysql-workbench-no-check-for-updates.patch (from rev 129487, mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
===================================================================
--- community-testing-i686/0001-mysql-workbench-no-check-for-updates.patch	                        (rev 0)
+++ community-testing-i686/0001-mysql-workbench-no-check-for-updates.patch	2015-03-18 14:15:52 UTC (rev 129488)
@@ -0,0 +1,21 @@
+diff --git a/res/wbdata/main_menu.xml b/res/wbdata/main_menu.xml
+index a32256c..08d9a21 100644
+--- a/res/wbdata/main_menu.xml
++++ b/res/wbdata/main_menu.xml
+@@ -2900,6 +2900,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>
+@@ -2910,7 +2911,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>

Copied: mysql-workbench/repos/community-testing-i686/0006-mysql-workbench-column-label.patch (from rev 129487, mysql-workbench/trunk/0006-mysql-workbench-column-label.patch)
===================================================================
--- community-testing-i686/0006-mysql-workbench-column-label.patch	                        (rev 0)
+++ community-testing-i686/0006-mysql-workbench-column-label.patch	2015-03-18 14:15:52 UTC (rev 129488)
@@ -0,0 +1,44 @@
+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
+ }
+ 
+ 

Copied: mysql-workbench/repos/community-testing-i686/0007-mysql-workbench-no-set-gtid-purged.patch (from rev 129487, mysql-workbench/trunk/0007-mysql-workbench-no-set-gtid-purged.patch)
===================================================================
--- community-testing-i686/0007-mysql-workbench-no-set-gtid-purged.patch	                        (rev 0)
+++ community-testing-i686/0007-mysql-workbench-no-set-gtid-purged.patch	2015-03-18 14:15:52 UTC (rev 129488)
@@ -0,0 +1,29 @@
+diff --git a/plugins/wb.admin/frontend/wb_admin_export.py b/plugins/wb.admin/frontend/wb_admin_export.py
+index 40f5167..ebf6c3d 100644
+--- a/plugins/wb.admin/frontend/wb_admin_export.py
++++ b/plugins/wb.admin/frontend/wb_admin_export.py
+@@ -1858,8 +1858,6 @@ class WbAdminExportTab(WbAdminSchemaListTab):
+                 args.append("--ssl-cipher=%s" % conn["sslCipher"])
+ 
+         # Sets the compatibility parameters if needed
+-        if self._compatibility_params:
+-          args.append("--set-gtid-purged=OFF")
+         if conn.get("OPT_ENABLE_CLEARTEXT_PLUGIN", ""):
+             args.append("--enable-cleartext-plugin")
+ 
+diff --git a/plugins/wb.admin/frontend/wb_admin_export_options.py b/plugins/wb.admin/frontend/wb_admin_export_options.py
+index e9ec2e7..653f531 100644
+--- a/plugins/wb.admin/frontend/wb_admin_export_options.py
++++ b/plugins/wb.admin/frontend/wb_admin_export_options.py
+@@ -53,9 +53,9 @@ export_options = {
+     "order-by-primary":["Dump each table's rows sorted by its primary key, or by its first unique index.","FALSE"],
+     "dump-date":["Include dump date as \"Dump completed on\" comment if --comments is given.","TRUE"],
+     "$internal$show-internal-schemas":["Show internal MySQL schemas (mysql, information_schema, performance_schema) in the export schema list.","FALSE"],
+-    "tz-utc":["Add SET TIME_ZONE='+00:00' to the dump file.","TRUE"],
++    "tz-utc":["Add SET TIME_ZONE='+00:00' to the dump file.","TRUE"]
+ #    "xml":["Produce XML output.","FALSE"]
+-    "set-gtid-purged":["Add 'SET @@GLOBAL.GTID_PURGED' to the output.","AUTO","STR",("5.6.9", None)]
++#   "set-gtid-purged":["Add 'SET @@GLOBAL.GTID_PURGED' to the output.","AUTO","STR",("5.6.9", None)]
+     }
+ 
+     }

Copied: mysql-workbench/repos/community-testing-i686/0008-mysql-workbench-link-x11.patch (from rev 129487, mysql-workbench/trunk/0008-mysql-workbench-link-x11.patch)
===================================================================
--- community-testing-i686/0008-mysql-workbench-link-x11.patch	                        (rev 0)
+++ community-testing-i686/0008-mysql-workbench-link-x11.patch	2015-03-18 14:15:52 UTC (rev 129488)
@@ -0,0 +1,25 @@
+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}

Copied: mysql-workbench/repos/community-testing-i686/0009-mysql-workbench-gnome-keyring.patch (from rev 129487, mysql-workbench/trunk/0009-mysql-workbench-gnome-keyring.patch)
===================================================================
--- community-testing-i686/0009-mysql-workbench-gnome-keyring.patch	                        (rev 0)
+++ community-testing-i686/0009-mysql-workbench-gnome-keyring.patch	2015-03-18 14:15:52 UTC (rev 129488)
@@ -0,0 +1,17 @@
+diff --git a/frontend/linux/workbench/mysql-workbench.in b/frontend/linux/workbench/mysql-workbench.in
+index 02a8061..f8176f6 100755
+--- a/frontend/linux/workbench/mysql-workbench.in
++++ b/frontend/linux/workbench/mysql-workbench.in
+@@ -4,6 +4,12 @@
+ # This will cause passwords to be stored only temporarily for the session.
+ #WB_NO_GNOME_KEYRING=1
+ 
++# Looks like WB expects gnome-keyring to be present as soon as XDG_RUNTIME_DIR
++# environment variable is set. Do an extra check here...
++if ! type gnome-keyring-daemon >/dev/null; then
++	WB_NO_GNOME_KEYRING=1
++fi
++
+ # force disable the Mac style single menu hack in Ubuntu Unity
+ export UBUNTU_MENUPROXY=0
+ 

Copied: mysql-workbench/repos/community-testing-i686/PKGBUILD (from rev 129487, mysql-workbench/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD	                        (rev 0)
+++ community-testing-i686/PKGBUILD	2015-03-18 14:15:52 UTC (rev 129488)
@@ -0,0 +1,88 @@
+# $Id$
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Contributor: Alexandre Boily <alexandreboily at gmail.com>
+# Contributor: Illarion Kovalchuk <illarion.kovalchuk at gmail.com>
+# Contributor: totoloco <totoloco at gmail _dot_com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=mysql-workbench
+pkgver=6.2.5
+pkgrel=2
+pkgdesc='A cross-platform, visual database design tool developed by MySQL'
+arch=('i686' 'x86_64')
+url='https://www.mysql.com/products/workbench/'
+license=('GPL2')
+depends=('python2' 'libzip' 'libmariadbclient' 'lua51' 'gtkmm' 'ctemplate'
+	'libgnome-keyring' 'libgl' 'python2-paramiko' 'python2-pexpect' 'gdal'
+	'pcre' 'tinyxml' 'libxml2' 'mysql-python' 'cairo'
+	'python2-cairo' 'hicolor-icon-theme' 'desktop-file-utils' 'libiodbc'
+	'mysql-connector-c++' 'vsqlite++' 'unixodbc' 'freetype2'
+	'libantlr3c')
+optdepends=('gnome-keyring: store SSH/MySQL passwords in GNOME password manager'
+	'python2-pyodbc: database migration')
+makedepends=('cmake' 'boost' 'curl' 'mesa' 'swig2' 'java-runtime')
+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'
+	'arch_linux_profile.xml')
+sha256sums=('40a5dbf72b55441ea3e9466dce2de47611777c88da2b65b748f10b06dfa0794e'
+            'SKIP'
+            '9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7'
+            'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf'
+            '701c7d9f68b1b0f63e8e8ece0b61cb57c2168f29e10b113c409f7ccfd68251e0'
+            'b49d4ea352d2c2013b9c5834668c44521a0a2c5f9c7e3fe746ad94ce0d2bb865'
+	    'bfa0752f08d4641eb475c87373593061a0fe1c872c0d0cc1ed45ea43cf23fa05'
+	    'aa98205e14ab617b3632a1efa8ef1f6b4032eb9240b57523e4c1e5aa11d6c6f0'
+            '28724c4b4cec29ce19aada08279df1b086381cd788fef7ae07c1860f7d17af7e')
+
+prepare() {
+	cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
+
+	# Disable 'Help' -> 'Check for Updates'
+	# 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 GDAL
+	sed -i '/#include/s|gdal/||' backend/wbpublic/grtui/geom_draw_box.h backend/wbpublic/grt/spatial_handler.h
+
+	# put antlr into place
+	install -D ${srcdir}/antlr-3.4-complete.jar ${srcdir}/linux-res/bin/antlr-3.4-complete.jar
+}
+
+build() {
+	cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
+
+	cmake . \
+		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
+		-DSWIG_EXECUTABLE=/usr/bin/swig-2
+
+	make
+}
+
+package() {
+	cd "${srcdir}/mysql-workbench-community-${pkgver}-src"
+
+	make DESTDIR="${pkgdir}" install
+
+	install -D -m 0644 "${srcdir}"/arch_linux_profile.xml \
+		"${pkgdir}"/usr/share/mysql-workbench/mysql.profiles/Arch_Linux_\(MariaDB_5.5_Package\).xml
+}
+

Copied: mysql-workbench/repos/community-testing-i686/arch_linux_profile.xml (from rev 129487, mysql-workbench/trunk/arch_linux_profile.xml)
===================================================================
(Binary files differ)

Copied: mysql-workbench/repos/community-testing-i686/mysql-workbench.install (from rev 129487, mysql-workbench/trunk/mysql-workbench.install)
===================================================================
--- community-testing-i686/mysql-workbench.install	                        (rev 0)
+++ community-testing-i686/mysql-workbench.install	2015-03-18 14:15:52 UTC (rev 129488)
@@ -0,0 +1,14 @@
+post_install() {
+	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+	update-desktop-database -q
+	update-mime-database usr/share/mime
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
+

Copied: mysql-workbench/repos/community-testing-x86_64/0001-mysql-workbench-no-check-for-updates.patch (from rev 129487, mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
===================================================================
--- community-testing-x86_64/0001-mysql-workbench-no-check-for-updates.patch	                        (rev 0)
+++ community-testing-x86_64/0001-mysql-workbench-no-check-for-updates.patch	2015-03-18 14:15:52 UTC (rev 129488)
@@ -0,0 +1,21 @@
+diff --git a/res/wbdata/main_menu.xml b/res/wbdata/main_menu.xml
+index a32256c..08d9a21 100644
+--- a/res/wbdata/main_menu.xml
++++ b/res/wbdata/main_menu.xml
+@@ -2900,6 +2900,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>
+@@ -2910,7 +2911,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>

Copied: mysql-workbench/repos/community-testing-x86_64/0006-mysql-workbench-column-label.patch (from rev 129487, mysql-workbench/trunk/0006-mysql-workbench-column-label.patch)
===================================================================
--- community-testing-x86_64/0006-mysql-workbench-column-label.patch	                        (rev 0)
+++ community-testing-x86_64/0006-mysql-workbench-column-label.patch	2015-03-18 14:15:52 UTC (rev 129488)
@@ -0,0 +1,44 @@
+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
+ }
+ 
+ 

Copied: mysql-workbench/repos/community-testing-x86_64/0007-mysql-workbench-no-set-gtid-purged.patch (from rev 129487, mysql-workbench/trunk/0007-mysql-workbench-no-set-gtid-purged.patch)
===================================================================
--- community-testing-x86_64/0007-mysql-workbench-no-set-gtid-purged.patch	                        (rev 0)
+++ community-testing-x86_64/0007-mysql-workbench-no-set-gtid-purged.patch	2015-03-18 14:15:52 UTC (rev 129488)
@@ -0,0 +1,29 @@
+diff --git a/plugins/wb.admin/frontend/wb_admin_export.py b/plugins/wb.admin/frontend/wb_admin_export.py
+index 40f5167..ebf6c3d 100644
+--- a/plugins/wb.admin/frontend/wb_admin_export.py
++++ b/plugins/wb.admin/frontend/wb_admin_export.py
+@@ -1858,8 +1858,6 @@ class WbAdminExportTab(WbAdminSchemaListTab):
+                 args.append("--ssl-cipher=%s" % conn["sslCipher"])
+ 
+         # Sets the compatibility parameters if needed
+-        if self._compatibility_params:
+-          args.append("--set-gtid-purged=OFF")
+         if conn.get("OPT_ENABLE_CLEARTEXT_PLUGIN", ""):
+             args.append("--enable-cleartext-plugin")
+ 
+diff --git a/plugins/wb.admin/frontend/wb_admin_export_options.py b/plugins/wb.admin/frontend/wb_admin_export_options.py
+index e9ec2e7..653f531 100644
+--- a/plugins/wb.admin/frontend/wb_admin_export_options.py
++++ b/plugins/wb.admin/frontend/wb_admin_export_options.py
+@@ -53,9 +53,9 @@ export_options = {
+     "order-by-primary":["Dump each table's rows sorted by its primary key, or by its first unique index.","FALSE"],
+     "dump-date":["Include dump date as \"Dump completed on\" comment if --comments is given.","TRUE"],
+     "$internal$show-internal-schemas":["Show internal MySQL schemas (mysql, information_schema, performance_schema) in the export schema list.","FALSE"],
+-    "tz-utc":["Add SET TIME_ZONE='+00:00' to the dump file.","TRUE"],
++    "tz-utc":["Add SET TIME_ZONE='+00:00' to the dump file.","TRUE"]
+ #    "xml":["Produce XML output.","FALSE"]
+-    "set-gtid-purged":["Add 'SET @@GLOBAL.GTID_PURGED' to the output.","AUTO","STR",("5.6.9", None)]
++#   "set-gtid-purged":["Add 'SET @@GLOBAL.GTID_PURGED' to the output.","AUTO","STR",("5.6.9", None)]
+     }
+ 
+     }

Copied: mysql-workbench/repos/community-testing-x86_64/0008-mysql-workbench-link-x11.patch (from rev 129487, mysql-workbench/trunk/0008-mysql-workbench-link-x11.patch)
===================================================================
--- community-testing-x86_64/0008-mysql-workbench-link-x11.patch	                        (rev 0)
+++ community-testing-x86_64/0008-mysql-workbench-link-x11.patch	2015-03-18 14:15:52 UTC (rev 129488)
@@ -0,0 +1,25 @@
+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}

Copied: mysql-workbench/repos/community-testing-x86_64/0009-mysql-workbench-gnome-keyring.patch (from rev 129487, mysql-workbench/trunk/0009-mysql-workbench-gnome-keyring.patch)
===================================================================
--- community-testing-x86_64/0009-mysql-workbench-gnome-keyring.patch	                        (rev 0)
+++ community-testing-x86_64/0009-mysql-workbench-gnome-keyring.patch	2015-03-18 14:15:52 UTC (rev 129488)
@@ -0,0 +1,17 @@
+diff --git a/frontend/linux/workbench/mysql-workbench.in b/frontend/linux/workbench/mysql-workbench.in
+index 02a8061..f8176f6 100755
+--- a/frontend/linux/workbench/mysql-workbench.in
++++ b/frontend/linux/workbench/mysql-workbench.in
+@@ -4,6 +4,12 @@
+ # This will cause passwords to be stored only temporarily for the session.
+ #WB_NO_GNOME_KEYRING=1
+ 
++# Looks like WB expects gnome-keyring to be present as soon as XDG_RUNTIME_DIR
++# environment variable is set. Do an extra check here...
++if ! type gnome-keyring-daemon >/dev/null; then
++	WB_NO_GNOME_KEYRING=1
++fi
++
+ # force disable the Mac style single menu hack in Ubuntu Unity
+ export UBUNTU_MENUPROXY=0
+ 

Copied: mysql-workbench/repos/community-testing-x86_64/PKGBUILD (from rev 129487, mysql-workbench/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2015-03-18 14:15:52 UTC (rev 129488)
@@ -0,0 +1,88 @@
+# $Id$
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Contributor: Alexandre Boily <alexandreboily at gmail.com>
+# Contributor: Illarion Kovalchuk <illarion.kovalchuk at gmail.com>
+# Contributor: totoloco <totoloco at gmail _dot_com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=mysql-workbench
+pkgver=6.2.5
+pkgrel=2
+pkgdesc='A cross-platform, visual database design tool developed by MySQL'
+arch=('i686' 'x86_64')
+url='https://www.mysql.com/products/workbench/'
+license=('GPL2')
+depends=('python2' 'libzip' 'libmariadbclient' 'lua51' 'gtkmm' 'ctemplate'
+	'libgnome-keyring' 'libgl' 'python2-paramiko' 'python2-pexpect' 'gdal'
+	'pcre' 'tinyxml' 'libxml2' 'mysql-python' 'cairo'
+	'python2-cairo' 'hicolor-icon-theme' 'desktop-file-utils' 'libiodbc'
+	'mysql-connector-c++' 'vsqlite++' 'unixodbc' 'freetype2'
+	'libantlr3c')
+optdepends=('gnome-keyring: store SSH/MySQL passwords in GNOME password manager'
+	'python2-pyodbc: database migration')
+makedepends=('cmake' 'boost' 'curl' 'mesa' 'swig2' 'java-runtime')
+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'
+	'arch_linux_profile.xml')
+sha256sums=('40a5dbf72b55441ea3e9466dce2de47611777c88da2b65b748f10b06dfa0794e'
+            'SKIP'
+            '9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7'
+            'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf'
+            '701c7d9f68b1b0f63e8e8ece0b61cb57c2168f29e10b113c409f7ccfd68251e0'
+            'b49d4ea352d2c2013b9c5834668c44521a0a2c5f9c7e3fe746ad94ce0d2bb865'
+	    'bfa0752f08d4641eb475c87373593061a0fe1c872c0d0cc1ed45ea43cf23fa05'
+	    'aa98205e14ab617b3632a1efa8ef1f6b4032eb9240b57523e4c1e5aa11d6c6f0'
+            '28724c4b4cec29ce19aada08279df1b086381cd788fef7ae07c1860f7d17af7e')
+
+prepare() {
+	cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
+
+	# Disable 'Help' -> 'Check for Updates'
+	# 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 GDAL
+	sed -i '/#include/s|gdal/||' backend/wbpublic/grtui/geom_draw_box.h backend/wbpublic/grt/spatial_handler.h
+
+	# put antlr into place
+	install -D ${srcdir}/antlr-3.4-complete.jar ${srcdir}/linux-res/bin/antlr-3.4-complete.jar
+}
+
+build() {
+	cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
+
+	cmake . \
+		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
+		-DSWIG_EXECUTABLE=/usr/bin/swig-2
+
+	make
+}
+
+package() {
+	cd "${srcdir}/mysql-workbench-community-${pkgver}-src"
+
+	make DESTDIR="${pkgdir}" install
+
+	install -D -m 0644 "${srcdir}"/arch_linux_profile.xml \
+		"${pkgdir}"/usr/share/mysql-workbench/mysql.profiles/Arch_Linux_\(MariaDB_5.5_Package\).xml
+}
+

Copied: mysql-workbench/repos/community-testing-x86_64/arch_linux_profile.xml (from rev 129487, mysql-workbench/trunk/arch_linux_profile.xml)
===================================================================
(Binary files differ)

Copied: mysql-workbench/repos/community-testing-x86_64/mysql-workbench.install (from rev 129487, mysql-workbench/trunk/mysql-workbench.install)
===================================================================
--- community-testing-x86_64/mysql-workbench.install	                        (rev 0)
+++ community-testing-x86_64/mysql-workbench.install	2015-03-18 14:15:52 UTC (rev 129488)
@@ -0,0 +1,14 @@
+post_install() {
+	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+	update-desktop-database -q
+	update-mime-database usr/share/mime
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
+

More information about the arch-commits mailing list