From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 03 15:56:27 2021 Received: (at submit) by debbugs.gnu.org; 3 Jul 2021 19:56:27 +0000 Received: from localhost ([127.0.0.1]:39901 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzlkZ-0002lH-4L for submit@debbugs.gnu.org; Sat, 03 Jul 2021 15:56:27 -0400 Received: from lists.gnu.org ([209.51.188.17]:52364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzlkW-0002l9-93 for submit@debbugs.gnu.org; Sat, 03 Jul 2021 15:56:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzlkV-0000UV-WC for bug-guix@gnu.org; Sat, 03 Jul 2021 15:56:24 -0400 Received: from dustycloud.org ([50.116.34.160]:33318) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzlkU-0007lU-3W for bug-guix@gnu.org; Sat, 03 Jul 2021 15:56:23 -0400 Received: from twig (localhost [127.0.0.1]) by dustycloud.org (Postfix) with ESMTPS id 9B09E2661B for ; Sat, 3 Jul 2021 15:56:20 -0400 (EDT) User-agent: mu4e 1.4.15; emacs 27.2 From: Chris Lemmer-Webber To: bug-guix@gnu.org Subject: Updating cataclysm-dda to 0.F Message-ID: <87pmvzgoij.fsf@dustycloud.org> Date: Sat, 03 Jul 2021 15:56:20 -0400 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=50.116.34.160; envelope-from=cwebber@dustycloud.org; helo=dustycloud.org X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) 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 suppo= rt (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' no= t defined [-Werror=3Dinvalid-pch] cc1plus: error: unrecognized command line option =E2=80=98-Wno-unknown-wa= rning-option=E2=80=99 [-Werror] cc1plus: all warnings being treated as errors make: *** [Makefile:962: obj/tiles/achievement.o] Error 1 command "make" "TILES=3D1" "SOUND=3D1" "PREFIX=3D/gnu/store/s3r1hc84ph27j= c0q648dx6yfpm9mgydh-cataclysm-dda-0.F-tiles" "USE_HOME_DIR=3D1" "DYNAMIC_LI= NKING=3D1" "RELEASE=3D1" "LOCALIZE=3D1" "LANGUAGES=3Dall" failed with statu= s 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 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 03 17:22:02 2021 Received: (at 49360-done) by debbugs.gnu.org; 3 Jul 2021 21:22:02 +0000 Received: from localhost ([127.0.0.1]:40003 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzn5O-0004u6-5B for submit@debbugs.gnu.org; Sat, 03 Jul 2021 17:22:02 -0400 Received: from dustycloud.org ([50.116.34.160]:59602) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzn5M-0004th-5V for 49360-done@debbugs.gnu.org; Sat, 03 Jul 2021 17:22:00 -0400 Received: from twig (localhost [127.0.0.1]) by dustycloud.org (Postfix) with ESMTPS id 409AE2661B for <49360-done@debbugs.gnu.org>; Sat, 3 Jul 2021 17:21:59 -0400 (EDT) References: <87pmvzgoij.fsf@dustycloud.org> User-agent: mu4e 1.4.15; emacs 27.2 From: Chris Lemmer-Webber Subject: Re: bug#49360: Updating cataclysm-dda to 0.F In-reply-to: <87pmvzgoij.fsf@dustycloud.org> Date: Sat, 03 Jul 2021 17:21:58 -0400 Message-ID: <87k0m7gkjt.fsf@dustycloud.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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..c2a8e4 [...] Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 1.2 MISSING_HEADERS Missing To: header -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Debbugs-Envelope-To: 49360-done Cc: 49360-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) 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 sup= port > (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=3Dinvalid-pch] > cc1plus: error: unrecognized command line option =E2=80=98-Wno-unknown-= warning-option=E2=80=99 [-Werror] > cc1plus: all warnings being treated as errors > make: *** [Makefile:962: obj/tiles/achievement.o] Error 1 > command "make" "TILES=3D1" "SOUND=3D1" "PREFIX=3D/gnu/store/s3r1hc84ph2= 7jc0q648dx6yfpm9mgydh-cataclysm-dda-0.F-tiles" "USE_HOME_DIR=3D1" "DYNAMIC_= LINKING=3D1" "RELEASE=3D1" "LOCALIZE=3D1" "LANGUAGES=3Dall" failed with sta= tus 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#issuecomme= nt-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. From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 03 17:44:05 2021 Received: (at 49360) by debbugs.gnu.org; 3 Jul 2021 21:44:05 +0000 Received: from localhost ([127.0.0.1]:40022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lznQj-0005Rk-KX for submit@debbugs.gnu.org; Sat, 03 Jul 2021 17:44:05 -0400 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:41723) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lznQf-0005R6-PT for 49360@debbugs.gnu.org; Sat, 03 Jul 2021 17:44:04 -0400 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id C510520003; Sat, 3 Jul 2021 21:43:54 +0000 (UTC) From: Nicolas Goaziou To: 49360@debbugs.gnu.org Subject: Re: bug#49360: Updating cataclysm-dda to 0.F References: <87pmvzgoij.fsf@dustycloud.org> <87k0m7gkjt.fsf@dustycloud.org> Date: Sat, 03 Jul 2021 23:43:53 +0200 In-Reply-To: <87k0m7gkjt.fsf@dustycloud.org> (Chris Lemmer-Webber's message of "Sat, 03 Jul 2021 17:21:58 -0400") Message-ID: <87pmvzqdie.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 49360 Cc: cwebber@dustycloud.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Chris Lemmer-Webber writes: >> 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. FWIW, I also think the second path makes more sense. Regards, -- Nicolas Goaziou From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 04 11:06:12 2021 Received: (at 49360) by debbugs.gnu.org; 4 Jul 2021 15:06:12 +0000 Received: from localhost ([127.0.0.1]:43029 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m03hD-00016k-Sc for submit@debbugs.gnu.org; Sun, 04 Jul 2021 11:06:12 -0400 Received: from dustycloud.org ([50.116.34.160]:59604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m03hB-00016a-M8 for 49360@debbugs.gnu.org; Sun, 04 Jul 2021 11:06:11 -0400 Received: from twig (localhost [127.0.0.1]) by dustycloud.org (Postfix) with ESMTPS id D07C526652; Sun, 4 Jul 2021 11:06:08 -0400 (EDT) References: <87pmvzgoij.fsf@dustycloud.org> <87k0m7gkjt.fsf@dustycloud.org> <87pmvzqdie.fsf@nicolasgoaziou.fr> User-agent: mu4e 1.4.15; emacs 27.2 From: Chris Lemmer-Webber To: Nicolas Goaziou Subject: Re: bug#49360: Updating cataclysm-dda to 0.F In-reply-to: <87pmvzqdie.fsf@nicolasgoaziou.fr> Date: Sun, 04 Jul 2021 11:06:08 -0400 Message-ID: <87h7haglun.fsf@dustycloud.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 49360 Cc: 49360@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Nicolas Goaziou writes: > Hello, > > Chris Lemmer-Webber writes: > >>> 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. > > FWIW, I also think the second path makes more sense. > > Regards, Yes, it would be good to go that route if someone is willing to take the time to split it up. From unknown Sun Jun 15 08:47:25 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 02 Aug 2021 11:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator