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 4B327158CB7 for ; Thu, 19 Aug 2021 02:01:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A4B9E0817; Thu, 19 Aug 2021 02:00:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 06937E0817 for ; Thu, 19 Aug 2021 02:00:59 +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 D2B38335D51 for ; Thu, 19 Aug 2021 02:00:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F37C7B9 for ; Thu, 19 Aug 2021 02:00:56 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1629338446.f0f6de3c704ea0849ed8b41e1cf7d7222ccb6193.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/files/, games-strategy/s25rttr/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild X-VCS-Directories: games-strategy/s25rttr/files/ games-strategy/s25rttr/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f0f6de3c704ea0849ed8b41e1cf7d7222ccb6193 X-VCS-Branch: master Date: Thu, 19 Aug 2021 02:00:56 +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: 7e984fe4-87a8-4e67-8224-f52f89e0cf95 X-Archives-Hash: 47a600f52dec29ac47b7f680a36a1f8b commit: f0f6de3c704ea0849ed8b41e1cf7d7222ccb6193 Author: Sam James gentoo org> AuthorDate: Thu Aug 19 01:52:51 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Aug 19 02:00:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0f6de3c games-strategy/s25rttr: fix build with Boost 1.77 Closes: https://bugs.gentoo.org/808767 Signed-off-by: Sam James gentoo.org> ...r-0.9.0_pre20200723-boost-1.77-missing-include.patch | 17 +++++++++++++++++ .../s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild | 3 +++ 2 files changed, 20 insertions(+) diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch new file mode 100644 index 00000000000..9a69797ea27 --- /dev/null +++ b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch @@ -0,0 +1,17 @@ +https://github.com/Return-To-The-Roots/s25client/pull/1431 + +From: Sam James +Date: Thu, 19 Aug 2021 02:41:42 +0100 +Subject: [PATCH] Fix build with Boost 1.77 (missing include) + +Closes: https://bugs.gentoo.org/808767 +--- a/libs/s25main/convertSounds.cpp ++++ b/libs/s25main/convertSounds.cpp +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild index dc54ef2deaf..f15c62bc0c1 100644 --- a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild +++ b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild @@ -60,6 +60,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-0.9.0_pre20200723-cmake_lua_version.patch "${FILESDIR}"/${P}-gcc11-include.patch + "${FILESDIR}"/${P}-boost-1.77-missing-include.patch ) S="${WORKDIR}/s25client-${COMMIT}" @@ -98,6 +99,8 @@ src_configure() { -DRTTR_INCLUDE_DEVTOOLS=OFF -DRTTR_LIBDIR="$(get_libdir)/${PN}" -DRTTR_REVISION="${COMMIT}" + -DRTTR_USE_SYSTEM_LIBS=ON + # Just to be ultra explicit. -DRTTR_USE_SYSTEM_LIBSAMPLERATE=ON -DRTTR_VERSION="${PV##*_pre}" # Tests expect a date. -DLUA_VERSION=$(lua_get_version)