Update to 2.2.3

4 files changed, 196 insertions, 86 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9d0efe6013bf..21c79775c6e7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,30 @@
-# Generated by makepkg 4.2.0
-# Thu Feb  5 18:25:29 UTC 2015
+# Generated by mksrcinfo v8
+# Tue May 31 07:53:04 UTC 2016
 pkgbase = mingw-w64-mariadb-connector-c
-	pkgdesc = MariaDB Connector/C. A library for connecting to MariaDB and MySQL servers (mingw-w64)
-	pkgver = 2.1.0
+	pkgdesc = MariaDB Connector/C is used to connect applications developed in C/C++ to MariaDB and MySQL databases (mingw-w64)
+	pkgver = 2.2.3
 	pkgrel = 1
-	url = https://mariadb.com/kb/en/mariadb/about-mariadb-connector-c/
+	url = https://mariadb.com/kb/en/mariadb/about-mariadb-connector-c
 	arch = any
 	license = LGPL
 	makedepends = mingw-w64-cmake
 	depends = mingw-w64-crt
 	depends = mingw-w64-openssl
 	depends = mingw-w64-zlib
-	provides = mingw-w64-libmariadbclient=2.1.0
+	provides = mingw-w64-libmariadbclient=2.2.3
 	conflicts = mingw-w64-libmariadbclient
 	replaces = mingw-w64-libmariadbclient
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://downloads.mariadb.org/interstitial/connector-c-2.1.0/source-tgz/mariadb-connector-c-2.1.0-src.tar.gz
+	source = https://downloads.mariadb.org/interstitial/connector-c-2.2.3/mariadb-connector-c-2.2.3-src.tar.gz
 	source = fix-libnames-mingw.patch
 	source = use_fopen_for_xp_compatibility.patch
 	source = fix-size-t-defined.patch
-	source = fix-qt5-uint-error.patch
-	md5sums = c026525ad2cec882b00070ba92fa0bc1
-	md5sums = 0cb013e5ec2a79be46832f462504dd88
-	md5sums = f1624e949933b2a774c116d46192a4ec
-	md5sums = 0a202d91993cbedcc03f10fdfe2720a0
-	md5sums = e493a22d3e0f6de2bdedb7974c631101
+	sha1sums = 89031eeb4cf56affea30a3d66ff2c6c29462da3d
+	sha1sums = b0e496dc054e2a328dab17cf4de7bd169789f9d7
+	sha1sums = dcf3d766ae6faf99aa93d1444e3b200c4f80c4f1
+	sha1sums = 4d1b01a0f800b15ad6e44e387f2f8d8c147cdea3
 
 pkgname = mingw-w64-mariadb-connector-c
 
diff --git a/PKGBUILD b/PKGBUILD
index 0dfa048039eb..162f0dbd3e83 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,39 @@
-# Maintainer: ant32 <antreimer@gmail.com>
+# Maintainer: Martchus <martchus@gmx.net>
+# Contributor: ant32 <antreimer@gmail.com>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
 pkgname=mingw-w64-mariadb-connector-c
-pkgver=2.1.0
+pkgver=2.2.3
 pkgrel=1
-pkgdesc="MariaDB Connector/C. A library for connecting to MariaDB and MySQL servers (mingw-w64)"
-arch=(any)
-url="https://mariadb.com/kb/en/mariadb/about-mariadb-connector-c/"
-license=("LGPL")
+pkgdesc="MariaDB Connector/C is used to connect applications developed in C/C++ to MariaDB and MySQL databases (mingw-w64)"
+arch=('any')
+url="https://mariadb.com/kb/en/mariadb/about-mariadb-connector-c"
+license=('LGPL')
 replaces=('mingw-w64-libmariadbclient')
 conflicts=('mingw-w64-libmariadbclient')
 provides=("mingw-w64-libmariadbclient=$pkgver")
 depends=('mingw-w64-crt' 'mingw-w64-openssl' 'mingw-w64-zlib')
 makedepends=('mingw-w64-cmake')
 options=('!strip' '!buildflags' 'staticlibs')
