[PR PATCH] mariadb: update to 11.1.2.

[PR PATCH] mariadb: update to 11.1.2.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 1228 bytes --]

There is a new pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages mariadb-11.3.0
https://github.com/void-linux/void-packages/pull/46762

mariadb: update to 11.1.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/46762.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-11.3.0-46762.patch --]
[-- Type: text/x-diff, Size: 5269 bytes --]

From 13fa1e43f2e95d4560d6fd96134ef7e46a32f0bc Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Wed, 18 Oct 2023 18:27:19 +0100
Subject: [PATCH] mariadb: update to 11.1.2.

---
 .../mariadb/files/musl-have-stacktrace.patch  | 19 --------
 .../files/musl-ppc-remove-glibc-dep.patch     | 47 -------------------
 srcpkgs/mariadb/template                      | 23 ++++-----
 3 files changed, 10 insertions(+), 79 deletions(-)
 delete mode 100644 srcpkgs/mariadb/files/musl-have-stacktrace.patch
 delete mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch

diff --git a/srcpkgs/mariadb/files/musl-have-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
deleted file mode 100644
index 4d87f57ddc9e9..0000000000000
--- a/srcpkgs/mariadb/files/musl-have-stacktrace.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://jira.mariadb.org/browse/MDEV-24131
-
---- ./unittest/mysys/stacktrace-t.c
-+++ ./unittest/mysys/stacktrace-t.c
-@@ -22,6 +22,14 @@
-
- char b_bss[10];
-
-+#ifndef HAVE_STACKTRACE
-+int  my_safe_print_str(const char* val, size_t max_len)
-+{
-+  printf("%*s\n", (int) max_len, val);
-+  return 0;
-+}
-+#endif
-+
- void test_my_safe_print_str()
- {
-   char b_stack[10];
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
deleted file mode 100644
index 1346edebfb960..0000000000000
--- a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./include/my_cpu.h
-+++ ./include/my_cpu.h
-@@ -24,17 +24,16 @@
- */
- 
- #ifdef _ARCH_PWR8
--#include <sys/platform/ppc.h>
- /* Very low priority */
--#define HMT_very_low() __ppc_set_ppr_very_low()
-+#define HMT_very_low() asm volatile("or 31,31,31")
- /* Low priority */
--#define HMT_low() __ppc_set_ppr_low()
-+#define HMT_low() asm volatile ("or 1,1,1")
- /* Medium low priority */
--#define HMT_medium_low() __ppc_set_ppr_med_low()
-+#define HMT_medium_low() asm volatile ("or 6,6,6")
- /* Medium priority */
--#define HMT_medium() __ppc_set_ppr_med()
-+#define HMT_medium() asm volatile ("or 2,2,2")
- /* Medium high priority */
--#define HMT_medium_high() __ppc_set_ppr_med_high()
-+#define HMT_medium_high() asm volatile("or 5,5,5")
- /* High priority */
- #define HMT_high() asm volatile("or 3,3,3")
- #else
-@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
-   __asm__ __volatile__ ("pause");
- #endif
- #elif defined(_ARCH_PWR8)
--  __ppc_get_timebase();
-+  __builtin_ppc_get_timebase();
- #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
-   /* Mainly, prevent the compiler from optimizing away delay loops */
-   __asm__ __volatile__ ("":::"memory");
-diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
-index c4c45b8e..2f7a07f5 100644
---- ./storage/tokudb/PerconaFT/portability/toku_time.h
-+++ ./storage/tokudb/PerconaFT/portability/toku_time.h
-@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
-     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
-     return result;
- #elif defined(__powerpc__)
--    return __ppc_get_timebase();
-+    return __builtin_ppc_get_timebase();
- #else
- #error No timer implementation for this platform
- #endif
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index ccaca61fdc3e6..4b3cb0ddf39c1 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,6 +1,6 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.5.22
+version=11.1.2
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -19,15 +19,15 @@ configure_args="-DBUILD_CONFIG=mysql_release
  -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DWITH_PCRE=system"
 hostmakedepends="bison perl flex pkg-config"
 makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
- pcre2-devel"
+ pcre2-devel fmt-devel"
 depends="perl"
 checkdepends="perl"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://mariadb.com"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
-checksum=3e2386bb5ee25a8ddcd21cffc48c76097e5ca41a6e4a098f6b2ee4012b0d638e
+distfiles="https://archive.mariadb.org/mariadb-${version}/source/mariadb-${version}.tar.gz"
+checksum=19a9e980e57fa332931f643b48ad7390528c889ff6ea8b0e16fd306aa3088238
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
@@ -38,14 +38,11 @@ make_dirs="/var/lib/mysql 0700 mysql mysql
 CFLAGS="-UNDEBUG"
 CXXFLAGS="-UNDEBUG"
 
-post_patch() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl)
-			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
-			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
-			;;
-	esac
-}
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DWITH_UNIT_TESTS=ON"
+else
+	configure_args+=" -DWITH_UNIT_TESTS=OFF"
+fi
 
 do_check() {
 	cd build
@@ -61,7 +58,7 @@ do_check() {
 
 post_install() {
 	# Remove unneeded stuff.
-	rm -rf ${DESTDIR}/usr/{sql-bench,mysql-test,data}
+	rm -rf ${DESTDIR}/usr/{sql-bench,mariadb-test,data}
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 

Re: mariadb: update to 11.1.2.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 191 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/46762#issuecomment-1777175578

Comment:
hmm, do revdeps need to be rebuilt for this?

Re: mariadb: update to 11.1.2.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 191 bytes --]

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/46762#issuecomment-1777937842

Comment:
There haven't been any so verison bumps, but idk

Re: mariadb: update to 11.1.2.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 273 bytes --]

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/46762#issuecomment-1783571342

Comment:
I just checked previous mariadb bumps (including between major versions), and it doesn't seem like revdeps were rebuilt for those.

Re: [PR PATCH] [Merged]: mariadb: update to 11.1.2.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 1068 bytes --]

There's a merged pull request on the void-packages repository

mariadb: update to 11.1.2.
https://github.com/void-linux/void-packages/pull/46762

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->