From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot/, games-strategy/colobot/files/
Date: Thu, 14 May 2020 10:19:21 +0000 (UTC) [thread overview]
Message-ID: <1589451549.075e0e10899dabb9e8c1dfc22b3b19a28a436c32.mgorny@gentoo> (raw)
commit: 075e0e10899dabb9e8c1dfc22b3b19a28a436c32
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 08:55:11 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 14 10:19:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=075e0e10
games-strategy/colobot: Fix build failure due to missing include
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
games-strategy/colobot/colobot-0.1.12.ebuild | 7 ++++++-
.../colobot/files/colobot-0.1.12-includes.patch | 23 ++++++++++++++++++++++
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/games-strategy/colobot/colobot-0.1.12.ebuild b/games-strategy/colobot/colobot-0.1.12.ebuild
index 1611ef4a1d6..7f53954e401 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 00000000000..1fb3a2730c4
--- /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>
+
next reply other threads:[~2020-05-14 10:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-14 10:19 Michał Górny [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-04-19 4:32 [gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot/, games-strategy/colobot/files/ Sam James
2023-11-14 18:21 Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1589451549.075e0e10899dabb9e8c1dfc22b3b19a28a436c32.mgorny@gentoo \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox