diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-11-03 08:36:22 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-11-03 08:36:22 +0000 |
| commit | f65628136faa35d0c4d3b5e7332275c7b35fcd96 (patch) | |
| tree | 021998302365c5652e37824b6c26d4d969a62055 /dev-libs/spdlog/files | |
| parent | 70b82ae359a5538711e103b0e8dfb92654296644 (diff) | |
gentoo resync : 03.11.2018
Diffstat (limited to 'dev-libs/spdlog/files')
| -rw-r--r-- | dev-libs/spdlog/files/spdlog-0.17.0-unbundle-fmt.patch | 35 | ||||
| -rw-r--r-- | dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch | 8 |
2 files changed, 4 insertions, 39 deletions
diff --git a/dev-libs/spdlog/files/spdlog-0.17.0-unbundle-fmt.patch b/dev-libs/spdlog/files/spdlog-0.17.0-unbundle-fmt.patch deleted file mode 100644 index e3e0df833537..000000000000 --- a/dev-libs/spdlog/files/spdlog-0.17.0-unbundle-fmt.patch +++ /dev/null @@ -1,35 +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 -@@ -18,16 +18,11 @@ - #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 -+#endif // 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 ---- 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/files/spdlog-1.0.0-unbundle-fmt.patch b/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch index 9b04f276ba55..c039dc47a6ae 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 |