net-im/openmittsu: Fix compile failure in format.h.

Bug: 609366

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/net-im/openmittsu/files/openmittsu-0.9.2_p78-fmt.patch b/net-im/openmittsu/files/openmittsu-0.9.2_p78-fmt.patch
new file mode 100644 (file)
index 0000000..19b5570
--- /dev/null
+++ b/net-im/openmittsu/files/openmittsu-0.9.2_p78-fmt.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/609366
+Backported from https://github.com/fmtlib/fmt.git:
+
+commit abbefd71666055daac9e14e78262620f9e845850
+Author: Victor Zverovich <victor.zverovich@gmail.com>
+Date:   Wed Oct 19 06:52:55 2016 -0700
+
+    CHAR_WIDTH -> CHAR_SIZE to avoid collision with ISO/IEC TS 18661-1:2014 macro
+
+--- openMittsu-0.9.2_p78-orig/3rdparty/spdlog/include/spdlog/details/format.h
++++ openMittsu-0.9.2_p78/3rdparty/spdlog/include/spdlog/details/format.h
+@@ -2163,29 +2163,29 @@
+         typedef typename BasicWriter<Char>::CharPtr CharPtr;\r
+         Char fill = internal::CharTraits<Char>::cast(spec_.fill());\r
+         CharPtr out = CharPtr();\r
+-        const unsigned CHAR_WIDTH = 1;\r
+-        if (spec_.width_ > CHAR_WIDTH)\r
++        const unsigned CHAR_SIZE = 1;\r
++        if (spec_.width_ > CHAR_SIZE)\r
+         {\r
+             out = writer_.grow_buffer(spec_.width_);\r
+             if (spec_.align_ == ALIGN_RIGHT)\r
+             {\r
+-                std::uninitialized_fill_n(out, spec_.width_ - CHAR_WIDTH, fill);\r
+-                out += spec_.width_ - CHAR_WIDTH;\r
++                std::uninitialized_fill_n(out, spec_.width_ - CHAR_SIZE, fill);\r
++                out += spec_.width_ - CHAR_SIZE;\r
+             }\r
+             else if (spec_.align_ == ALIGN_CENTER)\r
+             {\r
+                 out = writer_.fill_padding(out, spec_.width_,\r
+-                                           internal::check(CHAR_WIDTH), fill);\r
++                                           internal::check(CHAR_SIZE), fill);\r
+             }\r
+             else\r
+             {\r
+-                std::uninitialized_fill_n(out + CHAR_WIDTH,\r
+-                                          spec_.width_ - CHAR_WIDTH, fill);\r
++                std::uninitialized_fill_n(out + CHAR_SIZE,\r
++                                          spec_.width_ - CHAR_SIZE, fill);\r
+             }\r
+         }\r
+         else\r
+         {\r
+-            out = writer_.grow_buffer(CHAR_WIDTH);\r
++            out = writer_.grow_buffer(CHAR_SIZE);\r
+         }\r
+         *out = internal::CharTraits<Char>::cast(value);\r
+     }\r

diff --git a/net-im/openmittsu/openmittsu-0.9.2_p78.ebuild b/net-im/openmittsu/openmittsu-0.9.2_p78.ebuild
index 8bbdab52d8006e99739e2a5a8c6f686812caf18b..3cbd7a1482bdc5d112e075098da97c63e1479a1b 100644 (file)
--- a/net-im/openmittsu/openmittsu-0.9.2_p78.ebuild
+++ b/net-im/openmittsu/openmittsu-0.9.2_p78.ebuild
@@ -38,6 +38,7 @@ src_prepare() {
        sed -i "/git_describe_checkout/\
                s/.*/set(OPENMITTSU_GIT_VERSION_STRING \"${PV/_p/-}-00000000\")/" \
                CMakeLists.txt || die
+       eapply "${FILESDIR}"/${P}-fmt.patch
        cmake-utils_src_prepare
 }