From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id iIV6J0mGFl+CeQAA0tVLHw (envelope-from ) for ; Tue, 21 Jul 2020 06:08:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id MFctI0mGFl/TYwAAbx9fmQ (envelope-from ) for ; Tue, 21 Jul 2020 06:08:09 +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 0F97B9403A7 for ; Tue, 21 Jul 2020 06:08:09 +0000 (UTC) Received: from localhost ([::1]:53840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jxlRg-0004va-13 for larch@yhetil.org; Tue, 21 Jul 2020 02:08:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45926) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxlRa-0004vG-7V for guix-patches@gnu.org; Tue, 21 Jul 2020 02:08:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54087) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jxlRZ-0000n8-UQ for guix-patches@gnu.org; Tue, 21 Jul 2020 02:08:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jxlRZ-0003Cr-Q9 for guix-patches@gnu.org; Tue, 21 Jul 2020 02:08: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, 21 Jul 2020 06:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42454 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42454@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.159531165212285 (code B ref -1); Tue, 21 Jul 2020 06:08:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Jul 2020 06:07:32 +0000 Received: from localhost ([127.0.0.1]:37400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jxlR5-0003C5-Lj for submit@debbugs.gnu.org; Tue, 21 Jul 2020 02:07:31 -0400 Received: from lists.gnu.org ([209.51.188.17]:41288) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jxlR3-0003Bw-QP for submit@debbugs.gnu.org; Tue, 21 Jul 2020 02:07:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45836) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxlR2-0004uM-6s for guix-patches@gnu.org; Tue, 21 Jul 2020 02:07:29 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:40795) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jxlR0-0000li-7V for guix-patches@gnu.org; Tue, 21 Jul 2020 02:07:27 -0400 Received: by mail-pl1-x62f.google.com with SMTP id l6so9780174plt.7 for ; Mon, 20 Jul 2020 23:07:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:message-id:date:user-agent:mime-version :content-transfer-encoding:content-language; bh=OZlbkqrTgpdwWS3r2uPwD1iBo18xgSID9IQlWVmieCU=; b=UaLxcM5UydB19eSouG2kTPq1g+s3Ml0bs2Gis9/0O0IkiXpYHg7c39UKdBz7PFxczI Leo71BgpRNnhezjhv3kJ5Un3k+La9AKFVoSRevNukh7Gg9w2zBrt2LR0InMTJojPUJwT t8LtpwlKwNiDMBb1HX+I+Vp8oK5MImHzpaiA+hHrdrSOo6wr1xTAwRnvYICnU+s1cAGz 24xD6ePRYjamkfCrv0KcdQ6tUkts+NuU/lgzl9FUBlGkINh6zhde/NCGV/Jn1+cRaTjX b0BTfV+miha/33eCdeKG+eV+HJ4bjWJ0s+KQ3tosBEuMFvUL+2m1VgYf2I9k8KBsO6YX M3tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:message-id:date:user-agent :mime-version:content-transfer-encoding:content-language; bh=OZlbkqrTgpdwWS3r2uPwD1iBo18xgSID9IQlWVmieCU=; b=OcfAivewCNcgEbXmLWY6w/VpSW/LRmjoP1Fp5jGsuxNuRPpIwBrE2Ag5QbvjFZr+fW Zwxod51wZsQMJD6kpad/oowCQQRhZ+3kExDq0j9agnUWMAljF5KcQrDGad2H1zVJwpsX v7YcqsXKhCVEEQ0dryb8Pe1i90ufPX0u70+WSyuxYGdn5Y7ud8CEHVbz69Evx0wMR2Tb ws8fNUOjnoaHllMUy7s6KmWaMA3QRr8fWSm1EjKsmVqvrbD509+zuTsR5bcmOh6e+wWG piZUiM8sVk+hWj5RyUg9IYo2wcWVGhR2A5whzwPdrgf2QOwlhzJdU2Yjwu2Zap91RAIB Cw+Q== X-Gm-Message-State: AOAM532PWSP5pLRnEf8JPRGvMdYus6EjTVbzrB3ko8TVms5oHgfGl4Xd L3HnuvIirT5ZqeFAT+5aMbIN4PU6 X-Google-Smtp-Source: ABdhPJx2Ui0XW+JaOLHKfMZkh7dQ0NjJ45MQdyvZ7iIE38+37RjICfi3Fp9M59cXlXuaTwJuE/tijA== X-Received: by 2002:a17:90a:2e85:: with SMTP id r5mr3128207pjd.232.1595311644040; Mon, 20 Jul 2020 23:07:24 -0700 (PDT) Received: from [192.168.1.25] ([38.141.58.134]) by smtp.gmail.com with ESMTPSA id b14sm18821249pfo.28.2020.07.20.23.07.23 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 20 Jul 2020 23:07:23 -0700 (PDT) From: Jesse Gibbons Message-ID: <9d761881-01d7-7ac3-92a1-32ec5e63d47a@gmail.com> Date: Tue, 21 Jul 2020 00:07:22 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Icedove/68.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=jgibbons2357@gmail.com; helo=mail-pl1-x62f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.1 (--) 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=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=UaLxcM5U; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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: 0.09 X-TUID: U15xPpoqks7r * 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)))