Date: Friday, January 16, 2015 @ 22:39:01 Author: eworm Revision: 126016
Initial import of mysql-connector-c++ 1.1.15-3 This is a dependency for mysql-workbench. Added: mysql-connector-c++/ mysql-connector-c++/repos/ mysql-connector-c++/trunk/ mysql-connector-c++/trunk/PKGBUILD mysql-connector-c++/trunk/mariadb_api.patch mysql-connector-c++/trunk/mysql_cxx_linkage.patch -------------------------+ PKGBUILD | 50 ++++++++++++++++++++++++++++++++++++++++++++++ mariadb_api.patch | 13 +++++++++++ mysql_cxx_linkage.patch | 13 +++++++++++ 3 files changed, 76 insertions(+) Added: mysql-connector-c++/trunk/PKGBUILD =================================================================== --- mysql-connector-c++/trunk/PKGBUILD (rev 0) +++ mysql-connector-c++/trunk/PKGBUILD 2015-01-16 21:39:01 UTC (rev 126016) @@ -0,0 +1,50 @@ +# Maintainer: Christian Hesse <[email protected]> +# Contributor: Marcel Korpel <marcel[dot]korpel[at]gmail> +# Contributor: Muflone http://www.muflone.com/contacts/english/ +# Contributor: Ilya Kuznetsov <[email protected]> +# Contributor: Christian Hesse <[email protected]> + +pkgname=mysql-connector-c++ +pkgver=1.1.5 +pkgrel=3 +pkgdesc='A MySQL database connector for C++' +arch=('i686' 'x86_64') +url='http://dev.mysql.com/doc/connector-cpp/en/' +license=('GPL') +depends=('libmysqlclient' 'boost-libs') +makedepends=('cmake' 'boost') +validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5') +source=("http://cdn.mysql.com/Downloads/Connector-C++/${pkgname}-${pkgver}.tar.gz"{,.asc} + 'mysql_cxx_linkage.patch' + 'mariadb_api.patch') +sha256sums=('f3696726da29d56e0daad7046b30aa51444360a3ff112c079eb942929eb1cce8' + 'SKIP' + '65d3375f2c5a066d92a400a8eea90bf6001eafc57ec7aac56610f8829b42bb8c' + '1694ead0b9c9cb7803a76f56e3871b4f64f045a07fa390cf18bc15be798035ee') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}/" + + patch -Np1 < "${srcdir}/mysql_cxx_linkage.patch" + patch -Np1 < "${srcdir}/mariadb_api.patch" +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}/" + + cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DMYSQLCPPCONN_BUILD_EXAMPLES=OFF \ + -DMYSQL_LIB=/usr/lib/libmysqlclient.so + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/" + + make DESTDIR="${pkgdir}" install + + rm "${pkgdir}"/usr/{ANNOUNCEMENT,COPYING,README,INSTALL,Licenses_for_Third-Party_Components.txt} +} Property changes on: mysql-connector-c++/trunk/PKGBUILD ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: mysql-connector-c++/trunk/mariadb_api.patch =================================================================== --- mysql-connector-c++/trunk/mariadb_api.patch (rev 0) +++ mysql-connector-c++/trunk/mariadb_api.patch 2015-01-16 21:39:01 UTC (rev 126016) @@ -0,0 +1,13 @@ +diff --git a/driver/nativeapi/libmysql_static_proxy.cpp b/driver/nativeapi/libmysql_static_proxy.cpp +index 703c0f3..1569e55 100644 +--- a/driver/nativeapi/libmysql_static_proxy.cpp ++++ b/driver/nativeapi/libmysql_static_proxy.cpp +@@ -319,7 +319,7 @@ LibmysqlStaticProxy::options(MYSQL * mysql, enum mysql_option option, const void + int + LibmysqlStaticProxy::get_option(MYSQL * mysql, enum mysql_option option, const void *arg) + { +-#if MYSQL_VERSION_ID >= 50703 ++#if not defined MARIADB_BASE_VERSION && MYSQL_VERSION_ID >= 50703 + if (::mysql_get_option(mysql, option, arg)) { + throw sql::InvalidArgumentException("Unsupported option provided to mysql_get_option()"); + } else { Added: mysql-connector-c++/trunk/mysql_cxx_linkage.patch =================================================================== --- mysql-connector-c++/trunk/mysql_cxx_linkage.patch (rev 0) +++ mysql-connector-c++/trunk/mysql_cxx_linkage.patch 2015-01-16 21:39:01 UTC (rev 126016) @@ -0,0 +1,13 @@ +diff --git a/FindMySQL.cmake b/FindMySQL.cmake +index c73337a..d76fdbd 100644 +--- a/FindMySQL.cmake ++++ b/FindMySQL.cmake +@@ -462,7 +462,7 @@ if(NOT WIN32) + endif() + + if(NOT MYSQL_CXXFLAGS) +- if(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) ++ if(MYSQL_CXX_LINKAGE) + _mysql_conf(MYSQL_CXXFLAGS "--cxxflags") + set(MYSQL_CXX_LINKAGE 1) + else()
