From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id G/ToLUDV4GCfIAEAgWs5BA (envelope-from ) for ; Sat, 03 Jul 2021 23:23:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id Fw4JKUDV4GB7AgAA1q6Kng (envelope-from ) for ; Sat, 03 Jul 2021 21:23:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2107817CAF for ; Sat, 3 Jul 2021 23:23:12 +0200 (CEST) Received: from localhost ([::1]:57988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzn6U-0002YH-Tz for larch@yhetil.org; Sat, 03 Jul 2021 17:23:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzn6M-0002Vr-7b for bug-guix@gnu.org; Sat, 03 Jul 2021 17:23:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56692) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzn6M-0004sc-04 for bug-guix@gnu.org; Sat, 03 Jul 2021 17:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzn6L-0004vl-Pv for bug-guix@gnu.org; Sat, 03 Jul 2021 17:23:01 -0400 Subject: bug#49360: Updating cataclysm-dda to 0.F Resent-From: Chris Lemmer-Webber Original-Sender: "Debbugs-submit" Resent-To: bug-guix@gnu.org Resent-Date: Sat, 03 Jul 2021 21:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 49360 X-GNU-PR-Package: guix X-GNU-PR-Keywords: Mail-Followup-To: 49360@debbugs.gnu.org, cwebber@dustycloud.org, cwebber@dustycloud.org Received: via spool by 49360-done@debbugs.gnu.org id=D49360.162534732218859 (code D ref 49360); Sat, 03 Jul 2021 21:23:01 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 49360-done@debbugs.gnu.org Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1625347392; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-to: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=iqbtMRIiuLlcoLiZWROfVO4YPFqu97QWd7fUOWK6/r4=; b=i6y0gyDabx4oV5ptSwbTYMXBfqP/QbRiPmt/7bBXxQ4IYuDic20C6robO1dOCcc3jvvXK3 7fsBsB2eblMyVMxVGJ52BAt6lYy0gQKn7JA4O36IJ7A/ejn2shFBvRPNzBJ//ngvUce0I+ Wa4L0+BnHfVI63d2FA0xD6Tvz+t1tSLHo/No1XLK9HIsULNa0C/gHM2OR7ycv4U+gvB9p5 uIKGvLB/C6cQve1AKFSXbUGBTweNNN5N0rpdV2LiR3+nI4JE9DPTW5NhqHk900PgZEmeiD ALvw5omsORuYuXGAt/+OEGVAPW5b05M+IbwJzH6u5fKn9RNcBn2YxS2yTLYUqA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1625347392; a=rsa-sha256; cv=none; b=qdiTKQkSSWGs+GkltZYtc/KWGgEzDZUQkFyUVxxEF3Of9voAWrLeKwylBwL3hkaqY2kZY4 G6CnokXqca+r1C714wIXIDM6083ddxrvYXmEzckTp0aq3eR9fnoseCmxYJLWgXKJ3Q9Jx4 ncIR1wOjf7vDOik/uPgA6UzrIiPQTyvVG25fzBMLZpVyIctqPyGBbxKwShlvbmxj7JVgll cTS8j2c+PkujmcTIk1SKKBfGsk8JemiLv1Z1VEa2lsbagNohjs04GjD7RfPe0Z0sEnxr2D lWFUGbSXHRaFxeNPzJvgnNSVq3RLWIevire5+CNLPg9NE4jUwAh4WA282jn8Xg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Spam-Score: -0.41 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: 2107817CAF X-Spam-Score: -0.41 X-Migadu-Scanner: scn0.migadu.com X-TUID: RZmwLEH+CAmX 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.