mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
spdlog, bump version (#11648)
This commit is contained in:
31
dev-libs/spdlog/patches/spdlog-1.15.0.patchset
Normal file
31
dev-libs/spdlog/patches/spdlog-1.15.0.patchset
Normal file
@@ -0,0 +1,31 @@
|
||||
From 5a28aa089b689dd726e9baf05b5b4fd4c257a90e Mon Sep 17 00:00:00 2001
|
||||
From: Shengqi Chen <harry@debian.org>
|
||||
Date: Fri, 10 Jan 2025 13:47:17 +0100
|
||||
Subject: applying Debian patch fix-fmtlib-11-1.patch
|
||||
|
||||
Bug: https://github.com/gabime/spdlog/pull/3301
|
||||
Bug: https://github.com/gabime/spdlog/pull/3314
|
||||
|
||||
https://sources.debian.org/data/main/s/spdlog/1%3A1.15.0%2Bds-2/debian/patches/fix-fmtlib-11-1.patch
|
||||
|
||||
diff --git a/include/spdlog/common.h b/include/spdlog/common.h
|
||||
index aca483c..71ffd24 100644
|
||||
--- a/include/spdlog/common.h
|
||||
+++ b/include/spdlog/common.h
|
||||
@@ -364,12 +364,7 @@ SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view
|
||||
}
|
||||
#endif
|
||||
|
||||
-#ifndef SPDLOG_USE_STD_FORMAT
|
||||
-template <typename T, typename... Args>
|
||||
-inline fmt::basic_string_view<T> to_string_view(fmt::basic_format_string<T, Args...> fmt) {
|
||||
- return fmt;
|
||||
-}
|
||||
-#elif __cpp_lib_format >= 202207L
|
||||
+#if defined(SPDLOG_USE_STD_FORMAT) && __cpp_lib_format >= 202207L
|
||||
template <typename T, typename... Args>
|
||||
SPDLOG_CONSTEXPR_FUNC std::basic_string_view<T> to_string_view(
|
||||
std::basic_format_string<T, Args...> fmt) SPDLOG_NOEXCEPT {
|
||||
--
|
||||
2.45.2
|
||||
|
||||
@@ -21,12 +21,10 @@ Features:
|
||||
COPYRIGHT="Gabi Melman"
|
||||
HOMEPAGE="https://github.com/gabime/spdlog"
|
||||
LICENSE="MIT"
|
||||
REVISION="4"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/gabime/spdlog/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="4dccf2d10f410c1e2feaff89966bfc49a1abb29ef6f08246335b110e001e09a9"
|
||||
# Import patches from openSUSE
|
||||
#PATCHES="spdlog-1.8.5-fmt8_tests.patch
|
||||
# spdlog-1.8.5-fmt8.patch"
|
||||
CHECKSUM_SHA256="9962648c9b4f1a7bbc76fd8d9172555bad1871fdb14ff4f842ef87949682caa5"
|
||||
PATCHES="spdlog-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
@@ -54,7 +52,7 @@ REQUIRES_devel="
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libfmt$secondaryArchSuffix >= 8
|
||||
devel:libfmt$secondaryArchSuffix >= 11
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
Reference in New Issue
Block a user