summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Hesse2016-01-22 11:39:30 +0100
committerChristian Hesse2016-01-22 11:39:30 +0100
commitb1ff30fe421e29946efce91ac0deb6e44d01f82e (patch)
treefbfab3bb0fb72a8f45c3a939492936f73f9fb973
parentdd303b964234f332f140ddae1cfe2e0f66dee6bd (diff)
downloadaur-b1ff30fe421e29946efce91ac0deb6e44d01f82e.tar.gz
commit mysql-workbench-git 6.3.6.r0.gd46b227-2
-rw-r--r--.SRCINFO10
-rw-r--r--0002-mysql-connector-c++-json.patch41
-rw-r--r--PKGBUILD16
3 files changed, 7 insertions, 60 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3e3fe4e9e5b..e3b4ec47733 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed Jan 13 08:42:09 UTC 2016
+# Fri Jan 22 10:38:51 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 = 1
+ pkgrel = 2
url = https://www.mysql.com/products/workbench/
install = mysql-workbench.install
arch = i686
@@ -44,23 +44,19 @@ pkgbase = mysql-workbench-git
conflicts = mysql-workbench
source = git://github.com/mysql/mysql-workbench.git
source = git://github.com/mysql/mysql-server.git
- source = http://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-1.1.6.tar.gz
- source = http://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-1.1.6.tar.gz.asc
+ source = git://github.com/mysql/mysql-connector-cpp.git
source = http://download.osgeo.org/gdal/2.0.1/gdal-2.0.1.tar.gz
source = https://downloads.sourceforge.net/project/boost/boost/1.59.0/boost_1_59_0.tar.bz2
source = http://www.antlr3.org/download/antlr-3.4-complete.jar
source = 0001-mysql-workbench-no-check-for-updates.patch
- source = 0002-mysql-connector-c++-json.patch
source = arch_linux_profile.xml
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = ad710b3900cae3be94656825aa70319cf7a96e1ad46bf93e07275f3606f69447
sha256sums = SKIP
sha256sums = b55f794768e104a2fd0304eaa61bb8bda3dc7c4e14f2c9d0913baca3e55b83ab
sha256sums = 727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca
sha256sums = 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7
sha256sums = b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf
- sha256sums = 4beb8b6c92f6b2b2189bfdd2f1a073ad54d501f05ef4686e47c661b40f63b9d3
sha256sums = 2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af
pkgname = mysql-workbench-git
diff --git a/0002-mysql-connector-c++-json.patch b/0002-mysql-connector-c++-json.patch
deleted file mode 100644
index 9a0225dab82..00000000000
--- a/0002-mysql-connector-c++-json.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/cppconn/datatype.h b/cppconn/datatype.h
-index 7ada3bc..50c71cf 100644
---- a/cppconn/datatype.h
-+++ b/cppconn/datatype.h
-@@ -59,7 +59,8 @@ public:
- GEOMETRY,
- ENUM,
- SET,
-- SQLNULL
-+ SQLNULL,
-+ JSON
- };
- };
-
-diff --git a/driver/mysql_metadata.cpp b/driver/mysql_metadata.cpp
-index 8d3ef8b..2faf454 100644
---- a/driver/mysql_metadata.cpp
-+++ b/driver/mysql_metadata.cpp
-@@ -4736,6 +4736,9 @@ MySQL_ConnectionMetaData::supportsConvert(int fromType, int toType)
- }
- }
-
-+ case sql::DataType::JSON:
-+ return false;
-+
- // MySQL doesn't support a NULL type
- case sql::DataType::SQLNULL:
- return false;
-diff --git a/driver/mysql_util.cpp b/driver/mysql_util.cpp
-index af5a7f4..3283eca 100644
---- a/driver/mysql_util.cpp
-+++ b/driver/mysql_util.cpp
-@@ -431,6 +431,8 @@ mysql_type_to_datatype(const MYSQL_FIELD * const field)
- return sql::DataType::SET;
- case MYSQL_TYPE_GEOMETRY:
- return sql::DataType::GEOMETRY;
-+ case MYSQL_TYPE_JSON:
-+ return sql::DataType::JSON;
- default:
- return sql::DataType::UNKNOWN;
- }
diff --git a/PKGBUILD b/PKGBUILD
index 2552375e7fa..20aceeef7b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,9 +6,8 @@
pkgname=mysql-workbench-git
pkgver=6.3.6.r0.gd46b227
-pkgrel=1
-# mysql from git
-_connector_version=1.1.6
+pkgrel=2
+# mysql & mysql-connector-c++ from git
_gdal_version=2.0.1
_boost_version=1.59.0
pkgdesc='A cross-platform, visual database design tool developed by MySQL - git checkout'
@@ -30,22 +29,19 @@ install=mysql-workbench.install
validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5')
source=('git://github.com/mysql/mysql-workbench.git'
'git://github.com/mysql/mysql-server.git'
- "http://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${_connector_version}.tar.gz"{,.asc}
+ 'git://github.com/mysql/mysql-connector-cpp.git'
"http://download.osgeo.org/gdal/${_gdal_version}/gdal-${_gdal_version}.tar.gz"
"https://downloads.sourceforge.net/project/boost/boost/${_boost_version}/boost_${_boost_version//./_}.tar.bz2"
'http://www.antlr3.org/download/antlr-3.4-complete.jar'
'0001-mysql-workbench-no-check-for-updates.patch'
- '0002-mysql-connector-c++-json.patch'
'arch_linux_profile.xml')
sha256sums=('SKIP'
'SKIP'
- 'ad710b3900cae3be94656825aa70319cf7a96e1ad46bf93e07275f3606f69447'
'SKIP'
'b55f794768e104a2fd0304eaa61bb8bda3dc7c4e14f2c9d0913baca3e55b83ab'
'727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca'
'9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7'
'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf'
- '4beb8b6c92f6b2b2189bfdd2f1a073ad54d501f05ef4686e47c661b40f63b9d3'
'2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af')
pkgver() {
@@ -74,10 +70,6 @@ prepare() {
sed -i '/^FIND_PROGRAM(PYTHON_EXEC /c FIND_PROGRAM(PYTHON_EXEC "python2")' \
CMakeLists.txt
- # MySQL connector C++ is lagging behind and misses JSON support
- cd "${srcdir}/mysql-connector-c++-${_connector_version}/"
- patch -Np1 < "${srcdir}"/0002-mysql-connector-c++-json.patch
-
# put antlr into place
install -D ${srcdir}/antlr-3.4-complete.jar ${srcdir}/linux-res/bin/antlr-3.4-complete.jar
}
@@ -96,7 +88,7 @@ build() {
make DESTDIR="${srcdir}/install-bundle/" install
# Build mysql-connector-c++
- cd "${srcdir}/mysql-connector-c++-${_connector_version}/"
+ cd "${srcdir}/mysql-connector-cpp/"
cmake . \
-Wno-dev \
-DCMAKE_INSTALL_PREFIX=/usr \