Fix issue with ConnectorName.cmake

3 files changed, 23 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2b6d7cd6a380..e5afee14ae33 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mariadb-connector-odbc
 	pkgdesc = A standardized, LGPL licensed ODBC database driver for MariaDB
 	pkgver = 3.1.11
-	pkgrel = 2
+	pkgrel = 3
 	url = https://mariadb.com/kb/en/mariadb/mariadb-connector-odbc/
 	install = mariadb-connector-odbc.install
 	arch = x86_64
@@ -15,8 +15,10 @@ pkgbase = mariadb-connector-odbc
 	conflicts = mariadb-connector-odbc-bin
 	source = https://downloads.mariadb.org/interstitial/connector-odbc-3.1.11/mariadb-connector-odbc-3.1.11-ga-src.tar.gz
 	source = https://downloads.mariadb.org/interstitial/connector-c-3.1.11/mariadb-connector-c-3.1.11-src.tar.gz
+	source = ConnectorName.patch
 	sha256sums = d81a35cd9c9d2e1e732b7bd9ee704eb83775ed74bcc38d6cd5d367a3fc525a34
 	sha256sums = 3e6f6c399493fe90efdc21a3fe70c30434b7480e8195642a959f1dd7a0fa5b0f
+	sha256sums = cec4b170608fb6b7d29315d49f82c031cee8b05778eb3fc13f735ff0c4d1de6c
 
 pkgname = mariadb-connector-odbc
 
diff --git a/ConnectorName.patch b/ConnectorName.patch
new file mode 100644
index 000000000000..de8ef269a219
--- /dev/null
+++ b/ConnectorName.patch
@@ -0,0 +1,12 @@
+diff -ru mariadb-connector-c-3.1.11-src/cmake/ConnectorName.cmake b/cmake/ConnectorName.cmake
+--- a/cmake/ConnectorName.cmake	2020-10-30 06:09:04.000000000 -0400
++++ b/cmake/ConnectorName.cmake	2021-04-06 17:00:35.943468489 -0400
+@@ -22,7 +22,7 @@
+     SET(MACHINE_NAME "x64")
+   ELSE()
+     SET(MACHINE_NAME "32")
+-  END()
++  ENDIF()
+ ENDIF()
+ 
+ SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
diff --git a/PKGBUILD b/PKGBUILD
index 942783b24bd4..8c51456b8e11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=mariadb-connector-odbc
 conflicts=('mariadb-connector-odbc-bin')
 pkgver=3.1.11
 _c_pkgver=3.1.11
-pkgrel=2
+pkgrel=3
 pkgdesc="A standardized, LGPL licensed ODBC database driver for MariaDB"
 arch=('x86_64' 'armv7h')
 url="https://mariadb.com/kb/en/mariadb/mariadb-connector-odbc/"
@@ -12,13 +12,18 @@ license=('LGPL')
 depends=('unixodbc>=2.3' 'openssl' 'zlib')
 makedepends=('git' 'cmake')
 source=("https://downloads.mariadb.org/interstitial/connector-odbc-${pkgver}/${pkgname}-${pkgver}-ga-src.tar.gz"
-        "https://downloads.mariadb.org/interstitial/connector-c-${_c_pkgver}/mariadb-connector-c-${_c_pkgver}-src.tar.gz")
+        "https://downloads.mariadb.org/interstitial/connector-c-${_c_pkgver}/mariadb-connector-c-${_c_pkgver}-src.tar.gz"
+	"ConnectorName.patch")
 sha256sums=('d81a35cd9c9d2e1e732b7bd9ee704eb83775ed74bcc38d6cd5d367a3fc525a34'
-            '3e6f6c399493fe90efdc21a3fe70c30434b7480e8195642a959f1dd7a0fa5b0f')
+            '3e6f6c399493fe90efdc21a3fe70c30434b7480e8195642a959f1dd7a0fa5b0f'
+            'cec4b170608fb6b7d29315d49f82c031cee8b05778eb3fc13f735ff0c4d1de6c')
 
 install=mariadb-connector-odbc.install
 
 prepare() {
+    cd mariadb-connector-c-${_c_pkgver}-src
+    patch -p1 < ../ConnectorName.patch
+    cd ..
     cd $pkgname-$pkgver-ga-src
     [ -d libmariadb ] || ln -s ../mariadb-connector-c-${_c_pkgver}-src libmariadb
     cd ..