diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-02 19:14:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-02 19:14:55 +0100 |
commit | b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch) | |
tree | 0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /dev-libs/spdlog | |
parent | 121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff) |
gentoo resync : 02.08.2019
Diffstat (limited to 'dev-libs/spdlog')
-rw-r--r-- | dev-libs/spdlog/Manifest | 3 | ||||
-rw-r--r-- | dev-libs/spdlog/files/spdlog-9999-unbundle-fmt.patch | 45 | ||||
-rw-r--r-- | dev-libs/spdlog/spdlog-9999.ebuild | 4 |
3 files changed, 49 insertions, 3 deletions
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest index b5fca226d9fa..0d25490b2bdd 100644 --- a/dev-libs/spdlog/Manifest +++ b/dev-libs/spdlog/Manifest @@ -1,9 +1,10 @@ AUX spdlog-1.0.0-unbundle-fmt.patch 700 BLAKE2B d98e7dc4ad4b2911192053d1aec564f1e07c5dd7a5bfca39f30fd08e7210bc79749fed03b6e6137671156f814f4c07b6e47f56e11c69806cdb28a1a478cae8dd SHA512 cf86983ccbb975df3804f10fd581a4edbe11ba1d2b43312fb27c05ffc95269c8eeca75e38970697f34d9c5861b925537bc0a9b0bcfd84617d328d640cf668db8 +AUX spdlog-9999-unbundle-fmt.patch 1307 BLAKE2B 40bdef65614b1c3f0bf288a7b8bc35294abbae4c9f46ba0499594865f47b3b73bdce4915f652d97f5088aa51a9922ed32a4874f318dd9e426ea6a5a0a0b02896 SHA512 15c12c44fce33f65a0068a790e3deaa120c3ff3eb8820b62b95d424a1190957d346f0bec0725132c818e3a6184da81681c4766da9b7d09f11d2d76f5be88ec4c 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 EBUILD spdlog-1.2.1.ebuild 775 BLAKE2B fce5764a6d61b2748a5463fa319f03832af4deb3fdf505023483a6a48adddd1dcdcc03b9c8b3b73532927dcae68a1a592c5fd349cfd6befd54e7281fadd4e883 SHA512 394dd8bd0ba20cae5d3c37b59135eef5d784b9fcbe3eebf652319df34b4ee499d91478d934e326aafb9a221ef0aa3b260d5d0b4d0935ebf88e7562f713e9b00f EBUILD spdlog-1.3.0.ebuild 800 BLAKE2B 1b4c9b500f46918c1a124003cf8d1c0cbbb07aa9be815cf9d28ca326a18aa5c6d3e1e9bbc7996706f8ded5fcb21b025be0796a639baf9b1558ea60f269f7bfe6 SHA512 fbb75ca0dec6a85547fb24fc12763ed8b044cb5bcab35a90659438ae86c1e4d45a404328dfa022a9da15e51380b706e3b5c39607fbae4530e0501c4b69d4247c EBUILD spdlog-1.3.1.ebuild 800 BLAKE2B 1b4c9b500f46918c1a124003cf8d1c0cbbb07aa9be815cf9d28ca326a18aa5c6d3e1e9bbc7996706f8ded5fcb21b025be0796a639baf9b1558ea60f269f7bfe6 SHA512 fbb75ca0dec6a85547fb24fc12763ed8b044cb5bcab35a90659438ae86c1e4d45a404328dfa022a9da15e51380b706e3b5c39607fbae4530e0501c4b69d4247c -EBUILD spdlog-9999.ebuild 800 BLAKE2B 1b4c9b500f46918c1a124003cf8d1c0cbbb07aa9be815cf9d28ca326a18aa5c6d3e1e9bbc7996706f8ded5fcb21b025be0796a639baf9b1558ea60f269f7bfe6 SHA512 fbb75ca0dec6a85547fb24fc12763ed8b044cb5bcab35a90659438ae86c1e4d45a404328dfa022a9da15e51380b706e3b5c39607fbae4530e0501c4b69d4247c +EBUILD spdlog-9999.ebuild 798 BLAKE2B 5122612fce41d8c3bc09395ba99692900790ae51daf3a7f01ef30b0f228120c170395b2c9488286bb05a279e0a3f66d12deb98ce456b9e4d4b45947d44b09784 SHA512 9693c2549a926893acb2ac9dee57f18dcb0ba36cd7fa134195ecbdb7e711106c6db661a5fadfcb882e348d2620defd53d643c6d9816657361195604842adc005 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c 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 000000000000..f6f37b5e493c --- /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 497e7da9b419..a9cbb03ae992 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) ) |