diff --git a/mariadb/.footprint b/mariadb/.footprint index 5804f5b65..0e653354f 100644 --- a/mariadb/.footprint +++ b/mariadb/.footprint @@ -323,6 +323,8 @@ drwxr-xr-x root/root usr/include/mysql/server/private/atomic/ -rw-r--r-- root/root usr/include/mysql/server/private/lex.h -rw-r--r-- root/root usr/include/mysql/server/private/lex_charset.h -rw-r--r-- root/root usr/include/mysql/server/private/lex_ident.h +-rw-r--r-- root/root usr/include/mysql/server/private/lex_ident_cli.h +-rw-r--r-- root/root usr/include/mysql/server/private/lex_ident_sys.h -rw-r--r-- root/root usr/include/mysql/server/private/lex_string.h -rw-r--r-- root/root usr/include/mysql/server/private/lex_symbol.h -rw-r--r-- root/root usr/include/mysql/server/private/lf.h @@ -557,7 +559,6 @@ drwxr-xr-x root/root usr/include/mysql/server/private/providers/lzo/ -rw-r--r-- root/root usr/include/mysql/server/private/tztime.h -rw-r--r-- root/root usr/include/mysql/server/private/uniques.h -rw-r--r-- root/root usr/include/mysql/server/private/unireg.h --rw-r--r-- root/root usr/include/mysql/server/private/vers_string.h -rw-r--r-- root/root usr/include/mysql/server/private/violite.h -rw-r--r-- root/root usr/include/mysql/server/private/waiting_threads.h -rw-r--r-- root/root usr/include/mysql/server/private/welcome_copyright_notice.h diff --git a/mariadb/.signature b/mariadb/.signature index e2442c053..1c2ca418c 100644 --- a/mariadb/.signature +++ b/mariadb/.signature @@ -1,9 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/VaD0SI78shEGNx3PU6fu5qMj/OVlA1nYp7L+8Ski02rN0lLsRBhewtxHhDHs2tU6LMG915qTXhC+RoudtYweQ4= -SHA256 (Pkgfile) = db0eac04ad1dd7c27f3d98c08dacf7209c6469de0d63446d00014b6191f172cc -SHA256 (.footprint) = 27df37d1c42790e845b11d57c760ef736d42a2c3579ed73aa3b9527854d94fdb -SHA256 (mariadb-11.4.3.tar.gz) = 6f0017b9901bb1897de0eed21caef9ffa9d66ef559345a0d8a6f011308413ece +RWSE3ohX2g5d/fpsjkh3qjurBfIImBayF6hEpNdHQc87uG4NVJ73aexOzz6Zca4uUmpj4Ax8Ur86Edrv7jrOyVf+ewu7VJVAJQg= +SHA256 (Pkgfile) = a756f2d95c398cf510ee456e942bb811c8050da6f24948d407fbc48824b2fb96 +SHA256 (.footprint) = 139cfd76b1a52a0c18e11e6d67d651153bde88780a98b164110b0a60c7d083f4 +SHA256 (mariadb-11.5.2.tar.gz) = e25fac00aeb34610faf62182836a14e3310c0ca5d882e9109f63bd8dfdc3542d SHA256 (mariadb.rc) = 176aefb898a408d17f920b69582caed803cd338db48bcf9dadad59074a5b582d SHA256 (mariadb.pam) = 962b53d37719ed4798643a8fe3557454d23f74c2b14f1dfc1c1c67d361cab891 SHA256 (pre-install) = 62040c17eeb3da88172d49240633c871a93c3c642ad7f61911ce2e83d8414d1c -SHA256 (libfmt.patch) = 62243984cd3461240439cb23e76323536540b06725a4d92307d2eb6eec68861c diff --git a/mariadb/Pkgfile b/mariadb/Pkgfile index 4a8cb077f..9311acaf5 100644 --- a/mariadb/Pkgfile +++ b/mariadb/Pkgfile @@ -4,16 +4,13 @@ # Depends on: fmt libaio libpcre2 linux-pam ncurses openssl zlib name=mariadb -version=11.4.3 +version=11.5.2 release=1 source=(https://downloads.mariadb.com/MariaDB//$name-$version/source/$name-$version.tar.gz mariadb.rc mariadb.pam - pre-install - libfmt.patch) + pre-install) build() { - patch -d $name-$version/cmake -i $SRC/libfmt.patch - cmake -S $name-$version -B build -G Ninja \ -D CMAKE_BUILD_TYPE=Release \ -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \ diff --git a/mariadb/libfmt.patch b/mariadb/libfmt.patch deleted file mode 100644 index ec2fa35a9..000000000 --- a/mariadb/libfmt.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- libfmt.cmake.23 2024-02-02 17:48:45.000000000 +0100 -+++ libfmt.cmake 2023-11-19 08:41:55.000000000 +0100 -@@ -1,4 +1,4 @@ --INCLUDE (CheckCXXSourceRuns) -+INCLUDE (CheckCXXSourceCompiles) - INCLUDE (ExternalProject) - - SET(WITH_LIBFMT "auto" CACHE STRING -@@ -27,15 +27,17 @@ - MACRO (CHECK_LIBFMT) - IF(WITH_LIBFMT STREQUAL "system" OR WITH_LIBFMT STREQUAL "auto") - SET(CMAKE_REQUIRED_INCLUDES ${LIBFMT_INCLUDE_DIR}) -- CHECK_CXX_SOURCE_RUNS( -+ CHECK_CXX_SOURCE_COMPILES( - "#define FMT_STATIC_THOUSANDS_SEPARATOR ',' - #define FMT_HEADER_ONLY 1 - #include -+ #include - int main() { -- int answer= 4321; -+ int answer= 42; - fmt::format_args::format_arg arg= - fmt::detail::make_arg(answer); -- return fmt::vformat(\"{:L}\", fmt::format_args(&arg, 1)).compare(\"4,321\"); -+ std::cout << fmt::vformat(\"The answer is {}.\", -+ fmt::format_args(&arg, 1)); - }" HAVE_SYSTEM_LIBFMT) - SET(CMAKE_REQUIRED_INCLUDES) - ENDIF()