[arch-commits] Commit in mysql-connector-c++/trunk (4 files)

[Christian Hesse]

    Date: Friday, December 11, 2015 @ 16:18:43
  Author: eworm
Revision: 153026

clean up patches

* drop linkage patch, no longer required with mariadb 10.1.x

Added:
  mysql-connector-c++/trunk/0001-mysql-connector-c++-mariadb-api.patch
    (from rev 153025, mysql-connector-c++/trunk/mariadb_api.patch)
Modified:
  mysql-connector-c++/trunk/PKGBUILD
Deleted:
  mysql-connector-c++/trunk/mariadb_api.patch
  mysql-connector-c++/trunk/mysql_cxx_linkage.patch

--------------------------------------------+
 0001-mysql-connector-c++-mariadb-api.patch |   13 +++++++++++++
 PKGBUILD                                   |    7 ++-----
 mariadb_api.patch                          |   13 -------------
 mysql_cxx_linkage.patch                    |   13 -------------
 4 files changed, 15 insertions(+), 31 deletions(-)

Copied: mysql-connector-c++/trunk/0001-mysql-connector-c++-mariadb-api.patch (from rev 153025, mysql-connector-c++/trunk/mariadb_api.patch)
===================================================================
--- 0001-mysql-connector-c++-mariadb-api.patch	                        (rev 0)
+++ 0001-mysql-connector-c++-mariadb-api.patch	2015-12-11 15:18:43 UTC (rev 153026)
@@ -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 {

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-11 15:08:03 UTC (rev 153025)
+++ PKGBUILD	2015-12-11 15:18:43 UTC (rev 153026)
@@ -16,18 +16,15 @@
 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')
+	'0001-mysql-connector-c++-mariadb-api.patch')
 sha256sums=('ad710b3900cae3be94656825aa70319cf7a96e1ad46bf93e07275f3606f69447'
             'SKIP'
-            '65d3375f2c5a066d92a400a8eea90bf6001eafc57ec7aac56610f8829b42bb8c'
             '1694ead0b9c9cb7803a76f56e3871b4f64f045a07fa390cf18bc15be798035ee')
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}/"
 
-	patch -Np1 < "${srcdir}/mysql_cxx_linkage.patch"
-	patch -Np1 < "${srcdir}/mariadb_api.patch"
+	patch -Np1 < "${srcdir}/0001-mysql-connector-c++-mariadb-api.patch"
 }
 
 build() {

Deleted: mariadb_api.patch
===================================================================
--- mariadb_api.patch	2015-12-11 15:08:03 UTC (rev 153025)
+++ mariadb_api.patch	2015-12-11 15:18:43 UTC (rev 153026)
@@ -1,13 +0,0 @@
-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 {

Deleted: mysql_cxx_linkage.patch
===================================================================
--- mysql_cxx_linkage.patch	2015-12-11 15:08:03 UTC (rev 153025)
+++ mysql_cxx_linkage.patch	2015-12-11 15:18:43 UTC (rev 153026)
@@ -1,13 +0,0 @@
-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()