Update to 3.2.6

author: Martchus 2022-04-02 21:01:31 +0200
committer: Martchus 2022-04-02 21:01:31 +0200
commit: 4c1a40ef5c94e93265cebfa0c565a5bfd95f813a (patch)
tree: 1f300d2969de4a3863205813e6695194250196e5
parent: fb66001babc0d4610604b754e8d5d2475e9f9f2b (diff)
download: aur-4c1a40ef5c94e93265cebfa0c565a5bfd95f813a.tar.gz
4 files changed, 61 insertions, 41 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5474a6e6d65b..74bf9ab44331 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 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 = 3.2.5
+	pkgver = 3.2.6
 	pkgrel = 1
 	url = https://mariadb.com/kb/en/mariadb/about-mariadb-connector-c
 	arch = any
@@ -10,17 +10,17 @@ pkgbase = mingw-w64-mariadb-connector-c
 	depends = mingw-w64-openssl
 	depends = mingw-w64-zlib
 	depends = mingw-w64-curl
-	provides = mingw-w64-libmariadbclient=3.2.5
+	provides = mingw-w64-libmariadbclient=3.2.6
 	conflicts = mingw-w64-libmariadbclient
 	replaces = mingw-w64-libmariadbclient
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://github.com/mariadb-corporation/mariadb-connector-c/archive/refs/tags/v3.2.5.tar.gz
+	source = https://github.com/mariadb-corporation/mariadb-connector-c/archive/refs/tags/v3.2.6.tar.gz
 	source = 0001-Fix-mingw-w64-build.patch
 	source = 0002-Enable-pkg-config-for-mingw-w64-build.patch
-	sha256sums = edf1e1035c020c23874561cab3f97fd1d8ed11221c47177a1bc178eb971fd351
-	sha256sums = d02c889df8abc14cb84a50732e3a407deb842d189bbe20380dcd89d4d9367a38
-	sha256sums = 52ff1b3588b03d7db03ff9fed22560f413f0cb8c1f4daec871c2946151f8f7b8
+	sha256sums = d9aee070e1d954074a70eff1cfd2d6c6bc5d190dc00075975a55d4f3e1ac20c5
+	sha256sums = 88912c97b33ab86835f10f37ce7a67e11d489dedfd65d0696aba85680d0d3805
+	sha256sums = c405499b0812a2792a2c6a419b2061c8e280bda74049dba9a018576ed1a332e6
 
 pkgname = mingw-w64-mariadb-connector-c
diff --git a/0001-Fix-mingw-w64-build.patch b/0001-Fix-mingw-w64-build.patch
index 4eff09153854..0e413142d64a 100644
--- a/0001-Fix-mingw-w64-build.patch
+++ b/0001-Fix-mingw-w64-build.patch
@@ -1,22 +1,22 @@
-From c0a03910971a066c3b8f92f5a169e5a82d09fbae Mon Sep 17 00:00:00 2001
+From aa6cb1ffc0a005e37d22b14faa3e31b642b33d7c Mon Sep 17 00:00:00 2001
 From: Tilmann Meyer <allescrafterx@gmail.com>
 Date: Fri, 17 Apr 2020 02:12:23 +0200
 Subject: [PATCH 1/2] Fix mingw-w64 build
 
 ---
- CMakeLists.txt                | 35 +++++++++++++++++-------------
+ CMakeLists.txt                | 35 +++++++++++++++++++---------------
  cmake/install.cmake           |  4 ++--
  cmake/symlink.cmake           |  2 +-
  include/ma_global.h           |  4 ++--
  include/mysql.h               |  6 +-----
  include/mysql/client_plugin.h |  2 +-
- libmariadb/CMakeLists.txt     | 40 ++++++++++++++++++-----------------
+ libmariadb/CMakeLists.txt     | 36 +++++++++++++++++------------------
  plugins/auth/CMakeLists.txt   |  2 +-
  plugins/io/CMakeLists.txt     |  2 +-
