summaryrefslogtreecommitdiff
path: root/source/ap
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-05-03 19:58:20 +0000
committerEric Hameleers <alien@slackware.com>2021-05-03 23:59:55 +0200
commit4c189bc9bc307a9cd477afb9ff560c7138f8bdd0 (patch)
tree855f9187c0d6bca9dc967203b23c23adb7b3eba3 /source/ap
parentd29973a5051109bc0eab591df07eb128318d2c9c (diff)
downloadcurrent-4c189bc9bc307a9cd477afb9ff560c7138f8bdd0.tar.gz
Mon May 3 19:58:20 UTC 202120210503195820
a/kernel-firmware-20210503_3f23f51-noarch-1.txz: Upgraded. ap/mariadb-10.5.9-x86_64-1.txz: Upgraded. Reverted to the latest stable release. d/mercurial-5.8-x86_64-1.txz: Upgraded. kde/calligra-3.2.1-x86_64-8.txz: Rebuilt. Recompiled against poppler-21.05.0. kde/cantor-21.04.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.05.0. kde/kfilemetadata-5.81.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.05.0. kde/kile-2.9.93-x86_64-8.txz: Rebuilt. Recompiled against poppler-21.05.0. kde/kitinerary-21.04.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.05.0. kde/krita-4.4.3-x86_64-4.txz: Rebuilt. Recompiled against poppler-21.05.0. kde/okular-21.04.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.05.0. l/isl-0.24-x86_64-1.txz: Upgraded. l/poppler-21.05.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/python-pygments-2.9.0-x86_64-1.txz: Upgraded. n/ethtool-5.12-x86_64-1.txz: Upgraded. n/httpd-2.4.47-x86_64-2.txz: Rebuilt. Recompiled against the mariadb-10.5.9 shared libraries. n/postfix-3.6.0-x86_64-2.txz: Rebuilt. Recompiled against the mariadb-10.5.9 shared libraries. xap/gparted-1.3.0-x86_64-1.txz: Upgraded. testing/packages/mariadb-10.6.0-x86_64-1.txz: Upgraded. Since this is still considered alpha and not production ready, we'll put it in /testing for now. Unless you're using an Atom (or other 32-bit processor affected by the illegal instruction issue) it's probably best to stick with mariadb-10.5.9.
Diffstat (limited to 'source/ap')
-rw-r--r--source/ap/mariadb/mariadb.ConnectorName.cmake.diff12
-rwxr-xr-xsource/ap/mariadb/mariadb.SlackBuild5
2 files changed, 16 insertions, 1 deletions
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 63428060..b83511e9 100755
--- a/source/ap/mariadb/mariadb.SlackBuild
+++ b/source/ap/mariadb/mariadb.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2017, 2018, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2017, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
# Copyright 2011, 2012, 2013, 2014, 2017 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
@@ -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 \) \