| 1 |
commit: 1b3025bcd147286244c69b2c6d7b10cd2e98d869 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 15 12:28:00 2017 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 15 12:28:00 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b3025bc |
| 7 |
|
| 8 |
net-im/openmittsu: Fix compile failure in format.h. |
| 9 |
|
| 10 |
Bug: 609366 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 13 |
|
| 14 |
.../files/openmittsu-0.9.2_p78-fmt.patch | 49 ++++++++++++++++++++++ |
| 15 |
net-im/openmittsu/openmittsu-0.9.2_p78.ebuild | 1 + |
| 16 |
2 files changed, 50 insertions(+) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 0000000000..19b55701e8 |
| 21 |
--- /dev/null |
| 22 |
+++ b/net-im/openmittsu/files/openmittsu-0.9.2_p78-fmt.patch |
| 23 |
@@ -0,0 +1,49 @@ |
| 24 |
+https://bugs.gentoo.org/609366 |
| 25 |
+Backported from https://github.com/fmtlib/fmt.git: |
| 26 |
+ |
| 27 |
+commit abbefd71666055daac9e14e78262620f9e845850 |
| 28 |
+Author: Victor Zverovich <victor.zverovich@×××××.com> |
| 29 |
+Date: Wed Oct 19 06:52:55 2016 -0700 |
| 30 |
+ |
| 31 |
+ CHAR_WIDTH -> CHAR_SIZE to avoid collision with ISO/IEC TS 18661-1:2014 macro |
| 32 |
+ |
| 33 |
+--- openMittsu-0.9.2_p78-orig/3rdparty/spdlog/include/spdlog/details/format.h |
| 34 |
++++ openMittsu-0.9.2_p78/3rdparty/spdlog/include/spdlog/details/format.h |
| 35 |
+@@ -2163,29 +2163,29 @@ |
| 36 |
+ typedef typename BasicWriter<Char>::CharPtr CharPtr; |
| 37 |
+ Char fill = internal::CharTraits<Char>::cast(spec_.fill()); |
| 38 |
+ CharPtr out = CharPtr(); |
| 39 |
+- const unsigned CHAR_WIDTH = 1; |
| 40 |
+- if (spec_.width_ > CHAR_WIDTH) |
| 41 |
++ const unsigned CHAR_SIZE = 1; |
| 42 |
++ if (spec_.width_ > CHAR_SIZE) |
| 43 |
+ { |
| 44 |
+ out = writer_.grow_buffer(spec_.width_); |
| 45 |
+ if (spec_.align_ == ALIGN_RIGHT) |
| 46 |
+ { |
| 47 |
+- std::uninitialized_fill_n(out, spec_.width_ - CHAR_WIDTH, fill); |
| 48 |
+- out += spec_.width_ - CHAR_WIDTH; |
| 49 |
++ std::uninitialized_fill_n(out, spec_.width_ - CHAR_SIZE, fill); |
| 50 |
++ out += spec_.width_ - CHAR_SIZE; |
| 51 |
+ } |
| 52 |
+ else if (spec_.align_ == ALIGN_CENTER) |
| 53 |
+ { |
| 54 |
+ out = writer_.fill_padding(out, spec_.width_, |
| 55 |
+- internal::check(CHAR_WIDTH), fill); |
| 56 |
++ internal::check(CHAR_SIZE), fill); |
| 57 |
+ } |
| 58 |
+ else |
| 59 |
+ { |
| 60 |
+- std::uninitialized_fill_n(out + CHAR_WIDTH, |
| 61 |
+- spec_.width_ - CHAR_WIDTH, fill); |
| 62 |
++ std::uninitialized_fill_n(out + CHAR_SIZE, |
| 63 |
++ spec_.width_ - CHAR_SIZE, fill); |
| 64 |
+ } |
| 65 |
+ } |
| 66 |
+ else |
| 67 |
+ { |
| 68 |
+- out = writer_.grow_buffer(CHAR_WIDTH); |
| 69 |
++ out = writer_.grow_buffer(CHAR_SIZE); |
| 70 |
+ } |
| 71 |
+ *out = internal::CharTraits<Char>::cast(value); |
| 72 |
+ } |
| 73 |
|
| 74 |
diff --git a/net-im/openmittsu/openmittsu-0.9.2_p78.ebuild b/net-im/openmittsu/openmittsu-0.9.2_p78.ebuild |
| 75 |
index 8bbdab52d8..3cbd7a1482 100644 |
| 76 |
--- a/net-im/openmittsu/openmittsu-0.9.2_p78.ebuild |
| 77 |
+++ b/net-im/openmittsu/openmittsu-0.9.2_p78.ebuild |
| 78 |
@@ -38,6 +38,7 @@ src_prepare() { |
| 79 |
sed -i "/git_describe_checkout/\ |
| 80 |
s/.*/set(OPENMITTSU_GIT_VERSION_STRING \"${PV/_p/-}-00000000\")/" \ |
| 81 |
CMakeLists.txt || die |
| 82 |
+ eapply "${FILESDIR}"/${P}-fmt.patch |
| 83 |
cmake-utils_src_prepare |
| 84 |
} |
Archives