1 |
commit: 880e765a4b6522076168432e914189066b1ef774 |
2 |
Author: David Roman <davidroman96 <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Oct 28 14:09:32 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 31 18:54:30 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=880e765a |
7 |
|
8 |
dev-libs/spdlog: fix compilation error |
9 |
|
10 |
Closes: https://bugs.gentoo.org/656350 |
11 |
Signed-off-by: David Roman <davidroman96 <AT> gmail.com> |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch | 8 ++++---- |
15 |
1 file changed, 4 insertions(+), 4 deletions(-) |
16 |
|
17 |
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 |
18 |
index 9b04f276ba5..c039dc47a6a 100644 |
19 |
--- a/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch |
20 |
+++ b/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch |
21 |
@@ -1,18 +1,18 @@ |
22 |
diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h |
23 |
--- a/include/spdlog/fmt/fmt.h |
24 |
+++ b/include/spdlog/fmt/fmt.h |
25 |
-@@ -16,10 +16,7 @@ |
26 |
- #endif |
27 |
+@@ -17,9 +17,7 @@ |
28 |
#ifndef FMT_USE_WINDOWS_H |
29 |
#define FMT_USE_WINDOWS_H 0 |
30 |
--#endif |
31 |
+ #endif |
32 |
-#include "bundled/core.h" |
33 |
-#include "bundled/format.h" |
34 |
-#else // external fmtlib |
35 |
+#endif // external fmtlib |
36 |
++ |
37 |
#include <fmt/core.h> |
38 |
#include <fmt/format.h> |
39 |
- #endif |
40 |
+-#endif |
41 |
diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h |
42 |
--- a/include/spdlog/fmt/ostr.h |
43 |
+++ b/include/spdlog/fmt/ostr.h |