summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2017-02-15 13:28:00 +0100
committerUlrich Müller <ulm@gentoo.org>2017-02-15 13:28:00 +0100
commit1b3025bcd147286244c69b2c6d7b10cd2e98d869 (patch)
tree71bcf5e4f2ce9196197d243fbdc483771902e1da /net-im/openmittsu
parentnet-im/openmittsu: Specify LICENSE more precisely. (diff)
downloadgentoo-1b3025bcd147286244c69b2c6d7b10cd2e98d869.tar.gz
gentoo-1b3025bcd147286244c69b2c6d7b10cd2e98d869.tar.bz2
gentoo-1b3025bcd147286244c69b2c6d7b10cd2e98d869.zip
net-im/openmittsu: Fix compile failure in format.h.
Bug: 609366 Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'net-im/openmittsu')
-rw-r--r--net-im/openmittsu/files/openmittsu-0.9.2_p78-fmt.patch49
-rw-r--r--net-im/openmittsu/openmittsu-0.9.2_p78.ebuild1
2 files changed, 50 insertions, 0 deletions
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
index 00000000000..19b55701e83
--- /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;
+ Char fill = internal::CharTraits<Char>::cast(spec_.fill());
+ CharPtr out = CharPtr();
+- const unsigned CHAR_WIDTH = 1;
+- if (spec_.width_ > CHAR_WIDTH)
++ const unsigned CHAR_SIZE = 1;
++ if (spec_.width_ > CHAR_SIZE)
+ {
+ out = writer_.grow_buffer(spec_.width_);
+ if (spec_.align_ == ALIGN_RIGHT)
+ {
+- std::uninitialized_fill_n(out, spec_.width_ - CHAR_WIDTH, fill);
+- out += spec_.width_ - CHAR_WIDTH;
++ std::uninitialized_fill_n(out, spec_.width_ - CHAR_SIZE, fill);
++ out += spec_.width_ - CHAR_SIZE;
+ }
+ else if (spec_.align_ == ALIGN_CENTER)
+ {
+ out = writer_.fill_padding(out, spec_.width_,
+- internal::check(CHAR_WIDTH), fill);
++ internal::check(CHAR_SIZE), fill);
+ }
+ else
+ {
+- std::uninitialized_fill_n(out + CHAR_WIDTH,
+- spec_.width_ - CHAR_WIDTH, fill);
++ std::uninitialized_fill_n(out + CHAR_SIZE,
++ spec_.width_ - CHAR_SIZE, fill);
+ }
+ }
+ else
+ {
+- out = writer_.grow_buffer(CHAR_WIDTH);
++ out = writer_.grow_buffer(CHAR_SIZE);
+ }
+ *out = internal::CharTraits<Char>::cast(value);
+ }
diff --git a/net-im/openmittsu/openmittsu-0.9.2_p78.ebuild b/net-im/openmittsu/openmittsu-0.9.2_p78.ebuild
index 8bbdab52d80..3cbd7a1482b 100644
--- 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
}