From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id KOZpMvox6mJTGwEAbAwnHQ (envelope-from ) for ; Wed, 03 Aug 2022 10:29:46 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id EKlfMvox6mIflwAA9RJhRA (envelope-from ) for ; Wed, 03 Aug 2022 10:29:46 +0200 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 62C14306D8 for ; Wed, 3 Aug 2022 10:29:46 +0200 (CEST) Received: from localhost ([::1]:40920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJ9lB-0007Oi-H0 for larch@yhetil.org; Wed, 03 Aug 2022 04:29:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJ9jW-0005bL-Ug for guix-patches@gnu.org; Wed, 03 Aug 2022 04:28:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56289) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oJ9jW-0006YL-K7 for guix-patches@gnu.org; Wed, 03 Aug 2022 04:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oJ9jW-0007J7-FW for guix-patches@gnu.org; Wed, 03 Aug 2022 04:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56886] [PATCH] gnu: queen-de: Fix build. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Aug 2022 08:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56886 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Felix Gruber , 56886@debbugs.gnu.org Received: via spool by 56886-submit@debbugs.gnu.org id=B56886.165951524028040 (code B ref 56886); Wed, 03 Aug 2022 08:28:02 +0000 Received: (at 56886) by debbugs.gnu.org; 3 Aug 2022 08:27:20 +0000 Received: from localhost ([127.0.0.1]:46038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oJ9ip-0007IB-Gx for submit@debbugs.gnu.org; Wed, 03 Aug 2022 04:27:19 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:21206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oJ9in-0007I1-6J for 56886@debbugs.gnu.org; Wed, 03 Aug 2022 04:27:18 -0400 Received: from lprikler-laptop.ist.intra (gw.ist.tugraz.at [129.27.202.101]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4LyQ2S11pZz3wjj; Wed, 3 Aug 2022 10:27:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1659515232; bh=OWkj21ZyclQEo8E2SfRukj2FSM/zR+GTcD3w2vyOQD4=; h=Subject:From:To:Date:In-Reply-To:References; b=bSznXIcRyb3x0FqLeCI0G/F1xCGhojGg1T0KM2m19scvvVmSElQEdyKei+/XURtxH GvRVBlopXROZlmtYkd6e2VUVz5RtaUovxGfRsIXzKEztVOGM8Tj60IWZmWQ5wqxGGw vD4c91i3FSDxnz5sUifkhL7RoyRv1qZnW0+pJSug= Message-ID: <5d0003ccaf8c29e87bb93a52c5c4a150e84b2c8b.camel@ist.tugraz.at> From: Liliana Marie Prikler Date: Wed, 03 Aug 2022 10:27:11 +0200 In-Reply-To: <20220802130433.43696-1-felgru@posteo.net> References: <20220802130433.43696-1-felgru@posteo.net> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: waObeELIUl4ypBWmcn/8wQ X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1659515386; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=OWkj21ZyclQEo8E2SfRukj2FSM/zR+GTcD3w2vyOQD4=; b=f01lddTLfFrmgnPg8GLRDOuy0rHto3bGPEC5iRTCNO5DwC0XwouXD4iJfmL+W+ODupqjIL hXsKasjH+jTLpBc2OjFP8q9LTLeWFjKQD5mnt2GqxhqKgVmotleJO3ur8xeQ6p/YnHaxQn OIfg8vtH4N0nEY4TFj7pdoWlKoTmxEtzjWkXb9v8K4glEEzXQjAQHnOzdCs3Y+NZlQ4y6h bY/Q1I9y5QmEXmrV/7TciRdE5/QDnJSmCcjr/wSZHGyFyIVUw8wFoM/rKR2PwA4vKn7YdU AxbMbqhwfkU/LtEW3e1x5yahFdhNrPAFI7GX3PdZpc+plez2nFoM2EVSBabt+Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1659515386; a=rsa-sha256; cv=none; b=NsQdIU1Nhc0frQVpkzSU5mJZ0RuoKuV7m+VfV9FitgatpQPKn4Dg4NEMlLrJZ8yDROJqfr IQn44dqFUzA1wWZxzCwHXt3T2Hkn8P7DDg+JGTUnM/w0faqmEP6E/5uKcAw3l6KenDSln8 Pn2//gqs777Z2SXIEPnIVAKoCVKLrJJ3ZQjH+ypn+DZ0CwWaXGfUeRpdGyVcZggkRIrC71 GpaJhQ30jkRDDt54OLccZAje3QMwzMbj/whIxbtR2rj9f+SWHauw4t9UR/0qYFIzD9J4pg 4iBMVaxX2SlYrwOUAh4AllKEnf0u6F5Lz4V/3HpPV4xT3ik1cCJH3rQL0/q/Tw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=bSznXIcR; dmarc=fail reason="SPF not aligned (relaxed)" header.from=tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 5.89 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=bSznXIcR; dmarc=fail reason="SPF not aligned (relaxed)" header.from=tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 62C14306D8 X-Spam-Score: 5.89 X-Migadu-Scanner: scn1.migadu.com X-TUID: A+ZBHxYcoE/O Am Dienstag, dem 02.08.2022 um 13:04 +0000 schrieb Felix Gruber: > 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"))) I'm pretty sure there ought to already be a phase that installs license information if it exists. Thus, rather than parametrizing readme-name, you should simply check whether the readme file exists. For example (for-each (lambda (file) (when (file-exists? file) (install-file file doc))) '("readme.txt" "README" "README.md" "DAS-IST-SEHR-WICHTIG-LIESMICH!!!11!einself.txt") Cheers