- 9 files changed, 50 insertions(+), 47 deletions(-)
+ 9 files changed, 46 insertions(+), 47 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b03b546..7c8a362 100644
+index d245b6e..93bf967 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -3,6 +3,9 @@
@@ -55,7 +55,7 @@ index b03b546..7c8a362 100644
  ###############
  
  INCLUDE(${CC_SOURCE_DIR}/cmake/misc.cmake)
-@@ -244,14 +243,20 @@ IF(UNIX)
+@@ -249,14 +248,20 @@ IF(UNIX)
    SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LIBNSL} ${LIBBIND} ${LIBICONV} ${LIBZ}
      ${LIBSOCKET} ${CMAKE_DL_LIBS} ${LIBM} ${LIBPTHREAD})
    SET(SYSTEM_LIBS ${SYSTEM_LIBS} ${LIBNSL} ${LIBBIND} ${LIBICONV} ${LIBZ}
@@ -176,7 +176,7 @@ index 72939d2..77e4538 100644
                    int argc, ...);
  
 diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
-index 2bf85f2..bd0b11a 100644
+index 4e46d98..b9a1618 100644
 --- a/libmariadb/CMakeLists.txt
 +++ b/libmariadb/CMakeLists.txt
 @@ -393,7 +393,7 @@ ENDIF()
@@ -239,31 +239,29 @@ index 2bf85f2..bd0b11a 100644
    IF(NOT CMAKE_SYSTEM_NAME MATCHES AIX)
      create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR})
      create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR})
-@@ -449,7 +447,7 @@ IF(WITH_MYSQLCOMPAT)
- ENDIF()
+@@ -450,7 +448,7 @@ ENDIF()
  
+ create_symlink(libmariadb${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR})
  
 -SET_TARGET_PROPERTIES(libmariadb PROPERTIES VERSION
 +SET_TARGET_PROPERTIES(mariadb PROPERTIES VERSION
   ${CPACK_PACKAGE_VERSION_MAJOR}
   SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
  
-@@ -459,15 +457,19 @@ ENDIF()
- 
- INSTALL(TARGETS mariadbclient
+@@ -462,17 +460,17 @@ INSTALL(TARGETS mariadbclient
            COMPONENT Development
--          DESTINATION ${INSTALL_LIBDIR})
--INSTALL(TARGETS libmariadb
-+          RUNTIME DESTINATION "${INSTALL_BINDIR}"
-+          LIBRARY DESTINATION "${INSTALL_LIBDIR}"
-+          ARCHIVE DESTINATION "${INSTALL_LIBDIR}")
-+INSTALL(TARGETS mariadb
-           COMPONENT SharedLibraries
--        DESTINATION ${INSTALL_LIBDIR})
-+          RUNTIME DESTINATION "${INSTALL_BINDIR}"
-+          LIBRARY DESTINATION "${INSTALL_LIBDIR}"
-+          ARCHIVE DESTINATION "${INSTALL_LIBDIR}")
- 
+           DESTINATION ${INSTALL_LIBDIR})
+ # in cmake 3.12+ we can use
+-#INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR}
++#INSTALL(TARGETS mariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR}
+ #        COMPONENT SharedLibraries NAMELINK_COMPONENT Development)
+ # but as long as we build on CentOS 7 with its cmake 2.8.12.2 we have to use
+-INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR}
++INSTALL(TARGETS mariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR}
+         COMPONENT SharedLibraries NAMELINK_SKIP)
+-INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR}
++INSTALL(TARGETS mariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR}
+         COMPONENT Development NAMELINK_ONLY)
  
  IF(MSVC)
     # On Windows, install PDB
@@ -298,5 +296,5 @@ index 8c304c9..e2e9c5a 100644
    ENDIF()
  ENDIF()
 -- 
-2.34.1
+2.35.1
 
