diff options
author | Christian Hesse | 2016-05-10 10:05:49 +0200 |
---|---|---|
committer | Christian Hesse | 2016-05-10 10:05:49 +0200 |
commit | 826a13ac59b5e1707969140ff44a727cda31c1cc (patch) | |
tree | ff4c9726aac39b809d9109a19bb813b226338a9c | |
parent | d933d65c5844f67fdccaae47765c54bd30815613 (diff) | |
download | aur-826a13ac59b5e1707969140ff44a727cda31c1cc.tar.gz |
commit mysql-workbench-git 6.3.6.r0.gd46b227-4
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | 0001-do-not-pass-type-to-std-make_pair.patch | 30 | ||||
-rw-r--r-- | PKGBUILD | 14 |
3 files changed, 46 insertions, 8 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu Apr 28 18:02:55 UTC 2016 +# Tue May 10 08:03:17 UTC 2016 pkgbase = mysql-workbench-git pkgdesc = A cross-platform, visual database design tool developed by MySQL - git checkout pkgver = 6.3.6.r0.gd46b227 - pkgrel = 4 + pkgrel = 5 url = https://www.mysql.com/products/workbench/ arch = i686 arch = x86_64 @@ -41,15 +41,17 @@ pkgbase = mysql-workbench-git source = git://github.com/mysql/mysql-workbench.git source = git://github.com/mysql/mysql-server.git source = git://github.com/mysql/mysql-connector-cpp.git - source = http://download.osgeo.org/gdal/2.0.2/gdal-2.0.2.tar.gz + source = http://download.osgeo.org/gdal/2.1.0/gdal-2.1.0.tar.xz source = https://downloads.sourceforge.net/project/boost/boost/1.59.0/boost_1_59_0.tar.bz2 + source = 0001-do-not-pass-type-to-std-make_pair.patch source = 0001-mysql-workbench-no-check-for-updates.patch source = arch_linux_profile.xml sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP - sha256sums = db7722caf8d9dd798ec18012b9cacf40a518918466126a88b9fd277bd7d40cc4 + sha256sums = 568b43441955b306364fcf97fb47d4c1512ac6f2f5f76b2ec39a890d2418ee03 sha256sums = 727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca + sha256sums = 9088cdcf82c1a925806d9162702e19c94fa21d89d422370df3f5700e204f5b32 sha256sums = b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf sha256sums = 2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af diff --git a/0001-do-not-pass-type-to-std-make_pair.patch b/0001-do-not-pass-type-to-std-make_pair.patch new file mode 100644 index 000000000000..2acbcbd616ea --- /dev/null +++ b/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 + @@ -6,9 +6,9 @@ pkgname=mysql-workbench-git pkgver=6.3.6.r0.gd46b227 -pkgrel=4 +pkgrel=5 # mysql & mysql-connector-c++ from git -_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 - git checkout' arch=('i686' 'x86_64') @@ -27,15 +27,17 @@ validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5') source=('git://github.com/mysql/mysql-workbench.git' 'git://github.com/mysql/mysql-server.git' 'git://github.com/mysql/mysql-connector-cpp.git' - "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=('SKIP' 'SKIP' 'SKIP' - 'db7722caf8d9dd798ec18012b9cacf40a518918466126a88b9fd277bd7d40cc4' + '568b43441955b306364fcf97fb47d4c1512ac6f2f5f76b2ec39a890d2418ee03' '727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca' + '9088cdcf82c1a925806d9162702e19c94fa21d89d422370df3f5700e204f5b32' 'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf' '2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af') @@ -55,6 +57,10 @@ pkgver() { } prepare() { + cd "${srcdir}/mysql-server/" + + patch -Np1 < "${srcdir}"/0001-do-not-pass-type-to-std-make_pair.patch + cd "${srcdir}/mysql-workbench/" # Disable 'Help' -> 'Check for Updates' |