diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
commit | f516638b7fe9592837389826a6152a7e1b251c54 (patch) | |
tree | 8bfecb640b7b6403d7a3d662d923eed630033da7 /games-strategy/colobot | |
parent | 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff) |
gentoo resync : 30.05.2020
Diffstat (limited to 'games-strategy/colobot')
-rw-r--r-- | games-strategy/colobot/Manifest | 3 | ||||
-rw-r--r-- | games-strategy/colobot/colobot-0.1.12.ebuild | 7 | ||||
-rw-r--r-- | games-strategy/colobot/files/colobot-0.1.12-includes.patch | 23 |
3 files changed, 31 insertions, 2 deletions
diff --git a/games-strategy/colobot/Manifest b/games-strategy/colobot/Manifest index 8587ed056b4b..8c72d47d9e59 100644 --- a/games-strategy/colobot/Manifest +++ b/games-strategy/colobot/Manifest @@ -1,4 +1,5 @@ +AUX colobot-0.1.12-includes.patch 690 BLAKE2B ab99d982dc57d4dddadae54faf6170268bab72ca4011b79fdc12e6197eec74209080a48f49e22d77c6b532d1e32e44d9cd2b62b225e02e78ac12586c23553eef SHA512 cb0c3eab9c5afab5e2ac8d3d10fc19fcb478a8dfa17d5231e33bbd4d322b375e028825daf739fa0cbeb9de95e04c2d4627a6d9e3f2740c54968903a497f11700 DIST colobot-gold-0.1.12-alpha.tar.gz 1468594 BLAKE2B 2b470e8b074e4a973b751062dca2358396066d8816c2b1b5b44649b798610dccd73ab5fed4086f2aa8d4495f3de69dd8b72b45f97f23f66b18a50fc976bf25ef SHA512 63647a16b376db6544830f96e7d323c0f58003645bf636abd1cab0ffd47b39b0bef47191d584f5156b75324d75dfdfdcabe8b89be565087c37c367ca366f3cbe -EBUILD colobot-0.1.12.ebuild 1478 BLAKE2B a66d5c4aa584706868cfa8f76a368f6c614f48767a086946eafad83a44ae44d3c24a70650f4aa88971998495b70ff1122d02fded40193eda6f8fe07fb7de4080 SHA512 fcb8e33bccbf67cb835732630f1b84009202cce3a02dd7a497050f8fd91c3cb4ae54f62e3b24c62e1aa2687a4067aeced47cea1c7f5fe15a7707c451478bda83 +EBUILD colobot-0.1.12.ebuild 1574 BLAKE2B e75725e8752fe5daf1be82f6075dfc7c892a827eab53f5efed756572896635346303b856b644ee2767928f7b483e16d30917746ba146ce101330777e6c6982d0 SHA512 b4291c83da1895b78f13a3a6bedacb4a990337db6c1b489abb11436ab4ae64f331836fc41307ed303573b8dfef4fead127d71dda6694d76a0bd60ee6ddab81fd EBUILD colobot-9999.ebuild 1422 BLAKE2B 3c0d22a6df76aa3303567bff0b42c0e52aa765b0ec7e1dc6822125a949fcf94b89bc5957778e3aa2553a36c316105d96edcd9351629bb809b2a6187967ef1391 SHA512 791b6935cedfd32412d2fabf75cc388d7cc21bdd17262b713efbce5c1627e72fa78e152d305cc4b7aa59cdbed5b94f124b4a0e6cc7df6aa9081f3c2c9fa645de MISC metadata.xml 418 BLAKE2B b30194895d7f35dc6b2bf5ed2d6153ab03832eff44536e837058b4c5641760c55ea846a3ffe91027d8892ab7ccd4a36be688b89a5909c57ca57a18f8a610f022 SHA512 6ffc5220d200c722b0e7da2ee8734282ea0fabd7d319f8a21cd88da6743312c869f44bd3b14af7031ce970feb9b6c4349236db2a7aee69ea8041e3b000812e3c diff --git a/games-strategy/colobot/colobot-0.1.12.ebuild b/games-strategy/colobot/colobot-0.1.12.ebuild index 1611ef4a1d61..7f53954e4017 100644 --- a/games-strategy/colobot/colobot-0.1.12.ebuild +++ b/games-strategy/colobot/colobot-0.1.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -37,6 +37,11 @@ DEPEND=" RDEPEND="${DEPEND} games-strategy/colobot-data" +PATCHES=( + # https://github.com/colobot/colobot/pull/1300 + "${FILESDIR}"/${P}-includes.patch +) + src_prepare() { cmake-utils_src_prepare diff --git a/games-strategy/colobot/files/colobot-0.1.12-includes.patch b/games-strategy/colobot/files/colobot-0.1.12-includes.patch new file mode 100644 index 000000000000..1fb3a2730c44 --- /dev/null +++ b/games-strategy/colobot/files/colobot-0.1.12-includes.patch @@ -0,0 +1,23 @@ +From 2cfab017938e1cf44f633647eec2ccc2ed1da38b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Thu, 14 May 2020 10:35:01 +0200 +Subject: [PATCH] Fix missing <limits> include + +Add missing <limits> include for std::numeric_limits. This fixes +build failure after boost stopped implicitly including it for us. +--- + src/script/script.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/script/script.h b/src/script/script.h +index bc64dc232..dd4e02ff4 100644 +--- a/src/script/script.h ++++ b/src/script/script.h +@@ -27,6 +27,7 @@ + #include "CBot/CBot.h" + + #include <memory> ++#include <limits> + #include <string> + #include <boost/optional.hpp> + |