Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@××××××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-libs/mtxclient/, dev-libs/mtxclient/files/
Date: Tue, 26 May 2020 10:49:09
Message-Id: 1590463066.87ed97b2d47402cbf0cd457d975dd9a76bb5ee9e.andrewammerlaan@gentoo
1 commit: 87ed97b2d47402cbf0cd457d975dd9a76bb5ee9e
2 Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
3 AuthorDate: Tue May 26 03:15:23 2020 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
5 CommitDate: Tue May 26 03:17:46 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=87ed97b2
7
8 dev-libs/mtxclient: Fix GCC 10 compile error.
9
10 Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
11
12 .../mtxclient/files/0.3.0_add_missing_header.patch | 22 ++++++++++++++++++++++
13 dev-libs/mtxclient/mtxclient-0.3.0.ebuild | 3 ++-
14 2 files changed, 24 insertions(+), 1 deletion(-)
15
16 diff --git a/dev-libs/mtxclient/files/0.3.0_add_missing_header.patch b/dev-libs/mtxclient/files/0.3.0_add_missing_header.patch
17 new file mode 100644
18 index 0000000..fd8769d
19 --- /dev/null
20 +++ b/dev-libs/mtxclient/files/0.3.0_add_missing_header.patch
21 @@ -0,0 +1,22 @@
22 +From 3692a1dce868cfde29547757b6a8e91a05761b12 Mon Sep 17 00:00:00 2001
23 +From: Nicolas Werner <nicolas.werner@×××××××.de>
24 +Date: Sat, 9 May 2020 00:33:29 +0200
25 +Subject: [PATCH] gcc 10 fixes
26 +
27 +---
28 + include/mtx/identifiers.hpp | 2 ++
29 + tests/messages.cpp | 2 +-
30 + 2 files changed, 3 insertions(+), 1 deletion(-)
31 +
32 +diff --git a/include/mtx/identifiers.hpp b/include/mtx/identifiers.hpp
33 +index a18b26e9..077099c4 100644
34 +--- a/include/mtx/identifiers.hpp
35 ++++ b/include/mtx/identifiers.hpp
36 +@@ -6,4 +6,6 @@
37 + #include <nlohmann/json.hpp>
38 + #endif
39 +
40 ++#include <stdexcept>
41 ++
42 + namespace mtx {
43 + namespace identifiers {
44
45 diff --git a/dev-libs/mtxclient/mtxclient-0.3.0.ebuild b/dev-libs/mtxclient/mtxclient-0.3.0.ebuild
46 index 8690faf..aa3beef 100644
47 --- a/dev-libs/mtxclient/mtxclient-0.3.0.ebuild
48 +++ b/dev-libs/mtxclient/mtxclient-0.3.0.ebuild
49 @@ -31,6 +31,7 @@ DEPEND="
50 PATCHES=(
51 "${FILESDIR}/0.3.0_remove_network_tests.patch"
52 "${FILESDIR}/0.3.0_remove_failing_tests.patch"
53 + "${FILESDIR}/0.3.0_add_missing_header.patch"
54 )
55
56 src_configure() {
57 @@ -40,7 +41,7 @@ src_configure() {
58 )
59
60 if use test; then
61 - # Upstream uses a toolchain file to set these.
62 + # Upstream uses a toolchain file to set these, fixed in >0.3.0.
63 mycmakeargs+=(
64 -DCMAKE_CXX_STANDARD=17
65 -DCMAKE_CXX_STANDARD_REQUIRED=ON