CVS commit: pkgsrc/databases/mariadb1011-client

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jul 10 21:11:03 UTC 2024

Modified Files:
        pkgsrc/databases/mariadb1011-client: distinfo
Added Files:
        pkgsrc/databases/mariadb1011-client/patches: patch-sql_item__strfunc.cc

Log Message:
mariadb1011-*: fix build with fmtlib 11


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/mariadb1011-client/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mariadb1011-client/patches/patch-sql_item__strfunc.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mariadb1011-client/distinfo
diff -u pkgsrc/databases/mariadb1011-client/distinfo:1.7 pkgsrc/databases/mariadb1011-client/distinfo:1.8
--- pkgsrc/databases/mariadb1011-client/distinfo:1.7    Thu Jun 20 16:52:29 2024
+++ pkgsrc/databases/mariadb1011-client/distinfo        Wed Jul 10 21:11:03 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2024/06/20 16:52:29 abs Exp $
+$NetBSD: distinfo,v 1.8 2024/07/10 21:11:03 wiz Exp $
 
 BLAKE2s (mariadb-10.11.8.tar.gz) = 786329da47785061212e877e1e0cc56451f155f48c61de743b15b7afa8a52dc3
 SHA512 (mariadb-10.11.8.tar.gz) = 61bdbe4a51adb438335c22bfcf75f59864fa0412c7ed6e938ef73fd602c2ef27131dbeef83cd314f2bea54135c6e8f8646608ff96a7ce6ce2c74f34ef6a8675f
@@ -14,6 +14,7 @@ SHA1 (patch-mysys_my__gethwaddr.c) = c3f
 SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = b2fddab1d94ba75c69cbf660f546f8e5821e1d51
 SHA1 (patch-scripts_CMakeLists.txt) = b8a13304e314162ab0a1fc06c5620d6b757975f5
 SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f
+SHA1 (patch-sql_item__strfunc.cc) = d540ac075612cf9d9fc8294602009c6042328808
 SHA1 (patch-sql_mysqld.cc) = 71400987a62be294842694cbc59c446bef578202
 SHA1 (patch-storage_innobase_include_transactional__lock__guard.h) = d5ff507acdd21858791246ef5a2559e653cb7833
 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.cc) = 85ee5007cfda0d3070ec20b2b774738b01f8e083

Added files:

Index: pkgsrc/databases/mariadb1011-client/patches/patch-sql_item__strfunc.cc
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-sql_item__strfunc.cc:1.1
--- /dev/null   Wed Jul 10 21:11:03 2024
+++ pkgsrc/databases/mariadb1011-client/patches/patch-sql_item__strfunc.cc      Wed Jul 10 21:11:03 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-sql_item__strfunc.cc,v 1.1 2024/07/10 21:11:03 wiz Exp $
+
+Fix build with fmtlib 11.
+
+--- sql/item_strfunc.cc.orig   2024-07-10 21:07:27.206529082 +0000
++++ sql/item_strfunc.cc
+@@ -1382,7 +1382,7 @@ bool Item_func_sformat::fix_length_and_d
+ namespace fmt {
+   template <> struct formatter<String>: formatter<string_view> {
+     template <typename FormatContext>
+-    auto format(String c, FormatContext& ctx) -> decltype(ctx.out()) {
++    auto format(String c, FormatContext& ctx) const -> decltype(ctx.out()) {
+       string_view name = { c.ptr(), c.length() };
+       return formatter<string_view>::format(name, ctx);
+     };