From patchwork Tue Aug 2 13:04:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 41096 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 A266C27BBEA; Tue, 2 Aug 2022 14:05:51 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4429627BBE9 for ; Tue, 2 Aug 2022 14:05:51 +0100 (BST) Received: from localhost ([::1]:56462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oIrao-00059V-BG for patchwork@mira.cbaines.net; Tue, 02 Aug 2022 09:05:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54228) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIra2-00055z-AK for guix-patches@gnu.org; Tue, 02 Aug 2022 09:05:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53079) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oIra1-00053e-TY for guix-patches@gnu.org; Tue, 02 Aug 2022 09:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oIra1-0003OC-OY for guix-patches@gnu.org; Tue, 02 Aug 2022 09:05:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56886] [PATCH] gnu: queen-de: Fix build. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 Aug 2022 13:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56886 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56886@debbugs.gnu.org Cc: Felix Gruber X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165944549413001 (code B ref -1); Tue, 02 Aug 2022 13:05:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Aug 2022 13:04:54 +0000 Received: from localhost ([127.0.0.1]:42826 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIrZu-0003Nd-1g for submit@debbugs.gnu.org; Tue, 02 Aug 2022 09:04:54 -0400 Received: from lists.gnu.org ([209.51.188.17]:43496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIrZq-0003NU-PI for submit@debbugs.gnu.org; Tue, 02 Aug 2022 09:04:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIrZq-0004wD-KG for guix-patches@gnu.org; Tue, 02 Aug 2022 09:04:50 -0400 Received: from mout02.posteo.de ([185.67.36.66]:49847) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIrZo-0004zz-2q for guix-patches@gnu.org; Tue, 02 Aug 2022 09:04:50 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id C821B240103 for ; Tue, 2 Aug 2022 15:04:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1659445484; bh=CD/Q78fB8Dsq9Ex6AWEWh7KGLgRZOGw4xyiWPjlgeeU=; h=From:To:Cc:Subject:Date:From; b=g2tfduh/bLTZd3rHO2U68YmexxnXw/2lnlWcdnXsh3n3TmIm2SraM818sXdvPpKt/ 4J0mktf6P82xLJslCJnjRCJrIyUpvg1knkFnRF8Q3y09azEwHkLzDx4qk/yLDn7iWU XRS9ps1WzMGeKy4bgWLls2WCNP8hn5axqDAzFpFkWqpaOcFQUcHxC9qEbjplpXANCL E23lBwV3kLlcWRCpdx2veeC9NTs7HpnyU9bWvkx4FCANkZhgMcu3L0H8lF4FYZ9eXT FeKPO8F6yDT0lXRRZs4O/AUi+pO3DGI5F2Niori7OLgH8Wu9df7xGpcpWQt5VfMUT5 b6ahPWclNALxw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4LxwF75tn8z6tmv; Tue, 2 Aug 2022 15:04:43 +0200 (CEST) From: Felix Gruber Date: Tue, 2 Aug 2022 13:04:33 +0000 Message-Id: <20220802130433.43696-1-felgru@posteo.net> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.66; envelope-from=felgru@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 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 The German language version of the queen package does not contain a readme.txt file, but instead contains a file COPYING. * gnu/packages/games.scm (make-queen-package): Add readme-name argument. [arguments]: Use readme-name to install the readme file. (queen-de): Set readme-name to COPYING. (queen,queen-fr,queen-it): Set readme-name to readme.txt. This keeps the previous behavior. --- gnu/packages/games.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8b655cc0e4..8303afa633 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9728,7 +9728,7 @@ Skorl. Maybe it would be an idea to try and escape...") (make-lure-package "lure-it" "it" "1ks6n39r1cllisrrh6pcr39swsdv7ng3gx5c47vaw71zzfr70hjj")) -(define (make-queen-package name file-prefix release language hash) +(define (make-queen-package name file-prefix release language readme-name hash) (package (name name) (version release) @@ -9756,7 +9756,7 @@ Skorl. Maybe it would be an idea to try and escape...") (let ((unzip (search-input-file %build-inputs "/bin/unzip"))) (invoke unzip "-j" (assoc-ref %build-inputs "source"))) (let ((doc (string-append share "/doc/" ,name "-" ,version))) - (install-file "readme.txt" doc)) + (install-file ,readme-name doc)) (install-file "queen.1c" data) (mkdir-p bin) (let ((bash (assoc-ref %build-inputs "bash"))) @@ -9807,22 +9807,22 @@ women and 6-foot-tall pygmies.") (define-public queen (make-queen-package - "queen" "FOTAQ_Talkie-" "1.1" "en" + "queen" "FOTAQ_Talkie-" "1.1" "en" "readme.txt" "1a6q71q1dl9vvw2qqsxk5h1sv0gaqy6236zr5905w2is01gdsp52")) (define-public queen-de (make-queen-package - "queen-de" "FOTAQ_Ger_talkie-" "1.0" "de" + "queen-de" "FOTAQ_Ger_talkie-" "1.0" "de" "COPYING" "13vn43x7214vyprlpqabvv71k890nff3d6fjscflr1ll7acjca3f")) (define-public queen-fr (make-queen-package - "queen-fr" "FOTAQ_Fr_Talkie_" "1.0" "fr" + "queen-fr" "FOTAQ_Fr_Talkie_" "1.0" "fr" "readme.txt" "0hq5g4qrkcwm2kn5i4kv4hijs9hi7bw9xl1vrwd1l69qqn30crwy")) (define-public queen-it (make-queen-package - "queen-it" "FOTAQ_It_Talkie_" "1.0" "it" + "queen-it" "FOTAQ_It_Talkie_" "1.0" "it" "readme.txt" "1h76y70lrpzfjkm53n4nr364nhyka54vbz9r7sadzyzl7c7ilv4d")) (define-public sky