Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/, games-simulation/openrct2/files/
Date: Wed, 19 Aug 2020 22:45:11
Message-Id: 1597877095.54f89e0355173685f96ec3f67e0bf1a5773cad34.conikost@gentoo
1 commit: 54f89e0355173685f96ec3f67e0bf1a5773cad34
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 19 22:10:01 2020 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 19 22:44:55 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54f89e03
7
8 games-simulation/openrct2: fix tests with newest gtest
9
10 Closes: https://bugs.gentoo.org/733386
11 Package-Manager: Portage-3.0.1, Repoman-2.3.23
12 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
13
14 .../openrct2/files/openrct2-0.2.6-gtest-1.10.patch | 20 ++++++++++++++++++++
15 games-simulation/openrct2/openrct2-0.2.6.ebuild | 1 +
16 2 files changed, 21 insertions(+)
17
18 diff --git a/games-simulation/openrct2/files/openrct2-0.2.6-gtest-1.10.patch b/games-simulation/openrct2/files/openrct2-0.2.6-gtest-1.10.patch
19 new file mode 100644
20 index 00000000000..f0805f40855
21 --- /dev/null
22 +++ b/games-simulation/openrct2/files/openrct2-0.2.6-gtest-1.10.patch
23 @@ -0,0 +1,20 @@
24 +From 8feab6138724722146b1c6d521431556686068d3 Mon Sep 17 00:00:00 2001
25 +From: Conrad Kostecki <conrad@××××××××.com>
26 +Date: Wed, 19 Aug 2020 22:56:51 +0200
27 +Subject: [PATCH] ReplayTests: Add support for >=gtest-1.10
28 +
29 +Signed-off-by: Conrad Kostecki <conrad@××××××××.com>
30 +---
31 + test/tests/ReplayTests.cpp | 1 +
32 + 1 file changed, 1 insertion(+)
33 +
34 +diff --git a/test/tests/ReplayTests.cpp b/test/tests/ReplayTests.cpp
35 +index 653aa97657f..1443d1c862d 100644
36 +--- a/test/tests/ReplayTests.cpp
37 ++++ b/test/tests/ReplayTests.cpp
38 +@@ -117,4 +117,5 @@ struct PrintReplayParameter
39 + }
40 + };
41 +
42 ++GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(ReplayTests);
43 + INSTANTIATE_TEST_CASE_P(Replay, ReplayTests, testing::ValuesIn(GetReplayFiles()), PrintReplayParameter());
44
45 diff --git a/games-simulation/openrct2/openrct2-0.2.6.ebuild b/games-simulation/openrct2/openrct2-0.2.6.ebuild
46 index 6a7f824c16d..856708edc6e 100644
47 --- a/games-simulation/openrct2/openrct2-0.2.6.ebuild
48 +++ b/games-simulation/openrct2/openrct2-0.2.6.ebuild
49 @@ -73,6 +73,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
50
51 PATCHES=(
52 "${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
53 + "${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
54 )
55
56 src_unpack() {