Export stdcall decorated symbols correctly in libmariadb.dll

3 files changed, 17 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 21c79775c6e7..d7df7a97603e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue May 31 07:53:04 UTC 2016
+# Tue May 31 21:04:55 UTC 2016
 pkgbase = mingw-w64-mariadb-connector-c
 	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
+	pkgrel = 2
 	url = https://mariadb.com/kb/en/mariadb/about-mariadb-connector-c
 	arch = any
 	license = LGPL
@@ -22,7 +22,7 @@ pkgbase = mingw-w64-mariadb-connector-c
 	source = use_fopen_for_xp_compatibility.patch
 	source = fix-size-t-defined.patch
 	sha1sums = 89031eeb4cf56affea30a3d66ff2c6c29462da3d
-	sha1sums = b0e496dc054e2a328dab17cf4de7bd169789f9d7
+	sha1sums = d80d94dfe46bf02cb3934ff493070f7b8cb455d9
 	sha1sums = dcf3d766ae6faf99aa93d1444e3b200c4f80c4f1
 	sha1sums = 4d1b01a0f800b15ad6e44e387f2f8d8c147cdea3
 
diff --git a/PKGBUILD b/PKGBUILD
index 162f0dbd3e83..0ef349011dea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=mingw-w64-mariadb-connector-c
 pkgver=2.2.3
-pkgrel=1
+pkgrel=2
 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"
@@ -22,7 +22,7 @@ source=("https://downloads.mariadb.org/interstitial/connector-c-${pkgver}/mariad
         'use_fopen_for_xp_compatibility.patch'
         'fix-size-t-defined.patch')
 sha1sums=('89031eeb4cf56affea30a3d66ff2c6c29462da3d'
-          'b0e496dc054e2a328dab17cf4de7bd169789f9d7'
+          'd80d94dfe46bf02cb3934ff493070f7b8cb455d9'
           'dcf3d766ae6faf99aa93d1444e3b200c4f80c4f1'
           '4d1b01a0f800b15ad6e44e387f2f8d8c147cdea3')
 
@@ -33,7 +33,6 @@ prepare() {
   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() {
diff --git a/fix-libnames-mingw.patch b/fix-libnames-mingw.patch
index e42beb1cb0a1..d51c3608759d 100644
--- a/fix-libnames-mingw.patch
+++ b/fix-libnames-mingw.patch
@@ -1,5 +1,5 @@
---- ./libmariadb/CMakeLists.txt.orig	2016-04-12 12:34:11.000000000 +0200
-+++ ./libmariadb/CMakeLists.txt	2016-05-31 01:51:37.812346400 +0200
+--- libmariadb/CMakeLists.txt.orig	2016-04-12 12:34:11.000000000 +0200
++++ libmariadb/CMakeLists.txt	2016-05-31 22:48:06.757700300 +0200
 @@ -1,7 +1,7 @@
 -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
 +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
@@ -108,6 +108,15 @@
      ../zlib/compress.c
      ../zlib/crc32.c
      ../zlib/deflate.c
+@@ -356,7 +356,7 @@
+ ENDIF()
+ 
+ IF(WIN32)
+-  SET_VERSION_INFO("TARGET:libmariadb"
++  SET_VERSION_INFO("TARGET:mariadb"
+                    "FILE_TYPE:VFT_DLL"
+                    "SOURCE_FILE:libmariadb/libmariadb.c"
+                    "ORIGINAL_FILE_NAME:libmariadb.dll"
 @@ -368,7 +368,7 @@
                     "FILE_DESCRIPTION:Static lib for client/server communication")
  ENDIF()
@@ -123,7 +132,7 @@
  
 -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_RC} $<TARGET_OBJECTS:mariadb_obj> ${EMPTY_FILE} ${EXPORT_LINK})
++ADD_LIBRARY(mariadb SHARED ${libmariadb_RC} ${LIBMARIADB_SOURCES} ${EMPTY_FILE})
 +TARGET_LINK_LIBRARIES(mariadb ${SYSTEM_LIBS})
  IF(UNIX)
 -  SET_TARGET_PROPERTIES(libmariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")