From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id IBaGBz6JG1+4IgAA0tVLHw (envelope-from ) for ; Sat, 25 Jul 2020 01:22:06 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 57FvAz6JG1+BMgAA1q6Kng (envelope-from ) for ; Sat, 25 Jul 2020 01:22:06 +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 BCE249403AA for ; Sat, 25 Jul 2020 01:22:05 +0000 (UTC) Received: from localhost ([::1]:46404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jz8t2-0003ow-Pg for larch@yhetil.org; Fri, 24 Jul 2020 21:22:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jz8t0-0003op-70 for guix-patches@gnu.org; Fri, 24 Jul 2020 21:22:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37458) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jz8sz-0007FL-Tt for guix-patches@gnu.org; Fri, 24 Jul 2020 21:22:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jz8sz-0004zA-QS for guix-patches@gnu.org; Fri, 24 Jul 2020 21:22:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42454] [PATCH] gnu: enigma: Fix enigma. Resent-From: Brett Gilio Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Jul 2020 01:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42454 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Jesse Gibbons Cc: 42454@debbugs.gnu.org Received: via spool by 42454-submit@debbugs.gnu.org id=B42454.159564009419122 (code B ref 42454); Sat, 25 Jul 2020 01:22:01 +0000 Received: (at 42454) by debbugs.gnu.org; 25 Jul 2020 01:21:34 +0000 Received: from localhost ([127.0.0.1]:49004 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jz8sY-0004yM-4c for submit@debbugs.gnu.org; Fri, 24 Jul 2020 21:21:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46728) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jz8sW-0004y6-TO for 42454@debbugs.gnu.org; Fri, 24 Jul 2020 21:21:33 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:36971) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jz8sR-0007DJ-Lh; Fri, 24 Jul 2020 21:21:27 -0400 Received: from [2605:6000:1a0d:48fb::e9] (port=60806 helo=lenovo-t430) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jz8sR-0007nH-3u; Fri, 24 Jul 2020 21:21:27 -0400 From: Brett Gilio References: <9d761881-01d7-7ac3-92a1-32ec5e63d47a@gmail.com> Date: Fri, 24 Jul 2020 20:21:37 -0500 In-Reply-To: <9d761881-01d7-7ac3-92a1-32ec5e63d47a@gmail.com> (Jesse Gibbons's message of "Tue, 21 Jul 2020 00:07:22 -0600") Message-ID: <874kpw5qzi.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: L7VzncOmCR8Y Jesse Gibbons writes: > * gnu/packages/games.scm: enigma(phases): Add 'fix-proxy. > --- > gnu/packages/games.scm | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm > index 2efbb3964e..14d47dcbe6 100644 > --- a/gnu/packages/games.scm > +++ b/gnu/packages/games.scm > @@ -5872,7 +5872,17 @@ The Flag. You can even design your own maps!") > (substitute* "src/main.cc" > (("#include " line header) > (string-append "#include \"SDL/SDL_" header ".h\""))) > - #t))))) > + #t)) > + (add-after 'find-sdl 'fix-proxy > + (lambda _ > + ;; Build fails when making src/lev/Proxy.cc because > + ;; the wrong operator overload is used. > + (substitute* "src/lev/Proxy.cc" > + (("ifs != NULL") > + "!ifs")) > + (display "...") > + #t)) > + ))) > (inputs > `(("xerces-c" ,xerces-c) > ("sdl-union" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-ttf))) Hey Jesse, Just like the last patch this one is mangled :).