commit mysql-connector-c++ 1.1.6-4

3 files changed, 83 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..ac07365e747f
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,22 @@
+# Generated by mksrcinfo v8
+# Wed Jan 20 11:53:52 UTC 2016
+pkgbase = mysql-connector-c++
+	pkgdesc = A MySQL database connector for C++
+	pkgver = 1.1.6
+	pkgrel = 4
+	url = http://dev.mysql.com/doc/connector-cpp/en/
+	arch = i686
+	arch = x86_64
+	license = GPL
+	makedepends = cmake
+	makedepends = boost
+	depends = libmariadbclient
+	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 = 0001-mysql-connector-c++-mariadb-api.patch
+	sha256sums = ad710b3900cae3be94656825aa70319cf7a96e1ad46bf93e07275f3606f69447
+	sha256sums = SKIP
+	sha256sums = 1694ead0b9c9cb7803a76f56e3871b4f64f045a07fa390cf18bc15be798035ee
+
+pkgname = mysql-connector-c++
+
diff --git a/0001-mysql-connector-c++-mariadb-api.patch b/0001-mysql-connector-c++-mariadb-api.patch
new file mode 100644
index 000000000000..c7c8a5913e96
--- /dev/null
+++ b/0001-mysql-connector-c++-mariadb-api.patch
@@ -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 {
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..a44da45225cb
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,48 @@
+# Maintainer: Christian Hesse <mail@eworm.de>
+# Contributor: Marcel Korpel <marcel[dot]korpel[at]gmail>
+# Contributor: Muflone http://www.muflone.com/contacts/english/
+# Contributor: Ilya Kuznetsov <monochrome.r42@gmail.com>
+# Contributor: Christian Hesse <mail@eworm.de>
+
+pkgname=mysql-connector-c++
+pkgver=1.1.6
+pkgrel=4
+pkgdesc='A MySQL database connector for C++'
+arch=('i686' 'x86_64')
+url='http://dev.mysql.com/doc/connector-cpp/en/'
+license=('GPL')
+depends=('libmariadbclient')
+makedepends=('cmake' 'boost')
+validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5')
+source=("http://cdn.mysql.com/Downloads/Connector-C++/${pkgname}-${pkgver}.tar.gz"{,.asc}
+	'0001-mysql-connector-c++-mariadb-api.patch')
+sha256sums=('ad710b3900cae3be94656825aa70319cf7a96e1ad46bf93e07275f3606f69447'
+            'SKIP'
+            '1694ead0b9c9cb7803a76f56e3871b4f64f045a07fa390cf18bc15be798035ee')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}/"
+
+	patch -Np1 < "${srcdir}/0001-mysql-connector-c++-mariadb-api.patch"
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}/"
+
+	cmake . -Wno-dev \
+		-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,lib/libmysqlcppconn-static.a}
+}
+