From 6de7065a2031f5444bf9b6227293cfcd9ffca2cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Van=C4=9Bk?= Date: Fri, 27 Dec 2024 18:03:15 +0100 Subject: [PATCH] dev-db/mariadb: restrict libfmt-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libfmt-11.1.0 changed behaviour of FMT_STATIC_THOUSANDS_SEPARATOR, which is used in mariadb, therefore it is necessary to restrict libfmt-11 to older version, =libfmt-11.0*. Closes: https://bugs.gentoo.org/946924 Signed-off-by: Petr Vaněk --- dev-db/mariadb/mariadb-10.11.10.ebuild | 4 +++- dev-db/mariadb/mariadb-11.4.4.ebuild | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dev-db/mariadb/mariadb-10.11.10.ebuild b/dev-db/mariadb/mariadb-10.11.10.ebuild index 91122de09f6a9..e414f8b901bcf 100644 --- a/dev-db/mariadb/mariadb-10.11.10.ebuild +++ b/dev-db/mariadb/mariadb-10.11.10.ebuild @@ -40,11 +40,13 @@ REQUIRED_USE="jdbc? ( extraengine server !static ) # # libfmt-10 contains a bug which was fixed in libfmt-11, see # https://jira.mariadb.org/browse/MDEV-32815, bug 946074 +# libfmt-11.1 works with # FMT_STATIC_THOUSANDS_SEPARATOR +# differently, bug 946924 COMMON_DEPEND=" dev-libs/libfmt:= || ( =dev-libs/libfmt-11 + =dev-libs/libfmt-11.0* ) >=dev-libs/libpcre2-10.34:= >=sys-apps/texinfo-4.7-r1 diff --git a/dev-db/mariadb/mariadb-11.4.4.ebuild b/dev-db/mariadb/mariadb-11.4.4.ebuild index 6f83048a4765c..70b4bbbc8a0a5 100644 --- a/dev-db/mariadb/mariadb-11.4.4.ebuild +++ b/dev-db/mariadb/mariadb-11.4.4.ebuild @@ -40,11 +40,13 @@ REQUIRED_USE="jdbc? ( extraengine server !static ) # # libfmt-10 contains a bug which was fixed in libfmt-11, see # https://jira.mariadb.org/browse/MDEV-32815, bug 946074 +# libfmt-11.1 works with # FMT_STATIC_THOUSANDS_SEPARATOR +# differently, bug 946924 COMMON_DEPEND=" dev-libs/libfmt:= || ( =dev-libs/libfmt-11 + =dev-libs/libfmt-11.0* ) >=dev-libs/libpcre2-10.34:= >=sys-apps/texinfo-4.7-r1