commit: 0e9e4120aff7a0bc400e9823f0ca24c08c97abd4 Author: Craig Andrews <candrews <AT> gentoo <DOT> org> AuthorDate: Fri Jun 25 13:34:34 2021 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Fri Jun 25 13:35:00 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e9e4120
media-tv/kodi: support fmt 8 Closes: https://bugs.gentoo.org/797619 See: https://github.com/xbmc/xbmc/pull/19904 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> media-tv/kodi/files/kodi-19.1-fmt-8.patch | 28 ++++++++++++++++++++++++++++ media-tv/kodi/kodi-19.1.ebuild | 4 ++++ 2 files changed, 32 insertions(+) diff --git a/media-tv/kodi/files/kodi-19.1-fmt-8.patch b/media-tv/kodi/files/kodi-19.1-fmt-8.patch new file mode 100644 index 00000000000..ea82d007910 --- /dev/null +++ b/media-tv/kodi/files/kodi-19.1-fmt-8.patch @@ -0,0 +1,28 @@ +https://github.com/xbmc/xbmc/pull/19904 + +From 18ff80a9c169fb969b75e2143d9f1f234b71a730 Mon Sep 17 00:00:00 2001 +From: Craig Andrews <candr...@integralblue.com> +Date: Thu, 24 Jun 2021 20:41:11 -0400 +Subject: [PATCH] [utils] include fmt/xchar.h + +fmt 8 moved wchar/custom char overloads to xchar.h, so for fmt 8 compatibility, xchar.h must be included + +See https://github.com/fmtlib/fmt/commit/76ee490468212f8705a1421b4c88f8f814b2d351 +--- + xbmc/utils/StringUtils.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/xbmc/utils/StringUtils.h b/xbmc/utils/StringUtils.h +index ca6f82953d90a..2dc5c3f03af2f 100644 +--- a/xbmc/utils/StringUtils.h ++++ b/xbmc/utils/StringUtils.h +@@ -36,6 +36,9 @@ + #if FMT_VERSION >= 40000 + #include <fmt/printf.h> + #endif ++#if FMT_VERSION >= 80000 ++#include <fmt/xchar.h> ++#endif + + #include "XBDateTime.h" + #include "utils/params_check_macros.h" diff --git a/media-tv/kodi/kodi-19.1.ebuild b/media-tv/kodi/kodi-19.1.ebuild index 11329e6f470..d8e43ce073b 100644 --- a/media-tv/kodi/kodi-19.1.ebuild +++ b/media-tv/kodi/kodi-19.1.ebuild @@ -30,6 +30,10 @@ else S=${WORKDIR}/xbmc-${MY_PV} fi +PATCHES=( + "${FILESDIR}/${P}-fmt-8.patch" +) + inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg DESCRIPTION="A free and open source media-player and entertainment hub"