-source=("https://downloads.mariadb.org/interstitial/connector-c-${pkgver}/source-tgz/mariadb-connector-c-${pkgver}-src.tar.gz"
+source=("https://downloads.mariadb.org/interstitial/connector-c-${pkgver}/mariadb-connector-c-${pkgver}-src.tar.gz"
         'fix-libnames-mingw.patch'
         'use_fopen_for_xp_compatibility.patch'
-        'fix-size-t-defined.patch'
-        'fix-qt5-uint-error.patch')
-md5sums=('c026525ad2cec882b00070ba92fa0bc1'
-         '0cb013e5ec2a79be46832f462504dd88'
-         'f1624e949933b2a774c116d46192a4ec'
-         '0a202d91993cbedcc03f10fdfe2720a0'
-         'e493a22d3e0f6de2bdedb7974c631101')
+        'fix-size-t-defined.patch')
+sha1sums=('89031eeb4cf56affea30a3d66ff2c6c29462da3d'
+          'b0e496dc054e2a328dab17cf4de7bd169789f9d7'
+          'dcf3d766ae6faf99aa93d1444e3b200c4f80c4f1'
+          '4d1b01a0f800b15ad6e44e387f2f8d8c147cdea3')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
   cd "$srcdir/mariadb-connector-c-$pkgver-src/"
