From: Chris Lemmer-Webber <cwebber@dustycloud.org>
Cc: 49360-done@debbugs.gnu.org
Subject: bug#49360: Updating cataclysm-dda to 0.F
Date: Sat, 03 Jul 2021 17:21:58 -0400 [thread overview]
Message-ID: <87k0m7gkjt.fsf@dustycloud.org> (raw)
In-Reply-To: <87pmvzgoij.fsf@dustycloud.org>
Chris Lemmer-Webber writes:
> Hello!
>
> Here's a quick paste at the start of what's necessary to make this
> change:
>
> #+BEGIN_SRC diff
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index 831f6079f2..c2a8e4bb43 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -104,6 +104,7 @@
> #:use-module (gnu packages check)
> #:use-module (gnu packages cmake)
> #:use-module (gnu packages compression)
> + #:use-module (gnu packages code)
> #:use-module (gnu packages cpp)
> #:use-module (gnu packages curl)
> #:use-module (gnu packages crypto)
> @@ -835,7 +836,7 @@ high a score as possible.")
> (define-public cataclysm-dda
> (package
> (name "cataclysm-dda")
> - (version "0.E-3")
> + (version "0.F")
> (source
> (origin
> (method git-fetch)
> @@ -843,7 +844,7 @@ high a score as possible.")
> (url "https://github.com/CleverRaven/Cataclysm-DDA")
> (commit version)))
> (sha256
> - (base32 "108cs6vp99qmqqfnmczad0xjgcl82bypm5xszwnlfcswdsrfs4da"))
> + (base32 "1jid8lcl04y768b3psj1ifhx96lmd6fn1j2wzxhl4ic7ra66p2z3"))
> (file-name (git-file-name name version))))
> (build-system gnu-build-system)
> (arguments
> @@ -874,7 +875,8 @@ high a score as possible.")
> "tiles")) ;for tile graphics and sound support
> (native-inputs
> `(("gettext" ,gettext-minimal)
> - ("pkg-config" ,pkg-config)))
> + ("pkg-config" ,pkg-config)
> + ("astyle" ,astyle)))
> (inputs
> `(("freetype" ,freetype)
> ("libogg" ,libogg)
> #+END_SRC
>
> However it turns out this is not enough because building the
> curses-and-then-tiles versions is no longer supported. The following
> error will occur:
>
> cc1plus: error: pch/main-pch.hpp.gch: not used because `_XOPEN_SOURCE' not defined [-Werror=invalid-pch]
> cc1plus: error: unrecognized command line option ‘-Wno-unknown-warning-option’ [-Werror]
> cc1plus: all warnings being treated as errors
> make: *** [Makefile:962: obj/tiles/achievement.o] Error 1
> command "make" "TILES=1" "SOUND=1" "PREFIX=/gnu/store/s3r1hc84ph27jc0q648dx6yfpm9mgydh-cataclysm-dda-0.F-tiles" "USE_HOME_DIR=1" "DYNAMIC_LINKING=1" "RELEASE=1" "LOCALIZE=1" "LANGUAGES=all" failed with status 2
>
> There are two options.
>
> 1) We could mess with the build phase order, do a make install, then a
> fresh make clean, then make again with the tiles support on:
> https://github.com/CleverRaven/Cataclysm-DDA/issues/42598#issuecomment-667702746
>
> 2) But that seems strange so we could make a separate
> cataclysm-dda-tiles output. We already do a similar thing for crawl
> and crawl-tiles, so why not?
>
> What do people think? I'm leaning towards (2).
> - Chris
I've pushed a new version in b65af6ed91. I took the first of these two
routes, though I think in the long run the latter approach probably
makes more sense.
next prev parent reply other threads:[~2021-07-03 21:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-03 19:56 bug#49360: Updating cataclysm-dda to 0.F Chris Lemmer-Webber
2021-07-03 21:21 ` Chris Lemmer-Webber [this message]
2021-07-03 21:43 ` Nicolas Goaziou
2021-07-04 15:06 ` Chris Lemmer-Webber
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=87k0m7gkjt.fsf@dustycloud.org \
--to=cwebber@dustycloud.org \
--cc=49360-done@debbugs.gnu.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.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.