diff --git a/0002-Enable-pkg-config-for-mingw-w64-build.patch b/0002-Enable-pkg-config-for-mingw-w64-build.patch
index 13fa33c109d2..4219449592d2 100644
--- a/0002-Enable-pkg-config-for-mingw-w64-build.patch
+++ b/0002-Enable-pkg-config-for-mingw-w64-build.patch
@@ -1,17 +1,18 @@
-From 091383f76b2b35181ce44902b5488cdc25c29d45 Mon Sep 17 00:00:00 2001
+From d9eb742e22a1a72b4b5c1b09f6a7b6b606c5613e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 12 Sep 2020 20:30:49 +0200
 Subject: [PATCH 2/2] Enable pkg-config for mingw-w64 build
 
 ---
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ CMakeLists.txt            |  2 +-
+ libmariadb/CMakeLists.txt | 10 ++--------
+ 2 files changed, 3 insertions(+), 9 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7c8a362..6c30c53 100644
+index 93bf967..247d361 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -417,7 +417,7 @@ ENDIF()
+@@ -422,7 +422,7 @@ ENDIF()
  INCLUDE(${CC_SOURCE_DIR}/plugins/CMakeLists.txt)
  ADD_SUBDIRECTORY(include)
  ADD_SUBDIRECTORY(libmariadb)
@@ -20,6 +21,27 @@ index 7c8a362..6c30c53 100644
    ADD_SUBDIRECTORY(mariadb_config)
  ENDIF()
  
+diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
+index b9a1618..5f8c657 100644
+--- a/libmariadb/CMakeLists.txt
++++ b/libmariadb/CMakeLists.txt
+@@ -459,14 +459,8 @@ ENDIF()
+ INSTALL(TARGETS mariadbclient
+           COMPONENT Development
+           DESTINATION ${INSTALL_LIBDIR})
+-# in cmake 3.12+ we can use
+-#INSTALL(TARGETS mariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR}
+-#        COMPONENT SharedLibraries NAMELINK_COMPONENT Development)
+-# but as long as we build on CentOS 7 with its cmake 2.8.12.2 we have to use
+-INSTALL(TARGETS mariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR}
+-        COMPONENT SharedLibraries NAMELINK_SKIP)
+-INSTALL(TARGETS mariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR}
+-        COMPONENT Development NAMELINK_ONLY)
++INSTALL(TARGETS mariadb RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR} LIBRARY DESTINATION ${INSTALL_LIBDIR}
++        COMPONENT SharedLibraries NAMELINK_COMPONENT Development)
+ 
+ IF(MSVC)
+    # On Windows, install PDB
 -- 
-2.34.1
+2.35.1
 
diff --git a/PKGBUILD b/PKGBUILD
index 5a660fa9d565..200c4cab76b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 # All patches are managed at https://github.com/Martchus/mariadb-connector-c
 
 pkgname=mingw-w64-mariadb-connector-c
-pkgver=3.2.5
+pkgver=3.2.6
 pkgrel=1
 pkgdesc='MariaDB Connector/C is used to connect applications developed in C/C++ to MariaDB and MySQL databases (mingw-w64)'
 arch=('any')
@@ -24,9 +24,9 @@ source=(
   '0001-Fix-mingw-w64-build.patch'
   '0002-Enable-pkg-config-for-mingw-w64-build.patch'
 )
-sha256sums=('edf1e1035c020c23874561cab3f97fd1d8ed11221c47177a1bc178eb971fd351'
-            'd02c889df8abc14cb84a50732e3a407deb842d189bbe20380dcd89d4d9367a38'
-            '52ff1b3588b03d7db03ff9fed22560f413f0cb8c1f4daec871c2946151f8f7b8')
+sha256sums=('d9aee070e1d954074a70eff1cfd2d6c6bc5d190dc00075975a55d4f3e1ac20c5'
+            '88912c97b33ab86835f10f37ce7a67e11d489dedfd65d0696aba85680d0d3805'
+            'c405499b0812a2792a2c6a419b2061c8e280bda74049dba9a018576ed1a332e6')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
author	Martchus	2022-04-02 21:01:31 +0200
committer	Martchus	2022-04-02 21:01:31 +0200
commit	4c1a40ef5c94e93265cebfa0c565a5bfd95f813a (patch)
tree	1f300d2969de4a3863205813e6695194250196e5
parent	fb66001babc0d4610604b754e8d5d2475e9f9f2b (diff)
download	aur-4c1a40ef5c94e93265cebfa0c565a5bfd95f813a.tar.gz