From patchwork Tue Jul 28 04:04:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Gibbons X-Patchwork-Id: 23421 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 41C1727BBE3; Tue, 28 Jul 2020 05:05:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C529E27BBE1 for ; Tue, 28 Jul 2020 05:05:07 +0100 (BST) Received: from localhost ([::1]:55110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0GrT-0007px-7Y for patchwork@mira.cbaines.net; Tue, 28 Jul 2020 00:05:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0GrO-0007pp-Do for guix-patches@gnu.org; Tue, 28 Jul 2020 00:05:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45356) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k0GrO-0001OO-48 for guix-patches@gnu.org; Tue, 28 Jul 2020 00:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k0GrN-0005BI-Tj for guix-patches@gnu.org; Tue, 28 Jul 2020 00:05:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42454] [PATCH] gnu: enigma: Fix enigma. Resent-From: Jesse Gibbons Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Jul 2020 04:05: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: Brett Gilio Cc: 42454@debbugs.gnu.org Received: via spool by 42454-submit@debbugs.gnu.org id=B42454.159590908219887 (code B ref 42454); Tue, 28 Jul 2020 04:05:01 +0000 Received: (at 42454) by debbugs.gnu.org; 28 Jul 2020 04:04:42 +0000 Received: from localhost ([127.0.0.1]:56902 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0Gqv-0005AY-4R for submit@debbugs.gnu.org; Tue, 28 Jul 2020 00:04:42 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:39935) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0Gqr-0005AJ-94 for 42454@debbugs.gnu.org; Tue, 28 Jul 2020 00:04:31 -0400 Received: by mail-pl1-f195.google.com with SMTP id b9so9214416plx.6 for <42454@debbugs.gnu.org>; Mon, 27 Jul 2020 21:04:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language; bh=LIhk+gnZAX7rTew6izvCbyDAaRuE6kO2Emv3nBN5eB4=; b=q5iGTMQYryp9jj0/MT9Ay4XU2pcw93ZTTgUuF+Kd051r3eOPR/GLeGQ3L40tG2gN5Z dQYO4YUC5MA38Zh+3OUPZvK9XK1/Q5u+6Q6YIX6H5LhkiJwsbeEzT39knp5hn2pnfOxn RIlxc2sjJR8uSwQe7Ltlgq66BRUU/cHYwN4q5QE8lZlqaFeY10V/gV0A9d79k0jrfNSy 5qDHpG6Vt1oZ+h0xOmee41PgctJUc/2UnEqxzzr3hqGYsSjXZWp5cRWq/zlYwuZc46Rx gWmViAN+LywFn73SyPq97BeKnxUbhpHXFhmWi2o5y8n11aChluZ0AwGeakH96O0+ZY7v j0yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=LIhk+gnZAX7rTew6izvCbyDAaRuE6kO2Emv3nBN5eB4=; b=A+l4Dk+U0HA36d9FnqZmWtTxdiYlSpPIAl+W3+7VCDIaOOIhmMrjuOYcXm9gph/+Ho UW1ByiuCX/vBaqqrHBhcQx25f7Yvoq19HJuJrlKo/M2RmSJ0SxFazZsrECfXh4xXXyCy kx7Zzeqb9Vm7wIgxtcvx/CTmNTeQdobDzcWH8Ts2ZtSZFn9IgVPxnokG9JQGuZGHuhNR iCbY3gA/DORo7/R3XH1YDsZc3YIgnfL/yvt+McdvlkUJtN7qQ4yFcPtith7lX8CemXj9 9m7eT0MeOEihrLb/H4jGWojNAblRPJ3pgS3j3kDkblGQ0APnshammpeUJ/GizgQHTfZL IwqQ== X-Gm-Message-State: AOAM533Nakfe2jikezpVXlUvPskw25X1oifIeD0z3CADrX09arsgPS3m QvlVC4RaiwUxlblg+9S39e2Lv2AR X-Google-Smtp-Source: ABdhPJxeJHGdg9su6yS/5aJA6nNjNIHjnCZXhm7yoJLZZA2j53Moz4fjOl1QenSVFuK+QpQeWEkEgQ== X-Received: by 2002:a17:902:b608:: with SMTP id b8mr21725736pls.81.1595909063034; Mon, 27 Jul 2020 21:04:23 -0700 (PDT) Received: from [192.168.1.25] ([38.141.58.134]) by smtp.gmail.com with ESMTPSA id a129sm6970775pfd.165.2020.07.27.21.04.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 27 Jul 2020 21:04:22 -0700 (PDT) References: <9d761881-01d7-7ac3-92a1-32ec5e63d47a@gmail.com> <874kpw5qzi.fsf@gnu.org> From: Jesse Gibbons Message-ID: <809b8336-0f80-423a-f754-4d2c5eefa8ae@gmail.com> Date: Mon, 27 Jul 2020 22:04:20 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Icedove/68.10.0 MIME-Version: 1.0 In-Reply-To: <874kpw5qzi.fsf@gnu.org> Content-Language: en-US X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Attached. I removed some debug code I had left in. On 7/24/20 7:21 PM, Brett Gilio wrote: > 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 :). From a2ed7bff6ff65518910edac44f7e498418042bfb Mon Sep 17 00:00:00 2001 From: Jesse Gibbons Date: Fri, 3 Jul 2020 18:35:57 -0600 Subject: [PATCH v2 1/1] gnu: enigma: Fix enigma. * gnu/packages/games.scm: enigma(phases): Add 'fix-proxy. --- gnu/packages/games.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2efbb3964e..057f7f2d45 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5872,7 +5872,16 @@ 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")) + #t)) + ))) (inputs `(("xerces-c" ,xerces-c) ("sdl-union" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-ttf))) -- 2.27.0