summaryrefslogtreecommitdiff
path: root/games-strategy/colobot
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-06-08 00:08:11 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-06-08 00:08:11 +0100
commitadc09cc4e6ebf7931735c02c0c272b4b885c2b30 (patch)
treed1e752b60c2ed90ae9e427cbe2b07061e3879191 /games-strategy/colobot
parent941687623283212199cbe6e36f7d61b89d6222b2 (diff)
gentoo auto-resync : 08:06:2024 - 00:08:11
Diffstat (limited to 'games-strategy/colobot')
-rw-r--r--games-strategy/colobot/Manifest3
-rw-r--r--games-strategy/colobot/colobot-0.2.1_alpha.ebuild8
-rw-r--r--games-strategy/colobot/files/colobot-0.2.1_alpha-gcc14.patch12
3 files changed, 21 insertions, 2 deletions
diff --git a/games-strategy/colobot/Manifest b/games-strategy/colobot/Manifest
index e505a00408a3..7919a1c9bc07 100644
--- a/games-strategy/colobot/Manifest
+++ b/games-strategy/colobot/Manifest
@@ -1,4 +1,5 @@
+AUX colobot-0.2.1_alpha-gcc14.patch 333 BLAKE2B b61c5a13046a6411d8fc5018a49535ff4215fc6bd1eb08f5a502be43a503142878e6c69e6bfbfa9c4cf8db7cef7515b9ef590ebc3cfd8eff34364f23b51f61d8 SHA512 9dd3c7ba71eb190967ae36ad4423832456215a21cd6137816c3a8a6a262ad5701ac6ef9de310f51025cd448670869c15a61b0fe45f370c3e18e0c36f688463dc
DIST colobot-gold-0.2.1-alpha.tar.gz 1331366 BLAKE2B a4ff7eb10514b829a066654d6800cdf4ddf7c3331c60e8a552b78feb9e153bf666d1a16395be58e3093c98fc2caad8145fd436f66f5afc6b9f9c5d91e9094700 SHA512 cdfe410b30a89bd98513347ba64bbd0569d9f9f9227b063bf99c86101a099de0893b24c2d2e85e718ec0e64e0e428fb6dbdbf88d35f814d99ed31a7f3632f9cd
-EBUILD colobot-0.2.1_alpha.ebuild 1546 BLAKE2B 19b6ce1fda7e52edceff51ddf3abac3ddcd2c63e2817df2458e65f7a8462dfd955f277560e0b2dd6b3778491d7953b245e8dda09eb31f36f47c945719bb0df7b SHA512 d811625a33f3dcb76c11c0bf3866f93713beed759f2a51cc8a2fbb20106ce7b7799c62235ea3751af7754266794cd67668f4133a16ee987e25df50ed590108f8
+EBUILD colobot-0.2.1_alpha.ebuild 1718 BLAKE2B 7bb59dad75aee9e080f5717edb918e5ea173da97d45f1a98c0d059c77cfd30bdb647019e285a973aacd73613d40071f6f475f905d71e27ebd9f203f75282bb52 SHA512 a82cc44bbdd79473af7666b2a31bd30ed81d6f83baaca1e7605d60c14e192fd47b95ae243685ad2c39d9f36ef2d3826584ef39780dd362d377fc559e30474e80
EBUILD colobot-9999.ebuild 1480 BLAKE2B 09794857e04d5a12b86c3fe10041b27ea16eb10f8360920fa6c5cc35db29c5cd5240036da8692c6be551e68ca516f3a59ff72dff98bd6e97d2c489e17e7a06c6 SHA512 c8c103982f91ca41fd960fd2863187829dbe643e0276846120c7beb4dcc5cbd481866542b2e0d4d7000535a975f796a6abe54f9b313706367793c396a20301e1
MISC metadata.xml 419 BLAKE2B 8f91e92cb3ad10979daf436e225f9a19c0b69f71e6ad33ea6fcdcc49eefac1c4373615ebc54ac24888377c63b797e06a9479bfc485fef0208667b19602f88f2b SHA512 d8fae70775286b79f9a0942dc89bcb5214f4833fa7cd539d9e30e2b8e6762968c8a8ea933765ab9c81f2cad30a4aedc88377221c7be1b342267b8a79b9bb04e7
diff --git a/games-strategy/colobot/colobot-0.2.1_alpha.ebuild b/games-strategy/colobot/colobot-0.2.1_alpha.ebuild
index 731b33cd8a2d..b1ad12a0b717 100644
--- a/games-strategy/colobot/colobot-0.2.1_alpha.ebuild
+++ b/games-strategy/colobot/colobot-0.2.1_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -50,6 +50,12 @@ DEPEND+="
"
src_prepare() {
+ local PATCHES=(
+ # fixed upstream as part of:
+ # https://github.com/colobot/colobot/commit/1b69589302c2ac92c6befd2880a03b4b07c7f820
+ "${FILESDIR}/${P}-gcc14.patch"
+ )
+
cmake_src_prepare
# we need to call it explicitly to help Ninja figure out the deps
diff --git a/games-strategy/colobot/files/colobot-0.2.1_alpha-gcc14.patch b/games-strategy/colobot/files/colobot-0.2.1_alpha-gcc14.patch
new file mode 100644
index 000000000000..198aa6ab1a00
--- /dev/null
+++ b/games-strategy/colobot/files/colobot-0.2.1_alpha-gcc14.patch
@@ -0,0 +1,12 @@
+diff --git a/src/level/scoreboard.cpp b/src/level/scoreboard.cpp
+index 87c4451..abc44fe 100644
+--- a/src/level/scoreboard.cpp
++++ b/src/level/scoreboard.cpp
+@@ -31,6 +31,7 @@
+ #include "ui/displaytext.h"
+
+ #include <boost/lexical_cast.hpp>
++#include <algorithm>
+
+ void CScoreboard::CScoreboardRule::Read(CLevelParserLine* line)
+ {