libraries/mysql-connector-c++: Updated for version 1.1.7.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 99 insertions, 20 deletions

diff --git a/libraries/mysql-connector-c++/mysql-connector-c++-no-JSON.patch b/libraries/mysql-connector-c++/mysql-connector-c++-no-JSON.patch
new file mode 100644
index 0000000000..c2ce82d6f2
--- /dev/null
+++ b/libraries/mysql-connector-c++/mysql-connector-c++-no-JSON.patch
@@ -0,0 +1,93 @@
+diff --git a/cppconn/datatype.h b/cppconn/datatype.h
+index 593ec02..63de3ec 100644
+--- a/cppconn/datatype.h
++++ b/cppconn/datatype.h
+@@ -59,8 +59,7 @@ public:
+     GEOMETRY,
+     ENUM,
+     SET,
+-    SQLNULL,
+-    JSON
++    SQLNULL
+   };
+ };
+ 
+diff --git a/driver/mysql_ps_resultset.cpp b/driver/mysql_ps_resultset.cpp
+index 572beda..6f4cbca 100644
+--- a/driver/mysql_ps_resultset.cpp
++++ b/driver/mysql_ps_resultset.cpp
+@@ -446,7 +446,6 @@ MySQL_Prepared_ResultSet::getDouble(const uint32_t columnIndex) const
+         case sql::DataType::LONGVARBINARY:
+         case sql::DataType::SET:
+         case sql::DataType::ENUM:
+-        case sql::DataType::JSON:
+         {
+             CPP_INFO("It's a string");
+             long double ret = sql::mysql::util::strtold(getString(columnIndex).c_str(), NULL);
+@@ -615,7 +614,6 @@ MySQL_Prepared_ResultSet::getInt64_intern(const uint32_t columnIndex, bool /* cu
+         case sql::DataType::LONGVARBINARY:
+         case sql::DataType::SET:
+         case sql::DataType::ENUM:
+-        case sql::DataType::JSON:
+             CPP_INFO("It's a string");
+             return strtoll(getString(columnIndex).c_str(), NULL, 10);
+         case sql::DataType::BIT:
+@@ -763,7 +761,6 @@ MySQL_Prepared_ResultSet::getUInt64_intern(const uint32_t columnIndex, bool /* c
+         case sql::DataType::LONGVARBINARY:
+         case sql::DataType::SET:
+         case sql::DataType::ENUM:
+-        case sql::DataType::JSON:
+             CPP_INFO("It's a string");
+             return strtoull(getString(columnIndex).c_str(), NULL, 10);
+         case sql::DataType::BIT:
+@@ -1038,7 +1035,6 @@ MySQL_Prepared_ResultSet::getString(const uint32_t columnIndex) const
+         case sql::DataType::LONGVARBINARY:
+         case sql::DataType::SET:
+         case sql::DataType::ENUM:
+-        case sql::DataType::JSON:
+             CPP_INFO("It's a string");
+             return  sql::SQLString(static_cast<char *>(result_bind->rbind[columnIndex - 1].buffer), *result_bind->rbind[columnIndex - 1].length);
+         default:
+diff --git a/driver/mysql_resultbind.cpp b/driver/mysql_resultbind.cpp
+index 003b44b..e597ac6 100644
+--- a/driver/mysql_resultbind.cpp
++++ b/driver/mysql_resultbind.cpp
+@@ -86,7 +86,6 @@ static struct st_buffer_size_type
+     case MYSQL_TYPE_BLOB:
+     case MYSQL_TYPE_STRING:
+     case MYSQL_TYPE_VAR_STRING:
+-    case MYSQL_TYPE_JSON:
+       return st_buffer_size_type(new char[field->max_length + 1], field->max_length + 1, field->type);
+ 
+     case MYSQL_TYPE_DECIMAL:
+diff --git a/driver/mysql_util.cpp b/driver/mysql_util.cpp
+index e4aaa6c..81af5c4 100644
+--- a/driver/mysql_util.cpp
++++ b/driver/mysql_util.cpp
+@@ -431,8 +431,6 @@ 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;
+   }
+@@ -498,8 +496,6 @@ mysql_string_type_to_datatype(const sql::SQLString & name)
+     return sql::DataType::SET;
+   } else if (!name.compare("geometry")) {
+     return sql::DataType::GEOMETRY;
+-  } else if (!name.compare("json")) {
+-    return sql::DataType::JSON;
+   } else {
+     return sql::DataType::UNKNOWN;
+   }
+@@ -645,8 +641,6 @@ mysql_type_to_string(const MYSQL_FIELD * const field, boost::shared_ptr< sql::my
+       return "SET";
+     case MYSQL_TYPE_GEOMETRY:
+       return "GEOMETRY";
+-    case MYSQL_TYPE_JSON:
+-      return "JSON";
+     default:
+       return "UNKNOWN";
+   }
diff --git a/libraries/mysql-connector-c++/mysql-connector-c++.SlackBuild b/libraries/mysql-connector-c++/mysql-connector-c++.SlackBuild
index 67adc3454a..91386c7b08 100644
--- a/libraries/mysql-connector-c++/mysql-connector-c++.SlackBuild
+++ b/libraries/mysql-connector-c++/mysql-connector-c++.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mysql-connector-c++
-VERSION=${VERSION:-1.1.6}
+VERSION=${VERSION:-1.1.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,9 +70,8 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Compatibility patch for MariaDB
-patch -Np1 < $CWD/mysql_cxx_linkage.patch
-patch -Np1 < $CWD/mariadb_api.patch
-
+patch -p1 < $CWD/mariadb_api.patch
+patch -p1 < $CWD/mysql-connector-c++-no-JSON.patch
 mkdir -p build
 cd build
   cmake \
diff --git a/libraries/mysql-connector-c++/mysql-connector-c++.info b/libraries/mysql-connector-c++/mysql-connector-c++.info
index 06f56c3dbe..92cc1969be 100644
--- a/libraries/mysql-connector-c++/mysql-connector-c++.info
+++ b/libraries/mysql-connector-c++/mysql-connector-c++.info
@@ -1,8 +1,8 @@
 PRGNAM="mysql-connector-c++"
-VERSION="1.1.6"
+VERSION="1.1.7"
 HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
-DOWNLOAD="https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-1.1.6.tar.gz"
-MD5SUM="9e49dcfc1408b18b3d3ca02781ff7efb"
+DOWNLOAD="https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-1.1.7.tar.gz"
+MD5SUM="4b0425811bca23c0323b97e787b7709e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/mysql-connector-c++/mysql_cxx_linkage.patch b/libraries/mysql-connector-c++/mysql_cxx_linkage.patch
deleted file mode 100644
index 5f8fab2462..0000000000
--- a/libraries/mysql-connector-c++/mysql_cxx_linkage.patch
+++ /dev/null
@@ -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()