mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
Merge updates from master
This commit is contained in:
@@ -1,40 +0,0 @@
|
||||
Bug: https://bugs.gentoo.org/906069
|
||||
Upstream: https://github.com/gabime/spdlog/pull/2694
|
||||
|
||||
Fixing spdlog-1.11.0 fails compile with libfmt-10.0.0
|
||||
|
||||
https://github.com/gabime/spdlog/commit/0ca574ae168820da0268b3ec7607ca7b33024d05
|
||||
|
||||
From 0ca574ae168820da0268b3ec7607ca7b33024d05 Mon Sep 17 00:00:00 2001
|
||||
From: H1X4 <10332146+H1X4Dev@users.noreply.github.com>
|
||||
Date: Fri, 31 Mar 2023 20:39:32 +0300
|
||||
Subject: [PATCH] fix build for master fmt (non-bundled) (#2694)
|
||||
|
||||
* fix build for master fmt (non-bundled)
|
||||
|
||||
* update fmt_runtime_string macro
|
||||
|
||||
* fix build of updated macro
|
||||
--- a/include/spdlog/common.h
|
||||
+++ b/include/spdlog/common.h
|
||||
@@ -173,12 +173,19 @@ using format_string_t = fmt::format_string<Args...>;
|
||||
template<class T>
|
||||
using remove_cvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
|
||||
|
||||
+template <typename Char>
|
||||
+#if FMT_VERSION >= 90101
|
||||
+using fmt_runtime_string = fmt::runtime_format_string<Char>;
|
||||
+#else
|
||||
+using fmt_runtime_string = fmt::basic_runtime<Char>;
|
||||
+#endif
|
||||
+
|
||||
// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here,
|
||||
// in addition, fmt::basic_runtime<Char> is only convertible to basic_format_string<Char> but not basic_string_view<Char>
|
||||
template<class T, class Char = char>
|
||||
struct is_convertible_to_basic_format_string
|
||||
: std::integral_constant<bool,
|
||||
- std::is_convertible<T, fmt::basic_string_view<Char>>::value || std::is_same<remove_cvref_t<T>, fmt::basic_runtime<Char>>::value>
|
||||
+ std::is_convertible<T, fmt::basic_string_view<Char>>::value || std::is_same<remove_cvref_t<T>, fmt_runtime_string<Char>>::value>
|
||||
{};
|
||||
|
||||
# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
|
||||
@@ -31,7 +31,6 @@ RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-force_external_fmt.patch"
|
||||
"${FILESDIR}/${PN}-libfmt-10.0.0.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@@ -11,7 +11,7 @@ inherit perl-module
|
||||
DESCRIPTION="Config file parser module"
|
||||
LICENSE="Artistic"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
|
||||
RDEPEND="
|
||||
virtual/perl-File-Spec
|
||||
|
||||
@@ -19,7 +19,7 @@ else
|
||||
SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
fi
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86"
|
||||
KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="iscsi client library and utilities"
|
||||
|
||||
@@ -33,6 +33,11 @@
|
||||
|
||||
#--- END OF EXAMPLES ---
|
||||
|
||||
# Sam James <sam@gentoo.org> (2023-05-10)
|
||||
# Lots of package breakage as usual for new versions. Masked until most/all
|
||||
# reverse dependencies are fixed. Tracker bug is bug #906077.
|
||||
=dev-libs/libfmt-10*
|
||||
|
||||
# Matt Turner <mattst88@gentoo.org> (2023-05-08)
|
||||
# Package is unmaintained and appears quite dead. Last release in 2020. Broken
|
||||
# with stable glib-2.76. Depends on app-text/enchant:0.
|
||||
|
||||
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/fujita/tgt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
|
||||
KEYWORDS="amd64 arm64 ~hppa ~ppc ppc64 ~sparc x86"
|
||||
IUSE="fcoe fcp ibmvio infiniband rbd"
|
||||
|
||||
DEPEND="
|
||||
|
||||
Reference in New Issue
Block a user