From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 75B46138359 for ; Wed, 19 Aug 2020 22:45:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7D45E0AEF; Wed, 19 Aug 2020 22:45:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8B101E0AEF for ; Wed, 19 Aug 2020 22:45:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7E5B534E8A3 for ; Wed, 19 Aug 2020 22:45:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 39A0D2FE for ; Wed, 19 Aug 2020 22:45:08 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1597877095.54f89e0355173685f96ec3f67e0bf1a5773cad34.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/, games-simulation/openrct2/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-simulation/openrct2/files/openrct2-0.2.6-gtest-1.10.patch games-simulation/openrct2/openrct2-0.2.6.ebuild X-VCS-Directories: games-simulation/openrct2/files/ games-simulation/openrct2/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 54f89e0355173685f96ec3f67e0bf1a5773cad34 X-VCS-Branch: master Date: Wed, 19 Aug 2020 22:45:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 376dc13e-9838-43fd-8a19-eacfd1bf7c2b X-Archives-Hash: 9fdeff82baf6e8aadb2e427e1408093c commit: 54f89e0355173685f96ec3f67e0bf1a5773cad34 Author: Conrad Kostecki gentoo org> AuthorDate: Wed Aug 19 22:10:01 2020 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Wed Aug 19 22:44:55 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54f89e03 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 gentoo.org> .../openrct2/files/openrct2-0.2.6-gtest-1.10.patch | 20 ++++++++++++++++++++ games-simulation/openrct2/openrct2-0.2.6.ebuild | 1 + 2 files changed, 21 insertions(+) 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 00000000000..f0805f40855 --- /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 +Date: Wed, 19 Aug 2020 22:56:51 +0200 +Subject: [PATCH] ReplayTests: Add support for >=gtest-1.10 + +Signed-off-by: Conrad Kostecki +--- + 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 6a7f824c16d..856708edc6e 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() {