[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/

[Craig Andrews]

commit:     d081341290444856a0cf2fc988310dc4a38acd88
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jan  7 08:01:36 2018 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 17:25:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0813412

dev-libs/spdlog: remove unused patch

 dev-libs/spdlog/files/spdlog-0.14.0-CMakeLists.txt | 116 ---------------------
 1 file changed, 116 deletions(-)

diff --git a/dev-libs/spdlog/files/spdlog-0.14.0-CMakeLists.txt b/dev-libs/spdlog/files/spdlog-0.14.0-CMakeLists.txt
deleted file mode 100644
index ad8062edda9..00000000000
--- a/dev-libs/spdlog/files/spdlog-0.14.0-CMakeLists.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# Copyright(c) 2015 Ruslan Baratov.
-# Distributed under the MIT License (http://opensource.org/licenses/MIT)
-#
-
-cmake_minimum_required(VERSION 3.1)
-project(spdlog VERSION 0.14.0)
-include(CTest)
-include(CMakeDependentOption)
-include(GNUInstallDirs)
-
-#---------------------------------------------------------------------------------------
-# compiler config
-#---------------------------------------------------------------------------------------
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}")
-endif()
-
-#---------------------------------------------------------------------------------------
-# spdlog target
-#---------------------------------------------------------------------------------------
-add_library(spdlog INTERFACE)
-
-option(SPDLOG_BUILD_EXAMPLES "Build examples" OFF)
-cmake_dependent_option(SPDLOG_BUILD_TESTING
-    "Build spdlog tests" ON
-    "BUILD_TESTING" OFF
-)
-
-target_include_directories(
-    spdlog
-    INTERFACE
-    "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
-)
-
-set(HEADER_BASE "${CMAKE_CURRENT_SOURCE_DIR}/include")
-
-if(SPDLOG_BUILD_EXAMPLES)
-    add_subdirectory(example)
-endif()
-
-if(SPDLOG_BUILD_TESTING)
-    add_subdirectory(tests)
-endif()
-
-#---------------------------------------------------------------------------------------
-# Install/export targets and files
-#---------------------------------------------------------------------------------------
-# set files and directories
-set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
-set(include_install_dir "${CMAKE_INSTALL_INCLUDEDIR}")
-set(pkgconfig_install_dir "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-set(version_config "${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake")
-set(project_config "${PROJECT_NAME}Config.cmake")
-set(pkg_config "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc")
-set(targets_export_name "${PROJECT_NAME}Targets")
-set(namespace "${PROJECT_NAME}::")
-
-# generate package version file
-include(CMakePackageConfigHelpers)
-write_basic_package_version_file(
-    "${version_config}" COMPATIBILITY SameMajorVersion
-)
-
-# configure pkg config file
-configure_file("cmake/spdlog.pc.in" "${pkg_config}" @ONLY)
-
-# install targets
-install(
-    TARGETS spdlog
-    EXPORT "${targets_export_name}"
-    INCLUDES DESTINATION "${include_install_dir}"
-)
-
-# install headers
-install(
-    DIRECTORY "${HEADER_BASE}/${PROJECT_NAME}"
-    DESTINATION "${include_install_dir}"
-)
-
-# install project version file
-install(
-    FILES "${version_config}"
-    DESTINATION "${config_install_dir}"
-)
-
-# install pkg config file
-install(
-    FILES "${pkg_config}"
-    DESTINATION "${pkgconfig_install_dir}"
-)
-
-# install project config file
-install(
-    EXPORT "${targets_export_name}"
-    NAMESPACE "${namespace}"
-    DESTINATION "${config_install_dir}"
-    FILE ${project_config}
-)
-
-# export build directory config file
-export(
-    EXPORT ${targets_export_name}
-    NAMESPACE "${namespace}"
-    FILE ${project_config}
-)
-
-# register project in CMake user registry
-export(PACKAGE ${PROJECT_NAME})
-
-file(GLOB_RECURSE spdlog_include_SRCS "${HEADER_BASE}/*.h")
-add_custom_target(spdlog_headers_for_ide SOURCES ${spdlog_include_SRCS})

[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/

[Andreas Sturmlechner]

commit:     880e765a4b6522076168432e914189066b1ef774
Author:     David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Sun Oct 28 14:09:32 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 31 18:54:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=880e765a

dev-libs/spdlog: fix compilation error

Closes: https://bugs.gentoo.org/656350
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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
index 9b04f276ba5..c039dc47a6a 100644
--- a/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch
+++ b/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch
@@ -1,18 +1,18 @@
 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
+@@ -17,9 +17,7 @@
  #ifndef FMT_USE_WINDOWS_H
  #define FMT_USE_WINDOWS_H 0
--#endif
+ #endif
 -#include "bundled/core.h"
 -#include "bundled/format.h"
 -#else // external fmtlib
 +#endif // external fmtlib
++
  #include <fmt/core.h>
  #include <fmt/format.h>
- #endif
+-#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

[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/

[Andreas Sturmlechner]

commit:     706d1a3c5d2df832221d877f9f17fe9f680d8e17
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Apr 10 13:01:16 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 20:49:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=706d1a3c

dev-libs/spdlog: remove unused patch(es)

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15288
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../spdlog/files/spdlog-1.0.0-unbundle-fmt.patch   | 29 ----------------------
 1 file changed, 29 deletions(-)

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
deleted file mode 100644
index c039dc47a6a..00000000000
--- a/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
-@@ -17,9 +17,7 @@
- #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>

[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/

[Patrice Clement]

commit:     908775ac57bb25bce3cc14b1058a49f81ff87b05
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Nov  8 19:06:31 2020 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Nov  9 20:30:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=908775ac

dev-libs/spdlog: remove unused patch(es).

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18193
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 .../spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch   | 33 ----------------------
 dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch | 13 ---------
 2 files changed, 46 deletions(-)

diff --git a/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch b/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch
deleted file mode 100644
index 422a507a6d8..00000000000
--- a/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/gabime/spdlog/pull/1606
-
-From 22bee8128a4150ce37cf761ed9a609ad891848a6 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Mon, 6 Jul 2020 13:01:52 -0400
-Subject: [PATCH] fmt 7.0.0 renamed the internal namespace to detail.
-
-See: https://github.com/fmtlib/fmt/issues/1538
----
- include/spdlog/details/fmt_helper.h | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/include/spdlog/details/fmt_helper.h b/include/spdlog/details/fmt_helper.h
-index cbc0bdf3..4f363858 100644
---- a/include/spdlog/details/fmt_helper.h
-+++ b/include/spdlog/details/fmt_helper.h
-@@ -34,7 +34,15 @@ template<typename T>
- inline unsigned int count_digits(T n)
- {
-     using count_type = typename std::conditional<(sizeof(T) > sizeof(uint32_t)), uint64_t, uint32_t>::type;
--    return static_cast<unsigned int>(fmt::internal::count_digits(static_cast<count_type>(n)));
-+    return static_cast<unsigned int>(fmt::
-+// fmt 7.0.0 renamed the internal namespace to detail.
-+// See: https://github.com/fmtlib/fmt/issues/1538
-+#if FMT_VERSION < 70000
-+internal
-+#else
-+detail
-+#endif
-+::count_digits(static_cast<count_type>(n)));
- }
- 
- inline void pad2(int n, memory_buf_t &dest)

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
deleted file mode 100644
index 8a6aa8020f7..00000000000
--- a/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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)
-             {

[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/

[Sam James]

commit:     f6ca1358c59588198f05aa99b61fdac26dfad42b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 10 15:21:56 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 10 15:21:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6ca1358

dev-libs/spdlog: add patch metadata

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
index 185fb12fb727..03ef4e591048 100644
--- a/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
+++ b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
@@ -3,8 +3,18 @@ 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
+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...>;

[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/

[Sam James]

commit:     71f385b11af6bcbf09f59a970c531771650d9c2f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 10 16:09:17 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 10 16:09:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71f385b1

Revert "dev-libs/spdlog: add patch metadata"

This reverts commit f6ca1358c59588198f05aa99b61fdac26dfad42b.

Bug: https://bugs.gentoo.org/906069
Bug: https://bugs.gentoo.org/906071
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
index 03ef4e591048..185fb12fb727 100644
--- a/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
+++ b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
@@ -3,18 +3,8 @@ 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
+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...>;

[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/

[Conrad Kostecki]

commit:     b13c1aa1aa8c22f426ff34c95c2bfa14a1f89a13
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Dec 24 15:10:19 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 00:02:40 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b13c1aa1

dev-libs/spdlog: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-libs/spdlog/files/spdlog-1.12.0-fix-tests.patch | 13 -------------
 1 file changed, 13 deletions(-)

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
deleted file mode 100644
index 8ad33f4fc8d0..000000000000
--- a/dev-libs/spdlog/files/spdlog-1.12.0-fix-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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");