diff --git a/community/mysql-workbench/0001-do-not-pass-type-to-std-make_pair.patch b/community/mysql-workbench/0001-do-not-pass-type-to-std-make_pair.patch new file mode 100644 index 000000000..2acbcbd61 --- /dev/null +++ b/community/mysql-workbench/0001-do-not-pass-type-to-std-make_pair.patch @@ -0,0 +1,30 @@ +From 34ec0d65ede8392ba3e0f114d72672b3f517f964 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <mail@eworm.de> +Date: Tue, 10 May 2016 01:09:34 +0200 +Subject: [PATCH 1/1] do not pass type to std::make_pair() + +We not pass type template arguments to std::make_pair() +explicitly, and let the compiler deduce them on its own. +This fixes compiler error on GCC 6.1.1. + +Signed-off-by: Christian Hesse <mail@eworm.de> +--- + client/auth_utils.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/client/auth_utils.cc b/client/auth_utils.cc +index 21416bb..03fd71c 100644 +--- a/client/auth_utils.cc ++++ b/client/auth_utils.cc +@@ -61,7 +61,7 @@ int parse_cnf_file(istream &sin, map<string, string > *options, + getline(sin, option_value); + trim(&option_value); + if (option_name.length() > 0) +- options->insert(make_pair<string, string >(option_name, option_value)); ++ options->insert(make_pair(option_name, option_value)); + } + return ALL_OK; + } catch(...) +-- +2.8.2 + diff --git a/community/mysql-workbench/PKGBUILD b/community/mysql-workbench/PKGBUILD index 52382b611..601add863 100644 --- a/community/mysql-workbench/PKGBUILD +++ b/community/mysql-workbench/PKGBUILD @@ -11,9 +11,9 @@ pkgname=mysql-workbench pkgver=6.3.7 pkgrel=1 -_mysql_version=5.7.12 +_mysql_version=5.7.13 _connector_version=1.1.7 -_gdal_version=2.0.2 +_gdal_version=2.1.0 _boost_version=1.59.0 pkgdesc='A cross-platform, visual database design tool developed by MySQL' arch=('i686' 'x86_64') @@ -30,22 +30,28 @@ validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5') source=("http://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${pkgver}-src.tar.gz"{,.asc} "http://cdn.mysql.com/Downloads/MySQL-5.7/mysql-${_mysql_version}.tar.gz"{,.asc} "http://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${_connector_version}.tar.gz"{,.asc} - "http://download.osgeo.org/gdal/${_gdal_version}/gdal-${_gdal_version}.tar.gz" + "http://download.osgeo.org/gdal/${_gdal_version}/gdal-${_gdal_version}.tar.xz" "https://downloads.sourceforge.net/project/boost/boost/${_boost_version}/boost_${_boost_version//./_}.tar.bz2" + '0001-do-not-pass-type-to-std-make_pair.patch' '0001-mysql-workbench-no-check-for-updates.patch' 'arch_linux_profile.xml') sha256sums=('84941f6dc33674a245d53a21bc14c5f0c192e370940147ddc7c236a61c0193ec' 'SKIP' - '32843cb6d22ab22cd2340262b53c0d6009b5bd41b1fa4102beda19635a5c1c87' + '50bf1a1635a61235fc43fd4876df2f77163de109372679e29c1ff8dbc38a0b87' 'SKIP' '5b353fbcd26f607a2a0987ce78a4b811f8971813d46b0f4ae6fa07887e9fc763' 'SKIP' - 'db7722caf8d9dd798ec18012b9cacf40a518918466126a88b9fd277bd7d40cc4' + '568b43441955b306364fcf97fb47d4c1512ac6f2f5f76b2ec39a890d2418ee03' '727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca' + '9088cdcf82c1a925806d9162702e19c94fa21d89d422370df3f5700e204f5b32' 'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf' '2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af') prepare() { + cd "${srcdir}/mysql-${_mysql_version}" + + patch -Np1 < "${srcdir}"/0001-do-not-pass-type-to-std-make_pair.patch + cd "${srcdir}/mysql-workbench-community-${pkgver}-src/" # Disable 'Help' -> 'Check for Updates' @@ -58,6 +64,10 @@ prepare() { } build() { + # this uses deprecated auto_ptr... + # we known that, so do not flood the logs + CXXFLAGS="${CXXFLAGS} -Wno-deprecated-declarations" + # Build mysql cd "${srcdir}/mysql-${_mysql_version}" cmake . \