| 1 |
commit: 075e0e10899dabb9e8c1dfc22b3b19a28a436c32 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 14 08:55:11 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 14 10:19:09 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=075e0e10 |
| 7 |
|
| 8 |
games-strategy/colobot: Fix build failure due to missing include |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
games-strategy/colobot/colobot-0.1.12.ebuild | 7 ++++++- |
| 13 |
.../colobot/files/colobot-0.1.12-includes.patch | 23 ++++++++++++++++++++++ |
| 14 |
2 files changed, 29 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/games-strategy/colobot/colobot-0.1.12.ebuild b/games-strategy/colobot/colobot-0.1.12.ebuild |
| 17 |
index 1611ef4a1d6..7f53954e401 100644 |
| 18 |
--- a/games-strategy/colobot/colobot-0.1.12.ebuild |
| 19 |
+++ b/games-strategy/colobot/colobot-0.1.12.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2019 Gentoo Authors |
| 22 |
+# Copyright 1999-2020 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI=7 |
| 26 |
@@ -37,6 +37,11 @@ DEPEND=" |
| 27 |
RDEPEND="${DEPEND} |
| 28 |
games-strategy/colobot-data" |
| 29 |
|
| 30 |
+PATCHES=( |
| 31 |
+ # https://github.com/colobot/colobot/pull/1300 |
| 32 |
+ "${FILESDIR}"/${P}-includes.patch |
| 33 |
+) |
| 34 |
+ |
| 35 |
src_prepare() { |
| 36 |
cmake-utils_src_prepare |
| 37 |
|
| 38 |
|
| 39 |
diff --git a/games-strategy/colobot/files/colobot-0.1.12-includes.patch b/games-strategy/colobot/files/colobot-0.1.12-includes.patch |
| 40 |
new file mode 100644 |
| 41 |
index 00000000000..1fb3a2730c4 |
| 42 |
--- /dev/null |
| 43 |
+++ b/games-strategy/colobot/files/colobot-0.1.12-includes.patch |
| 44 |
@@ -0,0 +1,23 @@ |
| 45 |
+From 2cfab017938e1cf44f633647eec2ccc2ed1da38b Mon Sep 17 00:00:00 2001 |
| 46 |
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 47 |
+Date: Thu, 14 May 2020 10:35:01 +0200 |
| 48 |
+Subject: [PATCH] Fix missing <limits> include |
| 49 |
+ |
| 50 |
+Add missing <limits> include for std::numeric_limits. This fixes |
| 51 |
+build failure after boost stopped implicitly including it for us. |
| 52 |
+--- |
| 53 |
+ src/script/script.h | 1 + |
| 54 |
+ 1 file changed, 1 insertion(+) |
| 55 |
+ |
| 56 |
+diff --git a/src/script/script.h b/src/script/script.h |
| 57 |
+index bc64dc232..dd4e02ff4 100644 |
| 58 |
+--- a/src/script/script.h |
| 59 |
++++ b/src/script/script.h |
| 60 |
+@@ -27,6 +27,7 @@ |
| 61 |
+ #include "CBot/CBot.h" |
| 62 |
+ |
| 63 |
+ #include <memory> |
| 64 |
++#include <limits> |
| 65 |
+ #include <string> |
| 66 |
+ #include <boost/optional.hpp> |
| 67 |
+ |
Archives