From: Hartmut Goebel <h.goebel@crazy-compilers.com>
To: 38122@debbugs.gnu.org
Cc: Marius Bakke <mbakke@fastmail.com>
Subject: [bug#38122] [PATCH 012/197] gnu: pingus: Adjust for GCC 7.
Date: Fri, 8 Nov 2019 11:33:40 +0100 [thread overview]
Message-ID: <20191108103434.8390-13-h.goebel@crazy-compilers.com> (raw)
In-Reply-To: <20191108103434.8390-1-h.goebel@crazy-compilers.com>
From: Marius Bakke <mbakke@fastmail.com>
Fixes <https://bugs.gnu.org/37946>.
* gnu/packages/games.scm (pingus)[source](modules, snippet): New fields.
---
gnu/packages/games.scm | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 04b06c88ee..a2917a5f23 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -1445,7 +1445,16 @@ fight Morgoth, the Lord of Darkness.")
(base32
"0wp06kcmknsnxz7bjnsndb8x062z7r23fb3yrnbfnj68qhz18y74"))
(patches (search-patches "pingus-boost-headers.patch"
- "pingus-sdl-libs-config.patch"))))
+ "pingus-sdl-libs-config.patch"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (substitute* "src/pingus/screens/demo_session.cpp"
+ (("#include <iostream>")
+ ;; std::function moved to <functional> with C++ 11.
+ ;; Remove this for versions newer than 0.7.6.
+ "#include <iostream>\n#include <functional>"))
+ #t))))
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config)
("scons-python2" ,scons-python2)))
--
2.21.0
next prev parent reply other threads:[~2019-11-08 10:36 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-08 10:33 [bug#38122] [PATCH 0/1] qtwebkit: Uses sqlite-with-column-metadata Hartmut Goebel
2019-11-08 10:33 ` [bug#38122] [PATCH 001/197] gnu: Add emacs-eshell-prompt-extras Hartmut Goebel
2019-11-08 10:33 ` [bug#38122] [PATCH 1/1] gnu: qtwebkit: Uses sqlite-with-column-metadata Hartmut Goebel
2019-11-08 10:33 ` [bug#38122] [PATCH 002/197] gnu: Add emacs-eshell-did-you-mean Hartmut Goebel
2019-11-08 10:33 ` [bug#38122] [PATCH 003/197] gnu: Fix attribution Hartmut Goebel
2019-11-08 10:33 ` [bug#38122] [PATCH 004/197] gnu: make-nsis: Fix cross-compilation Hartmut Goebel
2019-11-08 10:33 ` [bug#38122] [PATCH 005/197] gnu: Add dxvk Hartmut Goebel
2019-11-08 10:33 ` [bug#38122] [PATCH 006/197] gnu: Fix make-gcc-libc Hartmut Goebel
2019-11-08 10:33 ` [bug#38122] [PATCH 007/197] gnu: Add gitg Hartmut Goebel
2019-11-08 10:33 ` [bug#38122] [PATCH 008/197] gnu: Add python-keyutils Hartmut Goebel
2019-11-08 10:33 ` [bug#38122] [PATCH 009/197] gnu: Add udiskie Hartmut Goebel
2019-11-08 10:33 ` [bug#38122] [PATCH 010/197] services: ntp: Ensure no double quotes are output to config file Hartmut Goebel
2019-11-08 10:33 ` [bug#38122] [PATCH 011/197] gnu: pingus: Update source URI Hartmut Goebel
2019-11-08 10:33 ` Hartmut Goebel [this message]
2019-11-08 10:33 ` [bug#38122] [PATCH 013/197] gnu: Remove python2-feather-format Hartmut Goebel
2019-11-08 10:33 ` [bug#38122] [PATCH 014/197] gnu: u-boot: Remove redundant GCC input Hartmut Goebel
2019-11-08 10:33 ` [bug#38122] [PATCH 015/197] gnu: pocl: Update to 1.4 Hartmut Goebel
2019-11-08 10:33 ` [bug#38122] [PATCH 016/197] gnu: icecat: Update to 68.2.0-guix0-preview3 Hartmut Goebel
2019-11-08 10:33 ` [bug#38122] [PATCH 017/197] gnu: Chibi-Scheme: Update to 0.8 Hartmut Goebel
2019-11-08 10:33 ` [bug#38122] [PATCH 018/197] gnu: Chibi-Scheme: Do not use unstable tarball Hartmut Goebel
2019-11-08 10:33 ` [bug#38122] [PATCH 019/197] gnu: bitcoin-abc: Update to 0.20.4 Hartmut Goebel
2019-11-08 10:33 ` [bug#38122] [PATCH 020/197] services: ntp: Fix a crash when using legacy configuration Hartmut Goebel
2019-11-08 10:33 ` [bug#38122] [PATCH 021/197] gnu: musescore: Update to 3.3 Hartmut Goebel
2019-11-08 10:36 ` bug#38122: Faulty patchset Hartmut Goebel
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191108103434.8390-13-h.goebel@crazy-compilers.com \
--to=h.goebel@crazy-compilers.com \
--cc=38122@debbugs.gnu.org \
--cc=mbakke@fastmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).