-  patch -p0 -i ../fix-libnames-mingw.patch
-  patch -p0 -i ../use_fopen_for_xp_compatibility.patch
-  patch -p0 -i ../fix-size-t-defined.patch
-  patch -p0 -i ../fix-qt5-uint-error.patch
+  patch -p0 -i "$srcdir/fix-libnames-mingw.patch"
+  patch -p0 -i "$srcdir/use_fopen_for_xp_compatibility.patch"
+  patch -p0 -i "$srcdir/fix-size-t-defined.patch"
+  #patch -p0 -i "$srcdir/fix-qt5-uint-error.patch"
 }
 
 build() {
@@ -56,10 +59,16 @@ package() {
     cd "${srcdir}/mariadb-connector-c-$pkgver-src/build-${_arch}"
     make DESTDIR="${pkgdir}" install
     ln -s mariadb "$pkgdir"/usr/${_arch}/include/mysql
-    # for some reason they don't create a link for libmysql.
+    # Creation of symlinks in CMake project file doesn't work for some reason.
     # Probably a couple more symlinks that should be created.
     ln -s libmariadb.dll.a "$pkgdir"/usr/${_arch}/lib/libmysql.dll.a
+    ln -s libmariadbclient.a "$pkgdir"/usr/${_arch}/lib/libmysqlclient.a
+    ln -s libmariadb.dll "$pkgdir"/usr/${_arch}/bin/libmysql.dll
+    ln -s libmariadb.dll "$pkgdir"/usr/${_arch}/bin/libmysqlclient.dll
+    ln -s libmariadb.dll "$pkgdir"/usr/${_arch}/bin/libmysqlclient_r.dll
     ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
+    ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/lib/plugin/*.dll
     ${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a
+    ${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/plugin/*.a
   done
-}
\ No newline at end of file
+}
diff --git a/fix-libnames-mingw.patch b/fix-libnames-mingw.patch
index b904d28dc4f1..e42beb1cb0a1 100644
--- a/fix-libnames-mingw.patch
+++ b/fix-libnames-mingw.patch
@@ -1,51 +1,172 @@
---- libmariadb/CMakeLists.txt.orig	2015-02-05 09:57:29.549448173 -0700
-+++ libmariadb/CMakeLists.txt	2015-02-05 10:01:01.498040468 -0700
-@@ -372,8 +372,8 @@
- ADD_LIBRARY(mariadbclient STATIC $<TARGET_OBJECTS:mariadb_obj> ${EXPORT_LINK})
+--- ./libmariadb/CMakeLists.txt.orig	2016-04-12 12:34:11.000000000 +0200
++++ ./libmariadb/CMakeLists.txt	2016-05-31 01:51:37.812346400 +0200
+@@ -1,7 +1,7 @@
+-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
++INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
+                     ${ZLIB_INC}
+                     ${CMAKE_SOURCE_DIR}/libmariadb)
+-					
++
+ ADD_DEFINITIONS(-D ENABLED_LOCAL_INFILE)
+ ADD_DEFINITIONS(-D HAVE_COMPRESS)
+ ADD_DEFINITIONS(-D LIBMARIADB)
+@@ -239,15 +239,15 @@
+ 
+ FILE(WRITE ${EXPORT_FILE} ${EXPORT_CONTENT})
+ 
+-SET(LIBMARIADB_SOURCES 
+-array.c 
++SET(LIBMARIADB_SOURCES
++array.c
+ ma_dyncol.c
+-bchange.c 
+-bmove.c 
+-bmove_upp.c 
++bchange.c
++bmove.c
++bmove_upp.c
+ my_charset.c
+ hash.c
+-violite.c 
++violite.c
+ net.c
+ charset.c
+ ma_time.c
+@@ -257,27 +257,27 @@
+ my_vsnprintf.c
+ errors.c
+ getopt1.c
+-getopt.c 
++getopt.c
+ int2str.c
+ is_prefix.c
+ libmariadb.c
+ list.c
+ llstr.c
+-longlong2str.c 
+-mf_dirname.c 
+-mf_fn_ext.c 
++longlong2str.c
++mf_dirname.c
++mf_fn_ext.c
+ mf_format.c
+-mf_loadpath.c 
+-mf_pack.c 
++mf_loadpath.c
++mf_pack.c
+ mf_path.c
+ mf_unixpath.c
+ mf_wcomp.c
+-mulalloc.c 
++mulalloc.c
+ my_alloc.c
+ my_compress.c
+ my_context.c
+ my_div.c
+-my_error.c 
++my_error.c
+ my_fopen.c
+ my_fstream.c
+ my_getwd.c
+@@ -288,7 +288,7 @@
+ my_net.c
+ my_once.c
+ my_open.c
+-my_port.c 
++my_port.c
+ my_pthread.c
+ my_read.c
+ my_realloc.c
+@@ -298,10 +298,10 @@
+ my_thr_init.c
+ my_write.c
+ mysql_async.c
+-password.c 
++password.c
+ str2int.c
+ strcend.c
+-strcont.c 
++strcont.c
+ strend.c
+ strfill.c
+ string.c
+@@ -310,7 +310,7 @@
+ strmov.c
+ strnmov.c
+ strtoll.c
+-strtoull.c 
++strtoull.c
+ strxmov.c
+ strxnmov.c
+ thr_mutex.c
+@@ -335,7 +335,7 @@
+   LINK_LIBRARIES(${ZLIB_LIBRARY})
+ ELSE()
+   SET(ZLIB_SOURCES
+-    ../zlib/adler32.c 
++    ../zlib/adler32.c
+     ../zlib/compress.c
+     ../zlib/crc32.c
+     ../zlib/deflate.c
+@@ -368,7 +368,7 @@
+                    "FILE_DESCRIPTION:Static lib for client/server communication")
+ ENDIF()
+ 
+-# CREATE OBJECT LIBRARY 
++# CREATE OBJECT LIBRARY
+ ADD_LIBRARY(mariadb_obj OBJECT ${LIBMARIADB_SOURCES})
+ IF(UNIX)
+   SET_TARGET_PROPERTIES(mariadb_obj PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
+@@ -384,23 +384,24 @@
+ ADD_LIBRARY(mariadbclient STATIC ${mariadbclient_RC} $<TARGET_OBJECTS:mariadb_obj> ${EMPTY_FILE} ${EXPORT_LINK})
  TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS})
  
--ADD_LIBRARY(libmariadb SHARED $<TARGET_OBJECTS:mariadb_obj> ${EXPORT_LINK})
+-ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} $<TARGET_OBJECTS:mariadb_obj> ${EMPTY_FILE} ${EXPORT_LINK})
 -TARGET_LINK_LIBRARIES(libmariadb ${SYSTEM_LIBS})
-+ADD_LIBRARY(mariadb SHARED ${LIBMARIADB_SOURCES})
++ADD_LIBRARY(mariadb SHARED ${libmariadb_RC} $<TARGET_OBJECTS:mariadb_obj> ${EMPTY_FILE} ${EXPORT_LINK})
 +TARGET_LINK_LIBRARIES(mariadb ${SYSTEM_LIBS})
  IF(UNIX)
-   SET_TARGET_PROPERTIES(libmariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
+-  SET_TARGET_PROPERTIES(libmariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
++  SET_TARGET_PROPERTIES(mariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
  ENDIF()
-@@ -385,11 +385,12 @@
+-SIGN_TARGET(libmariadb)
++SIGN_TARGET(mariadb)
+ 
+ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+-  TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined")
+-  TARGET_LINK_LIBRARIES (libmariadb "-Wl,--version-script=${EXPORT_FILE}")
++  TARGET_LINK_LIBRARIES (mariadb "-Wl,--no-undefined")
++  TARGET_LINK_LIBRARIES (mariadb "-Wl,--version-script=${EXPORT_FILE}")
+   TARGET_LINK_LIBRARIES (mariadbclient "-Wl,--no-undefined")
    TARGET_LINK_LIBRARIES (mariadbclient "-Wl,--version-script=${EXPORT_FILE}")
  ENDIF()
  
 -SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "")
-+SET_TARGET_PROPERTIES(mariadb PROPERTIES PREFIX "")
++# for consistency with previous version
++#SET_TARGET_PROPERTIES(mariadb PROPERTIES PREFIX "")
  
 -SET_TARGET_PROPERTIES(libmariadb PROPERTIES VERSION 
-+SET_TARGET_PROPERTIES(mariadb PROPERTIES VERSION 
++SET_TARGET_PROPERTIES(mariadb PROPERTIES VERSION
     ${CPACK_PACKAGE_VERSION_MAJOR}
--   SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
-+   SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}
-+   RUNTIME_OUTPUT_NAME libmariadb)
+    SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
  
- #
- # Installation
-@@ -398,7 +399,7 @@
+@@ -413,24 +414,24 @@
  # There are still several projects which don't make use
  # of the config program. To make sure these programs can
  # use mariadb client library we provide libmysql symlinks
 -IF(NOT WIN32 AND WITH_MYSQLCOMPAT)
+-  SET(INSTALL_PATH ${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR})
+-  create_symlink(libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_PATH})
+-  create_symlink(libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_PATH})
+-  create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_PATH})
+-  create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_PATH})
 +IF(WITH_MYSQLCOMPAT)
-   ADD_CUSTOM_COMMAND(OUTPUT "libmysql${CMAKE_SHARED_LIBRARY_SUFFIX}"
-                             "libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX}"
-                             "libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX}"
-@@ -412,7 +413,7 @@
-                      COMMAND ${CMAKE_COMMAND} ARGS -E remove -f libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX}
-                      COMMAND ${CMAKE_COMMAND} ARGS -E create_symlink libmariadbclient${CMAKE_STATIC_LIBRARY_SUFFIX} libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX}
-                     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libmariadb
--                    DEPENDS libmariadb mariadbclient)
-+                    DEPENDS mariadb mariadbclient)
- 
- ADD_CUSTOM_TARGET(LIBMYSQL_SYMLINKS
-                   ALL
-@@ -425,17 +426,18 @@
++  SET(INSTALL_PATH ${LIB_INSTALL_DIR})
++  create_symlink(libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX} mariadb ${BIN_INSTALL_DIR})
++  create_symlink(libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX} mariadb ${BIN_INSTALL_DIR})
++  create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${LIB_INSTALL_DIR})
++  create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${LIB_INSTALL_DIR})
+ ENDIF()
  
  
  INSTALL(TARGETS
@@ -53,22 +174,15 @@
 -          RUNTIME DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}"
 -          LIBRARY DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}"
 -          ARCHIVE DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}")
--
--IF(NOT WIN32 AND WITH_MYSQLCOMPAT)
 +          mariadb mariadbclient
 +          RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
 +          LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
 +          ARCHIVE DESTINATION "${LIB_INSTALL_DIR}")
-+
-+IF(WITH_MYSQLCOMPAT)
-+  INSTALL(FILES "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX}"
-+                DESTINATION ${LIB_INSTALL_DIR})
-   INSTALL(FILES "${CMAKE_BINARY_DIR}/libmariadb/libmysql${CMAKE_SHARED_LIBRARY_SUFFIX}"
-                 "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX}"
-                 "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX}"
--                "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX}"
--                DESTINATION ${LIB_INSTALL_DIR}/mariadb)
-+                DESTINATION ${BIN_INSTALL_DIR})
- ENDIF()
  
  INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/
+         DESTINATION ${INCLUDE_INSTALL_DIR}/${SUFFIX_INSTALL_DIR})
+-INSTALL(FILES 
++INSTALL(FILES
+    ${CMAKE_BINARY_DIR}/include/my_config.h
+    ${CMAKE_BINARY_DIR}/include/mysql_version.h
+    DESTINATION ${INCLUDE_INSTALL_DIR}/${SUFFIX_INSTALL_DIR})
diff --git a/fix-qt5-uint-error.patch b/fix-qt5-uint-error.patch
deleted file mode 100644
index fba9344d9d43..000000000000
--- a/fix-qt5-uint-error.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/mysql.h.orig	2015-02-03 12:34:33.527518619 -0700
-+++ include/mysql.h	2015-02-03 12:34:41.327637274 -0700
-@@ -80,7 +80,7 @@
- 
- extern unsigned int mysql_port;
- extern char *mysql_unix_port;
--extern uint mariadb_deinitialize_ssl;
-+extern unsigned int mariadb_deinitialize_ssl;
- 
- #define IS_PRI_KEY(n)	((n) & PRI_KEY_FLAG)
- #define IS_NOT_NULL(n)	((n) & NOT_NULL_FLAG)