From 2fa8690488a46236661e058ebceb0cde13755f23 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sat, 3 Apr 2021 18:28:05 +0000
Subject: Sat Apr  3 18:28:05 UTC 2021

ap/sqlite-3.35.4-x86_64-1.txz:  Upgraded.
d/python3-3.9.3-x86_64-1.txz:  Upgraded.
l/opencv-4.5.2-x86_64-1.txz:  Upgraded.
l/python-docutils-0.17-x86_64-1.txz:  Upgraded.
n/bluez-5.58-x86_64-1.txz:  Upgraded.
xfce/mousepad-0.5.4-x86_64-1.txz:  Upgraded.
---
 source/ap/mariadb/mariadb.ConnectorName.cmake.diff | 12 ++++++++++++
 source/ap/mariadb/mariadb.SlackBuild               |  3 +++
 2 files changed, 15 insertions(+)
 create mode 100644 source/ap/mariadb/mariadb.ConnectorName.cmake.diff

(limited to 'source/ap/mariadb')

diff --git a/source/ap/mariadb/mariadb.ConnectorName.cmake.diff b/source/ap/mariadb/mariadb.ConnectorName.cmake.diff
new file mode 100644
index 00000000..75da7d99
--- /dev/null
+++ b/source/ap/mariadb/mariadb.ConnectorName.cmake.diff
@@ -0,0 +1,12 @@
+diff -u -r --new-file mariadb-10.5.9.orig/libmariadb/cmake/ConnectorName.cmake mariadb-10.5.9/libmariadb/cmake/ConnectorName.cmake
+--- mariadb-10.5.9.orig/libmariadb/cmake/ConnectorName.cmake	2021-02-16 08:50:36.000000000 -0600
++++ mariadb-10.5.9/libmariadb/cmake/ConnectorName.cmake	2021-04-03 12:41:14.858993480 -0500
+@@ -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/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild
index 2291bb57..d9b02aac 100755
--- a/source/ap/mariadb/mariadb.SlackBuild
+++ b/source/ap/mariadb/mariadb.SlackBuild
@@ -97,6 +97,9 @@ if [ ! -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
   zcat $CWD/mysql.no.plugin_auth_pam.diff.gz | patch -p1 --verbose || exit 1
 fi
 
+# Fix a CMake syntax error:
+zcat $CWD/mariadb.ConnectorName.cmake.diff.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-- 
cgit v1.2.3