* [gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/
@ 2018-06-12 17:38 Michał Górny
0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2018-06-12 17:38 UTC (permalink / raw
To: gentoo-commits
commit: 163972c7fddc08a68b1b9b4aa50a61e94df60716
Author: David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Tue Jun 12 16:07:40 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun 12 17:38:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=163972c7
dev-libs/spdlog: clean old ebuilds
Closes: https://github.com/gentoo/gentoo/pull/8525
dev-libs/spdlog/Manifest | 2 -
dev-libs/spdlog/files/spdlog-unbundle-fmt.patch | 90 -------------------------
dev-libs/spdlog/spdlog-0.16.2.ebuild | 38 -----------
dev-libs/spdlog/spdlog-0.16.3.ebuild | 38 -----------
4 files changed, 168 deletions(-)
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 68f096c7142..3f7a4c11c29 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,3 +1 @@
-DIST spdlog-0.16.2.tar.gz 162709 BLAKE2B 7cd031bd9b1e01aa11186334ada9aad50cdc063942e0eb5b9d36e918e305db4c0e5657a215f24f458dbf792e05c38f74409bc7f5f88049bd1c4a759ccab0167e SHA512 454da17d75fa6dae074fb2ef10d93a1f9ccbf23b625521d32ce463a1362411ffc35ca33b081bee3cfb27bb647472de73899c9a15d24f09c8a3c9222560bcf559
-DIST spdlog-0.16.3.tar.gz 163636 BLAKE2B bebed0811976c5000481d9fa70107f79c3fb6180484afec611df9b3621349a91809e0f824583171a1c8bc89dae58a659c990fb4c6761da404f01a70868494f06 SHA512 6e08473825cf97dfb10b0e919b77996c1023bbfb583d851e961ec4a95094e4afffd1fc6f6e7e728ce8c2c69c9fb280c59f8d6494b50224bdf8cc68914ffd21e8
DIST spdlog-0.17.0.tar.gz 172323 BLAKE2B 2ca821fb3da0ee82601dd9ef54ca155ffdf19ea1e51c6fbb7269a58bf7a662b5225c9ef7e4d8ccbe7a05c56aeefaad27ddc9cfe21a329f52490078ccd0fb2ce6 SHA512 c3d7c7b2d221b33ad4f4685207ff606d271635bd1ad7edab763a823880386f604d264343139f37b36a3e8654d6382dbed0d431556728676523e390b8fb4b2aef
diff --git a/dev-libs/spdlog/files/spdlog-unbundle-fmt.patch b/dev-libs/spdlog/files/spdlog-unbundle-fmt.patch
deleted file mode 100644
index 1b2449949bf..00000000000
--- a/dev-libs/spdlog/files/spdlog-unbundle-fmt.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 52d2953..d132d26 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,6 +80,7 @@ install(
- install(
- DIRECTORY "${HEADER_BASE}/${PROJECT_NAME}"
- DESTINATION "${include_install_dir}"
-+ PATTERN "bundled*" EXCLUDE
- )
-
- # install project version file
-diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
-index 92ca4e5..55f1fa8 100644
---- a/include/spdlog/fmt/fmt.h
-+++ b/include/spdlog/fmt/fmt.h
-@@ -10,25 +10,7 @@
- // By default spdlog include its own copy.
- //
-
--#if !defined(SPDLOG_FMT_EXTERNAL)
--
--#ifndef FMT_HEADER_ONLY
--#define FMT_HEADER_ONLY
--#endif
--#ifndef FMT_USE_WINDOWS_H
--#define FMT_USE_WINDOWS_H 0
--#endif
--#include "bundled/format.h"
--#if defined(SPDLOG_FMT_PRINTF)
--#include "bundled/printf.h"
--#endif
--
--#else //external fmtlib
--
- #include <fmt/format.h>
- #if defined(SPDLOG_FMT_PRINTF)
- #include <fmt/printf.h>
- #endif
--
--#endif
--
-diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h
-index 5cdd5cd..d70c6b3 100644
---- a/include/spdlog/fmt/ostr.h
-+++ b/include/spdlog/fmt/ostr.h
-@@ -7,11 +7,6 @@
-
- // include external or bundled copy of fmtlib's ostream support
- //
--#if !defined(SPDLOG_FMT_EXTERNAL)
--#include "fmt.h"
--#include "bundled/ostream.h"
--#else
- #include <fmt/ostream.h>
--#endif
-
-
-diff --git a/include/spdlog/tweakme.h b/include/spdlog/tweakme.h
-index ad01a09..9a1bec4 100644
---- a/include/spdlog/tweakme.h
-+++ b/include/spdlog/tweakme.h
-@@ -98,14 +98,6 @@
- ///////////////////////////////////////////////////////////////////////////////
-
-
--///////////////////////////////////////////////////////////////////////////////
--// Uncomment to use your own copy of the fmt library instead of spdlog's copy.
--// In this case spdlog will try to include <fmt/format.h> so set your -I flag accordingly.
--//
--// #define SPDLOG_FMT_EXTERNAL
--///////////////////////////////////////////////////////////////////////////////
--
--
- ///////////////////////////////////////////////////////////////////////////////
- // Uncomment to use printf-style messages in your logs instead of the usual
- // format-style used by default.
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 22329b4..44dad86 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -13,7 +13,7 @@ target_include_directories(catch INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
- file(GLOB catch_tests LIST_DIRECTORIES false RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp *.h *.hpp)
-
- add_executable(catch_tests ${catch_tests})
--target_link_libraries(catch_tests spdlog ${CMAKE_THREAD_LIBS_INIT})
-+target_link_libraries(catch_tests spdlog fmt ${CMAKE_THREAD_LIBS_INIT})
- add_test(NAME catch_tests COMMAND catch_tests)
- file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/logs")
-
diff --git a/dev-libs/spdlog/spdlog-0.16.2.ebuild b/dev-libs/spdlog/spdlog-0.16.2.ebuild
deleted file mode 100644
index b22d880ad03..00000000000
--- a/dev-libs/spdlog/spdlog-0.16.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Very fast, header only, C++ logging library."
-HOMEPAGE="https://github.com/gabime/spdlog"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/gabime/spdlog"
-else
- SRC_URI="https://github.com/gabime/spdlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-DEPEND="
- dev-libs/libfmt
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-unbundle-fmt.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DSPDLOG_BUILD_EXAMPLES=no
- -DSPDLOG_BUILD_TESTING=$(usex test)
- )
-
- cmake-utils_src_configure
-
-}
diff --git a/dev-libs/spdlog/spdlog-0.16.3.ebuild b/dev-libs/spdlog/spdlog-0.16.3.ebuild
deleted file mode 100644
index b22d880ad03..00000000000
--- a/dev-libs/spdlog/spdlog-0.16.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Very fast, header only, C++ logging library."
-HOMEPAGE="https://github.com/gabime/spdlog"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/gabime/spdlog"
-else
- SRC_URI="https://github.com/gabime/spdlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-DEPEND="
- dev-libs/libfmt
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-unbundle-fmt.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DSPDLOG_BUILD_EXAMPLES=no
- -DSPDLOG_BUILD_TESTING=$(usex test)
- )
-
- cmake-utils_src_configure
-
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/
@ 2018-08-08 21:21 Craig Andrews
0 siblings, 0 replies; 10+ messages in thread
From: Craig Andrews @ 2018-08-08 21:21 UTC (permalink / raw
To: gentoo-commits
commit: 8b0c05c847d692cc5f6d6c47caa5b9f29a925b2c
Author: David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Tue Aug 7 10:25:23 2018 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Wed Aug 8 21:21:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b0c05c8
dev-libs/spdlog: bump to 1.0.0
Closes: https://bugs.gentoo.org/662942
dev-libs/spdlog/Manifest | 1 +
.../spdlog/files/spdlog-1.0.0-unbundle-fmt.patch | 29 ++++++++++++++++++++++
.../{spdlog-9999.ebuild => spdlog-1.0.0.ebuild} | 6 ++---
dev-libs/spdlog/spdlog-9999.ebuild | 6 ++---
4 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 3f7a4c11c29..2291d1dbf3b 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1 +1,2 @@
DIST spdlog-0.17.0.tar.gz 172323 BLAKE2B 2ca821fb3da0ee82601dd9ef54ca155ffdf19ea1e51c6fbb7269a58bf7a662b5225c9ef7e4d8ccbe7a05c56aeefaad27ddc9cfe21a329f52490078ccd0fb2ce6 SHA512 c3d7c7b2d221b33ad4f4685207ff606d271635bd1ad7edab763a823880386f604d264343139f37b36a3e8654d6382dbed0d431556728676523e390b8fb4b2aef
+DIST spdlog-1.0.0.tar.gz 183855 BLAKE2B 30d54fef03a83f968cfebacf95a484ff397126771a7ea022556aebd07e2f7694af35b278f75ee24372283ff1428e21247fd4329794d64a65bd6220a93f21db3c SHA512 4d3cbc1926be513256b5837a53fce425f6d352bb4ab262074f205450cd4eadc09feea9dc8d8c03b3f1e9792bcfbcff414be79e51d58234f540946428bbd88cd1
diff --git a/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch b/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch
new file mode 100644
index 00000000000..9b04f276ba5
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch
@@ -0,0 +1,29 @@
+diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
+--- a/include/spdlog/fmt/fmt.h
++++ b/include/spdlog/fmt/fmt.h
+@@ -16,10 +16,7 @@
+ #endif
+ #ifndef FMT_USE_WINDOWS_H
+ #define FMT_USE_WINDOWS_H 0
+-#endif
+-#include "bundled/core.h"
+-#include "bundled/format.h"
+-#else // external fmtlib
++#endif // external fmtlib
+ #include <fmt/core.h>
+ #include <fmt/format.h>
+ #endif
+diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h
+--- a/include/spdlog/fmt/ostr.h
++++ b/include/spdlog/fmt/ostr.h
+@@ -11,8 +11,6 @@
+ #ifndef FMT_HEADER_ONLY
+ #define FMT_HEADER_ONLY
+ #endif
+-#include "bundled/ostream.h"
+-#include "fmt.h"
+-#else
+-#include <fmt/ostream.h>
+ #endif
++
++#include <fmt/ostream.h>
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-1.0.0.ebuild
similarity index 88%
copy from dev-libs/spdlog/spdlog-9999.ebuild
copy to dev-libs/spdlog/spdlog-1.0.0.ebuild
index e42aaade7db..03aaec9bd60 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-1.0.0.ebuild
@@ -17,15 +17,15 @@ else
fi
LICENSE="MIT"
-SLOT="0"
+SLOT="0/1"
IUSE="test"
DEPEND="
- <=dev-libs/libfmt-4.1.0
+ >=dev-libs/libfmt-5.0.0
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-0.17.0-unbundle-fmt.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.0.0-unbundle-fmt.patch" )
src_configure() {
rm -r include/spdlog/fmt/bundled || die
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild
index e42aaade7db..03aaec9bd60 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-9999.ebuild
@@ -17,15 +17,15 @@ else
fi
LICENSE="MIT"
-SLOT="0"
+SLOT="0/1"
IUSE="test"
DEPEND="
- <=dev-libs/libfmt-4.1.0
+ >=dev-libs/libfmt-5.0.0
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-0.17.0-unbundle-fmt.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.0.0-unbundle-fmt.patch" )
src_configure() {
rm -r include/spdlog/fmt/bundled || die
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/
@ 2019-07-21 12:02 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2019-07-21 12:02 UTC (permalink / raw
To: gentoo-commits
commit: 5bd1526cf0e8b971ebd3f5101f5f707bc6e33bf9
Author: David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Sun Jul 21 00:46:20 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 12:01:52 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bd1526c
dev-libs/spdlog: fix patch of live ebuild
Closes: https://bugs.gentoo.org/689788
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12486
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../spdlog/files/spdlog-9999-unbundle-fmt.patch | 45 ++++++++++++++++++++++
dev-libs/spdlog/spdlog-9999.ebuild | 4 +-
2 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/dev-libs/spdlog/files/spdlog-9999-unbundle-fmt.patch b/dev-libs/spdlog/files/spdlog-9999-unbundle-fmt.patch
new file mode 100644
index 00000000000..f6f37b5e493
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-9999-unbundle-fmt.patch
@@ -0,0 +1,45 @@
+diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
+index 5d039b8c..8107b19a 100644
+--- a/include/spdlog/fmt/fmt.h
++++ b/include/spdlog/fmt/fmt.h
+@@ -19,9 +19,6 @@
+ #ifndef FMT_USE_WINDOWS_H
+ #define FMT_USE_WINDOWS_H 0
+ #endif
+-#include "bundled/core.h"
+-#include "bundled/format.h"
+-#else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
+-#include "fmt/core.h"
+-#include "fmt/format.h"
+-#endif
++#endif // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
++#include <fmt/core.h>
++#include <fmt/format.h>
+diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h
+index 9902898f..5e92a592 100644
+--- a/include/spdlog/fmt/ostr.h
++++ b/include/spdlog/fmt/ostr.h
+@@ -11,8 +11,6 @@
+ #ifndef FMT_HEADER_ONLY
+ #define FMT_HEADER_ONLY
+ #endif
+-#include "bundled/ostream.h"
+-#include "fmt.h"
+-#else
+-#include <fmt/ostream.h>
+ #endif
++
++#include <fmt/ostream.h>
+diff --git a/src/spdlog.cpp b/src/spdlog.cpp
+index be91412d..d68dd522 100644
+--- a/src/spdlog.cpp
++++ b/src/spdlog.cpp
+@@ -104,7 +104,7 @@ template std::shared_ptr<spdlog::logger> spdlog::stderr_logger_st<spdlog::async_
+ // All rights reserved.
+
+ #if !defined(SPDLOG_FMT_EXTERNAL)
+-#include "spdlog/fmt/bundled/format-inl.h"
++#include <fmt/format-inl.h>
+
+ FMT_BEGIN_NAMESPACE
+ template struct internal::basic_data<void>;
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild
index 497e7da9b41..a9cbb03ae99 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-9999.ebuild
@@ -25,13 +25,13 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-1.0.0-unbundle-fmt.patch" )
+PATCHES=( "${FILESDIR}/${PN}-9999-unbundle-fmt.patch" )
src_configure() {
rm -r include/spdlog/fmt/bundled || die
local mycmakeargs=(
- -DSPDLOG_BUILD_EXAMPLES=no
+ -DSPDLOG_BUILD_EXAMPLE=no
-DSPDLOG_BUILD_BENCH=no
-DSPDLOG_BUILD_TESTS=$(usex test)
)
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/
@ 2020-01-21 2:12 Craig Andrews
0 siblings, 0 replies; 10+ messages in thread
From: Craig Andrews @ 2020-01-21 2:12 UTC (permalink / raw
To: gentoo-commits
commit: cb4209494b05520fa84511c0ec3df825085af73e
Author: David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Mon Jan 20 21:08:54 2020 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Tue Jan 21 02:12:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb420949
dev-libs/spdlog: bump to 1.5.0
Closes: https://bugs.gentoo.org/696710
Closes: https://bugs.gentoo.org/699346
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14113
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
dev-libs/spdlog/Manifest | 1 +
.../spdlog/files/spdlog-9999-unbundle-fmt.patch | 45 ----------------------
.../{spdlog-9999.ebuild => spdlog-1.5.0.ebuild} | 20 ++++++----
dev-libs/spdlog/spdlog-9999.ebuild | 20 ++++++----
4 files changed, 27 insertions(+), 59 deletions(-)
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 9beed729a3b..9c5db7b8547 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,3 +1,4 @@
DIST spdlog-1.2.1.tar.gz 188284 BLAKE2B c3491a9c44d8a94c51d50c9ef36a2105f77e8fb61bb7b2b81a341609f433abbe3a74e7b4a467dd715a5d906f976740716488d07b4510f366556ab59d160ceefe SHA512 418f91efc207fa227558212d82c41639c0bb59e84ea47447e0b6276c4842e97f1f8aaf5802c071ef15d80ec525e317e70b6a39661a6c96ab39d33d9bd1570da1
DIST spdlog-1.3.0.tar.gz 202637 BLAKE2B 97027a3672b826e294dbdc202afa913a42ddae5a02a569ac28c41d79b96128de045ac5df30a76d888d6b3bea5093fb75b006365d7b1b296842750a39f43835d6 SHA512 019a52d4b6c66287ee2a6e8177457ecbbb78e1cb894f4a0a90b83a84d66cd37b397cdf77892d9116e4c34113bd3277d606d578bc96ec6521ae7745f08b1aa54f
DIST spdlog-1.3.1.tar.gz 202634 BLAKE2B 2465a8d1a38af1527ae66d92f5dd91ad504d01e44ac47702e315f7448e19f01743627357132f0561e48807315df9b102f337f95cab5a7aae3ec0ae7ceff940b9 SHA512 a851a44b6384f493dd312ae0a611d068af46bbfe8daf1c2f61f13d8836a3801f41b339074fbe8da8e428131c82fa5c4a9e3320a55cbdd4b7aff8bb349dfff7dd
+DIST spdlog-1.5.0.tar.gz 270416 BLAKE2B bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28 SHA512 78991c943dd95af563c4b29545b9b5d635caf1af5031262dde734ecf70c0b4ae866d954ee77b050f9f0cc089a3bc57ee9583895e51cb00dd1cc6c10ff905ca34
diff --git a/dev-libs/spdlog/files/spdlog-9999-unbundle-fmt.patch b/dev-libs/spdlog/files/spdlog-9999-unbundle-fmt.patch
deleted file mode 100644
index f6f37b5e493..00000000000
--- a/dev-libs/spdlog/files/spdlog-9999-unbundle-fmt.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
-index 5d039b8c..8107b19a 100644
---- a/include/spdlog/fmt/fmt.h
-+++ b/include/spdlog/fmt/fmt.h
-@@ -19,9 +19,6 @@
- #ifndef FMT_USE_WINDOWS_H
- #define FMT_USE_WINDOWS_H 0
- #endif
--#include "bundled/core.h"
--#include "bundled/format.h"
--#else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
--#include "fmt/core.h"
--#include "fmt/format.h"
--#endif
-+#endif // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
-+#include <fmt/core.h>
-+#include <fmt/format.h>
-diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h
-index 9902898f..5e92a592 100644
---- a/include/spdlog/fmt/ostr.h
-+++ b/include/spdlog/fmt/ostr.h
-@@ -11,8 +11,6 @@
- #ifndef FMT_HEADER_ONLY
- #define FMT_HEADER_ONLY
- #endif
--#include "bundled/ostream.h"
--#include "fmt.h"
--#else
--#include <fmt/ostream.h>
- #endif
-+
-+#include <fmt/ostream.h>
-diff --git a/src/spdlog.cpp b/src/spdlog.cpp
-index be91412d..d68dd522 100644
---- a/src/spdlog.cpp
-+++ b/src/spdlog.cpp
-@@ -104,7 +104,7 @@ template std::shared_ptr<spdlog::logger> spdlog::stderr_logger_st<spdlog::async_
- // All rights reserved.
-
- #if !defined(SPDLOG_FMT_EXTERNAL)
--#include "spdlog/fmt/bundled/format-inl.h"
-+#include <fmt/format-inl.h>
-
- FMT_BEGIN_NAMESPACE
- template struct internal::basic_data<void>;
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-1.5.0.ebuild
similarity index 61%
copy from dev-libs/spdlog/spdlog-9999.ebuild
copy to dev-libs/spdlog/spdlog-1.5.0.ebuild
index f0b80109ac4..060e167a8af 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-1.5.0.ebuild
@@ -10,9 +10,9 @@ HOMEPAGE="https://github.com/gabime/spdlog"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/gabime/spdlog"
+ EGIT_REPO_URI="https://github.com/gabime/${PN}"
else
- SRC_URI="https://github.com/gabime/spdlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
fi
@@ -21,19 +21,25 @@ SLOT="0/1"
IUSE="test"
RESTRICT="!test? ( test )"
+BDEPEND="
+ virtual/pkgconfig
+"
DEPEND="
- >=dev-libs/libfmt-5.0.0
+ >=dev-libs/libfmt-5.3.0:=
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-9999-unbundle-fmt.patch" )
+src_prepare() {
+ cmake_src_prepare
+ rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
+}
src_configure() {
- rm -r include/spdlog/fmt/bundled || die
-
local mycmakeargs=(
- -DSPDLOG_BUILD_EXAMPLE=no
-DSPDLOG_BUILD_BENCH=no
+ -DSPDLOG_BUILD_EXAMPLE=no
+ -DSPDLOG_FMT_EXTERNAL=yes
+ -DSPDLOG_BUILD_SHARED=no
-DSPDLOG_BUILD_TESTS=$(usex test)
)
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild
index f0b80109ac4..060e167a8af 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-9999.ebuild
@@ -10,9 +10,9 @@ HOMEPAGE="https://github.com/gabime/spdlog"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/gabime/spdlog"
+ EGIT_REPO_URI="https://github.com/gabime/${PN}"
else
- SRC_URI="https://github.com/gabime/spdlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
fi
@@ -21,19 +21,25 @@ SLOT="0/1"
IUSE="test"
RESTRICT="!test? ( test )"
+BDEPEND="
+ virtual/pkgconfig
+"
DEPEND="
- >=dev-libs/libfmt-5.0.0
+ >=dev-libs/libfmt-5.3.0:=
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-9999-unbundle-fmt.patch" )
+src_prepare() {
+ cmake_src_prepare
+ rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
+}
src_configure() {
- rm -r include/spdlog/fmt/bundled || die
-
local mycmakeargs=(
- -DSPDLOG_BUILD_EXAMPLE=no
-DSPDLOG_BUILD_BENCH=no
+ -DSPDLOG_BUILD_EXAMPLE=no
+ -DSPDLOG_FMT_EXTERNAL=yes
+ -DSPDLOG_BUILD_SHARED=no
-DSPDLOG_BUILD_TESTS=$(usex test)
)
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/
@ 2020-08-08 9:04 Joonas Niilola
0 siblings, 0 replies; 10+ messages in thread
From: Joonas Niilola @ 2020-08-08 9:04 UTC (permalink / raw
To: gentoo-commits
commit: c680482145f31b0e20aae17bb9fbb2984e102aae
Author: David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Sun Jul 12 14:18:44 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Aug 8 09:04:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6804821
dev-libs/spdlog: fix tests segfault
Closes: https://bugs.gentoo.org/731238
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16678
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch | 13 +++++++++++++
dev-libs/spdlog/spdlog-1.6.1-r1.ebuild | 1 +
2 files changed, 14 insertions(+)
diff --git a/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch b/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch
new file mode 100644
index 00000000000..8a6aa8020f7
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/include/spdlog/fmt/bin_to_hex.h b/include/spdlog/fmt/bin_to_hex.h
+index e974cf51..5393dcac 100644
+--- a/include/spdlog/fmt/bin_to_hex.h
++++ b/include/spdlog/fmt/bin_to_hex.h
+@@ -92,7 +92,7 @@ struct formatter<spdlog::details::dump_info<T>>
+ auto parse(ParseContext &ctx) -> decltype(ctx.begin())
+ {
+ auto it = ctx.begin();
+- while (*it && *it != '}')
++ while (it != ctx.end() && *it != '}')
+ {
+ switch (*it)
+ {
diff --git a/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild b/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild
index 04237834f6c..6d996c6f8ea 100644
--- a/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild
@@ -31,6 +31,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${P}-libfmt-7.0.0.patch"
+ "${FILESDIR}/${P}-tests-fix.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/
@ 2021-06-25 0:31 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2021-06-25 0:31 UTC (permalink / raw
To: gentoo-commits
commit: 64d8afb7f3cd0f431e5b40fe486e1e89965131e5
Author: Hank Leininger <hlein <AT> korelogic <DOT> com>
AuthorDate: Thu Jun 24 18:25:46 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 25 00:31:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64d8afb7
dev-libs/spdlog: fix compiling with libfmt-8 installed
See also upstream https://github.com/gabime/spdlog/issues/1975
Signed-off-by: Hank Leininger <hlein <AT> korelogic.com>
Closes: https://bugs.gentoo.org/797394
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Closes: https://github.com/gentoo/gentoo/pull/21413
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../spdlog/files/spdlog-1.8.5-libfmt-8-fix.patch | 13 ++++++
dev-libs/spdlog/spdlog-1.8.5-r1.ebuild | 49 ++++++++++++++++++++++
2 files changed, 62 insertions(+)
diff --git a/dev-libs/spdlog/files/spdlog-1.8.5-libfmt-8-fix.patch b/dev-libs/spdlog/files/spdlog-1.8.5-libfmt-8-fix.patch
new file mode 100644
index 00000000000..f59a9bca4b3
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-1.8.5-libfmt-8-fix.patch
@@ -0,0 +1,13 @@
+See upstream https://github.com/gabime/spdlog/issues/1975
+
+--- a/include/spdlog/common-inl.h 2021-06-21 17:15:26.695992698 -0600
++++ b/include/spdlog/common-inl.h 2021-06-21 17:15:52.205992496 -0600
+@@ -60,7 +60,7 @@
+ SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno)
+ {
+ memory_buf_t outbuf;
+- fmt::format_system_error(outbuf, last_errno, msg);
++ fmt::format_system_error(outbuf, last_errno, msg.c_str());
+ msg_ = fmt::to_string(outbuf);
+ }
+
diff --git a/dev-libs/spdlog/spdlog-1.8.5-r1.ebuild b/dev-libs/spdlog/spdlog-1.8.5-r1.ebuild
new file mode 100644
index 00000000000..26e7cb42bce
--- /dev/null
+++ b/dev-libs/spdlog/spdlog-1.8.5-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Very fast, header only, C++ logging library"
+HOMEPAGE="https://github.com/gabime/spdlog"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/gabime/${PN}"
+else
+ SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/1"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+DEPEND="
+ >=dev-libs/libfmt-6.1.2:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-libfmt-8-fix.patch" )
+
+src_prepare() {
+ cmake_src_prepare
+ rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DSPDLOG_BUILD_BENCH=no
+ -DSPDLOG_BUILD_EXAMPLE=no
+ -DSPDLOG_FMT_EXTERNAL=yes
+ -DSPDLOG_BUILD_SHARED=yes
+ -DSPDLOG_BUILD_TESTS=$(usex test)
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/
@ 2022-05-11 1:04 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2022-05-11 1:04 UTC (permalink / raw
To: gentoo-commits
commit: cc5eb0f1c465faa4d7e4b00efcad2f8feeb020ae
Author: David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Fri May 6 19:28:37 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 11 01:04:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc5eb0f1
dev-libs/spdlog: fix clone async test
Closes: https://bugs.gentoo.org/840764
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25355
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/spdlog/files/spdlog-1.9.2-fix-clone-test.patch | 13 +++++++++++++
dev-libs/spdlog/spdlog-1.9.2-r1.ebuild | 5 ++++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/dev-libs/spdlog/files/spdlog-1.9.2-fix-clone-test.patch b/dev-libs/spdlog/files/spdlog-1.9.2-fix-clone-test.patch
new file mode 100644
index 000000000000..a224969d9025
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-1.9.2-fix-clone-test.patch
@@ -0,0 +1,13 @@
+See https://bugs.gentoo.org/840764
+
+--- a/tests/test_misc.cpp
++++ b/tests/test_misc.cpp
+@@ -131,7 +131,7 @@ TEST_CASE("clone async", "[clone]")
+ logger->info("Some message 1");
+ cloned->info("Some message 2");
+
+- spdlog::details::os::sleep_for_millis(10);
++ spdlog::details::os::sleep_for_millis(100);
+
+ REQUIRE(test_sink->lines().size() == 2);
+ REQUIRE(test_sink->lines()[0] == "Some message 1");
diff --git a/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild b/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
index c8f6d4c67329..d1522c98ebf1 100644
--- a/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
@@ -31,7 +31,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-force_external_fmt.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-force_external_fmt.patch"
+ "${FILESDIR}/${P}-fix-clone-test.patch"
+)
src_prepare() {
use test && eapply "${WORKDIR}"/${P}-update-catch-glibc-2.34.patch
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/
@ 2023-05-10 15:22 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2023-05-10 15:22 UTC (permalink / raw
To: gentoo-commits
commit: 03d7b984817fbf07c4d830f30e34ae20a79af7b4
Author: jinqiang zhang <peeweep <AT> 0x0 <DOT> ee>
AuthorDate: Wed May 10 15:15:00 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 10 15:21:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03d7b984
dev-libs/spdlog: fix fails compile with libfmt-10.0.0
Closes: https://bugs.gentoo.org/906069
Signed-off-by: jinqiang zhang <peeweep <AT> 0x0.ee>
Closes: https://github.com/gentoo/gentoo/pull/30974
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch | 30 ++++++++++++++++++++++++
dev-libs/spdlog/spdlog-1.11.0.ebuild | 1 +
2 files changed, 31 insertions(+)
diff --git a/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
new file mode 100644
index 000000000000..185fb12fb727
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
@@ -0,0 +1,30 @@
+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
+
+diff --git a/include/spdlog/common.h b/include/spdlog/common.h
+index e69201a81..5f671c5c6 100644
+--- 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)
diff --git a/dev-libs/spdlog/spdlog-1.11.0.ebuild b/dev-libs/spdlog/spdlog-1.11.0.ebuild
index ebda7ae2f4a2..6759c44b79f8 100644
--- a/dev-libs/spdlog/spdlog-1.11.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.11.0.ebuild
@@ -31,6 +31,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-force_external_fmt.patch"
+ "${FILESDIR}/${PN}-libfmt-10.0.0.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/
@ 2023-07-15 6:07 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2023-07-15 6:07 UTC (permalink / raw
To: gentoo-commits
commit: 682906906c17c3127b5f9dfd984bbd4ea91902bc
Author: David Roman <droman <AT> ifae <DOT> es>
AuthorDate: Mon Jun 26 22:25:38 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 06:02:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68290690
dev-libs/spdlog: fix fmt-10.x compatibility
Closes: https://bugs.gentoo.org/906069
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/spdlog/files/spdlog-fmt-10.patch | 121 +++++++++++++++++++++
...og-1.11.0-r2.ebuild => spdlog-1.11.0-r3.ebuild} | 5 +-
2 files changed, 125 insertions(+), 1 deletion(-)
diff --git a/dev-libs/spdlog/files/spdlog-fmt-10.patch b/dev-libs/spdlog/files/spdlog-fmt-10.patch
new file mode 100644
index 000000000000..5ee44c41ea6a
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-fmt-10.patch
@@ -0,0 +1,121 @@
+diff --git a/include/spdlog/sinks/daily_file_sink.h b/include/spdlog/sinks/daily_file_sink.h
+index f6f1bb1d..90af9676 100644
+--- a/include/spdlog/sinks/daily_file_sink.h
++++ b/include/spdlog/sinks/daily_file_sink.h
+@@ -13,6 +13,9 @@
+ #include <spdlog/details/circular_q.h>
+ #include <spdlog/details/synchronous_factory.h>
+
++#include <iostream>
++#include <sstream>
++#include <iomanip>
+ #include <chrono>
+ #include <cstdio>
+ #include <ctime>
+@@ -46,46 +49,15 @@ struct daily_filename_calculator
+ */
+ struct daily_filename_format_calculator
+ {
+- static filename_t calc_filename(const filename_t &filename, const tm &now_tm)
++ static filename_t calc_filename(const filename_t &file_path, const tm &now_tm)
+ {
+-#ifdef SPDLOG_USE_STD_FORMAT
+- // adapted from fmtlib: https://github.com/fmtlib/fmt/blob/8.0.1/include/fmt/chrono.h#L522-L546
+-
+- filename_t tm_format;
+- tm_format.append(filename);
+- // By appending an extra space we can distinguish an empty result that
+- // indicates insufficient buffer size from a guaranteed non-empty result
+- // https://github.com/fmtlib/fmt/issues/2238
+- tm_format.push_back(' ');
+-
+- const size_t MIN_SIZE = 10;
+- filename_t buf;
+- buf.resize(MIN_SIZE);
+- for (;;)
+- {
+- size_t count = strftime(buf.data(), buf.size(), tm_format.c_str(), &now_tm);
+- if (count != 0)
+- {
+- // Remove the extra space.
+- buf.resize(count - 1);
+- break;
+- }
+- buf.resize(buf.size() * 2);
+- }
+-
+- return buf;
++#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
++ std::wstringstream stream;
+ #else
+- // generate fmt datetime format string, e.g. {:%Y-%m-%d}.
+- filename_t fmt_filename = fmt::format(SPDLOG_FMT_STRING(SPDLOG_FILENAME_T("{{:{}}}")), filename);
+-
+- // MSVC doesn't allow fmt::runtime(..) with wchar, with fmtlib versions < 9.1.x
+-# if defined(_MSC_VER) && defined(SPDLOG_WCHAR_FILENAMES) && FMT_VERSION < 90101
+- return fmt::format(fmt_filename, now_tm);
+-# else
+- return fmt::format(SPDLOG_FMT_RUNTIME(fmt_filename), now_tm);
+-# endif
+-
++ std::stringstream stream;
+ #endif
++ stream << std::put_time(&now_tm, file_path.c_str());
++ return stream.str();
+ }
+
+ private:
+diff --git a/include/spdlog/logger.h b/include/spdlog/logger.h
+index 71544e84..1d802f32 100644
+--- a/include/spdlog/logger.h
++++ b/include/spdlog/logger.h
+@@ -369,9 +369,9 @@ protected:
+ {
+ memory_buf_t buf;
+ #ifdef SPDLOG_USE_STD_FORMAT
+- fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(std::forward<Args>(args)...));
++ fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(args...));
+ #else
+- fmt::vformat_to(fmt::appender(buf), fmt, fmt::make_format_args(std::forward<Args>(args)...));
++ fmt::vformat_to(fmt::appender(buf), fmt, fmt::make_format_args(args...));
+ #endif
+
+ details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size()));
+@@ -395,10 +395,9 @@ protected:
+ // format to wmemory_buffer and convert to utf8
+ wmemory_buf_t wbuf;
+ # ifdef SPDLOG_USE_STD_FORMAT
+- fmt_lib::vformat_to(
+- std::back_inserter(wbuf), fmt, fmt_lib::make_format_args<fmt_lib::wformat_context>(std::forward<Args>(args)...));
++ fmt_lib::vformat_to(std::back_inserter(wbuf), fmt, fmt_lib::make_format_args<fmt_lib::wformat_context>(args...));
+ # else
+- fmt::vformat_to(std::back_inserter(wbuf), fmt, fmt::make_format_args<fmt::wformat_context>(std::forward<Args>(args)...));
++ fmt::vformat_to(std::back_inserter(wbuf), fmt, fmt::make_format_args<fmt::wformat_context>(args...));
+ # endif
+
+ memory_buf_t buf;
+diff --git a/include/spdlog/common.h b/include/spdlog/common.h
+index e69201a8..5f671c5c 100644
+--- 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)
diff --git a/dev-libs/spdlog/spdlog-1.11.0-r2.ebuild b/dev-libs/spdlog/spdlog-1.11.0-r3.ebuild
similarity index 94%
rename from dev-libs/spdlog/spdlog-1.11.0-r2.ebuild
rename to dev-libs/spdlog/spdlog-1.11.0-r3.ebuild
index 7d751c92f18e..a513025d8d54 100644
--- a/dev-libs/spdlog/spdlog-1.11.0-r2.ebuild
+++ b/dev-libs/spdlog/spdlog-1.11.0-r3.ebuild
@@ -24,13 +24,16 @@ RESTRICT="!test? ( test )"
BDEPEND="
virtual/pkgconfig
"
+
DEPEND="
- dev-libs/libfmt:0/9.1.0
+ dev-libs/libfmt
"
+
RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-force_external_fmt.patch"
+ "${FILESDIR}/${PN}-fmt-10.patch"
"${FILESDIR}/${PN}-musl-1.2.4.patch"
)
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/
@ 2023-09-04 12:30 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2023-09-04 12:30 UTC (permalink / raw
To: gentoo-commits
commit: 8aa7e6a5f417cbbead816aef2de1213cce27947c
Author: David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Sat Aug 12 17:10:02 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 4 12:29:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aa7e6a5
dev-libs/spdlog: fix tests
Closes: https://bugs.gentoo.org/911322
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32274
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/spdlog/files/spdlog-1.12.0-fix-tests.patch | 13 +++++++++++++
dev-libs/spdlog/spdlog-1.12.0-r2.ebuild | 1 +
2 files changed, 14 insertions(+)
diff --git a/dev-libs/spdlog/files/spdlog-1.12.0-fix-tests.patch b/dev-libs/spdlog/files/spdlog-1.12.0-fix-tests.patch
new file mode 100644
index 000000000000..8ad33f4fc8d0
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-1.12.0-fix-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/test_misc.cpp b/tests/test_misc.cpp
+index 9f3cb1744..6199641ff 100644
+--- a/tests/test_misc.cpp
++++ b/tests/test_misc.cpp
+@@ -43,7 +43,7 @@ TEST_CASE("log_levels", "[log_levels]")
+ REQUIRE(log_info("Hello", spdlog::level::trace) == "Hello");
+ }
+
+-TEST_CASE("level_to_string_view", "[convert_to_string_view")
++TEST_CASE("level_to_string_view", "[convert_to_string_view]")
+ {
+ REQUIRE(spdlog::level::to_string_view(spdlog::level::trace) == "trace");
+ REQUIRE(spdlog::level::to_string_view(spdlog::level::debug) == "debug");
diff --git a/dev-libs/spdlog/spdlog-1.12.0-r2.ebuild b/dev-libs/spdlog/spdlog-1.12.0-r2.ebuild
index 55c4ac137dc1..86c85fff7203 100644
--- a/dev-libs/spdlog/spdlog-1.12.0-r2.ebuild
+++ b/dev-libs/spdlog/spdlog-1.12.0-r2.ebuild
@@ -32,6 +32,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-force_external_fmt.patch"
+ "${FILESDIR}/${P}-fix-tests.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-09-04 12:30 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-21 12:02 [gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-09-04 12:30 Sam James
2023-07-15 6:07 Sam James
2023-05-10 15:22 Sam James
2022-05-11 1:04 Sam James
2021-06-25 0:31 Sam James
2020-08-08 9:04 Joonas Niilola
2020-01-21 2:12 Craig Andrews
2018-08-08 21:21 Craig Andrews
2018-06-12 17:38 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox