summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConrad Kostecki <conikost@gentoo.org>2020-08-20 00:10:01 +0200
committerConrad Kostecki <conikost@gentoo.org>2020-08-20 00:44:55 +0200
commit54f89e0355173685f96ec3f67e0bf1a5773cad34 (patch)
tree6a5d9fed27e44601009ed6390f3557c977acfa02
parentdev-libs/zziplib: Stabilize 0.13.71 arm64, #700490 (diff)
downloadgentoo-54f89e0355173685f96ec3f67e0bf1a5773cad34.tar.gz
gentoo-54f89e0355173685f96ec3f67e0bf1a5773cad34.tar.bz2
gentoo-54f89e0355173685f96ec3f67e0bf1a5773cad34.zip
games-simulation/openrct2: fix tests with newest gtest
Closes: https://bugs.gentoo.org/733386 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
-rw-r--r--games-simulation/openrct2/files/openrct2-0.2.6-gtest-1.10.patch20
-rw-r--r--games-simulation/openrct2/openrct2-0.2.6.ebuild1
2 files changed, 21 insertions, 0 deletions
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
new file mode 100644
index 000000000000..f0805f408552
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.2.6-gtest-1.10.patch
@@ -0,0 +1,20 @@
+From 8feab6138724722146b1c6d521431556686068d3 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Wed, 19 Aug 2020 22:56:51 +0200
+Subject: [PATCH] ReplayTests: Add support for >=gtest-1.10
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ test/tests/ReplayTests.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/tests/ReplayTests.cpp b/test/tests/ReplayTests.cpp
+index 653aa97657f..1443d1c862d 100644
+--- a/test/tests/ReplayTests.cpp
++++ b/test/tests/ReplayTests.cpp
+@@ -117,4 +117,5 @@ struct PrintReplayParameter
+ }
+ };
+
++GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(ReplayTests);
+ INSTANTIATE_TEST_CASE_P(Replay, ReplayTests, testing::ValuesIn(GetReplayFiles()), PrintReplayParameter());
diff --git a/games-simulation/openrct2/openrct2-0.2.6.ebuild b/games-simulation/openrct2/openrct2-0.2.6.ebuild
index 6a7f824c16d3..856708edc6e4 100644
--- a/games-simulation/openrct2/openrct2-0.2.6.ebuild
+++ b/games-simulation/openrct2/openrct2-0.2.6.ebuild
@@ -73,6 +73,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
PATCHES=(
"${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
+ "${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
)
src_unpack() {