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 mHXyGBbB4GBKAgEAgWs5BA (envelope-from ) for ; Sat, 03 Jul 2021 21:57:10 +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 UJieFBbB4GDhPAAA1q6Kng (envelope-from ) for ; Sat, 03 Jul 2021 19:57:10 +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 BB79C17006 for ; Sat, 3 Jul 2021 21:57:09 +0200 (CEST) Received: from localhost ([::1]:36628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzllE-0000VI-R6 for larch@yhetil.org; Sat, 03 Jul 2021 15:57:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzll8-0000V9-Ql for bug-guix@gnu.org; Sat, 03 Jul 2021 15:57:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56588) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzll8-0008Nd-I9 for bug-guix@gnu.org; Sat, 03 Jul 2021 15:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzll8-0002mE-GB for bug-guix@gnu.org; Sat, 03 Jul 2021 15:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#49360: Updating cataclysm-dda to 0.F Resent-From: Chris Lemmer-Webber Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 03 Jul 2021 19:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49360 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 49360@debbugs.gnu.org X-Debbugs-Original-To: bug-guix@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162534218710624 (code B ref -1); Sat, 03 Jul 2021 19:57:02 +0000 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 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-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: , 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=1625342229; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=dBnrerB5+tzcht5u0GZ74a3XZbNJ2dX0AyBi/8lLkTE=; b=GlXNiFTELVNVpwoF9GIRfBlQMET2k1boGqQMEL3obYLMTIsuDTjYMqyeP+H104q2jQHfF4 /0dLKDvggB8UnQAClZ4gL7akzselGaDwLRXE/CKlUJ1cAFuQ4KHv4CKfaTlafzZceQ1VYY S15Na1JVFBbJReEoe4voiOFO4SgfAqBj7z5fZqygU1YBhXkR34RWHGIRHoyUlivvat7jD/ 8i86cB1ew7NzF+ewElK0SQFr/GeuAPZRzrM//ZUUQwRUZ11zuzOL6PWEZLhOkoWiQeae3h For/R6v4iNapY5goTQoL8MI7948DIKvE8NMImK3435HFLlVQVpmF7HkYFP0Wug== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1625342229; a=rsa-sha256; cv=none; b=n7uO1BonRty36bie+fL2mSKOdViMIFb4jTNDylpSlE4O5sjjI222IXMUUWA8EbLrfk8drq whfLl7XcJveAqRjGAp5uNW3g4sYaQrjCJLc0Ujn3QzqpYVullNGG5kAmkUIAUicX0ZO6Da V2HsgRCDSg+sK52F+GqEIl54jDwsOLSCquEY9Bh7Jh6J7z0Uiw5dcCH2UocELdrjRCUqNj UsMipqI11/ssEspL5KrwjHB5ulxapMig/YyRM8QEX2TsQyrtPUjeuDxJR0uq17O88bGscv +rTNYux9RdkcpsMmbPwWtQbu83pVGrE0mSuvfLoloWTP64rB0arvcekFGpgUVQ== 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: -2.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: BB79C17006 X-Spam-Score: -2.41 X-Migadu-Scanner: scn0.migadu.com X-TUID: CsTB6gEuOS8D 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