GNU bug report logs - #56886
[PATCH] gnu: queen-de: Fix build.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 56886 in the body.
You can then email your comments to 56886 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Felix Gruber <felgru <at> posteo.net>
To: guix-patches <at> gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH] gnu: queen-de: Fix build.
Date: Tue,  2 Aug 2022 13:04:33 +0000

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
-- 
2.30.2

Message #8 received at 56886 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> ist.tugraz.at>
To: Felix Gruber <felgru <at> posteo.net>, 56886 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: queen-de: Fix build.
Date: Wed, 03 Aug 2022 10:27:11 +0200

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

Message #11 received at 56886 <at> debbugs.gnu.org (full text, mbox):

From: Felix Gruber <felgru <at> posteo.net>
To: 56886 <at> debbugs.gnu.org,
 Liliana Marie Prikler <liliana.prikler <at> ist.tugraz.at>
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH v2] gnu: queen-de: Fix build.
Date: Thu,  4 Aug 2022 19:23:49 +0000

* gnu/packages/games.scm (make-queen-package)[arguments]: Only install
  readme.txt if it exists. The queen-de package that we create with
  make-queen-package does not contain a readme file, while all the other
  versions of the queen package have a readme file.
---
 gnu/packages/games.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 06084d1167..da722ade84 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -9810,7 +9810,9 @@ 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))
+             (for-each (lambda (file)
+                         (when (file-exists? file) (install-file file doc)))
+                       '("readme.txt" "README" "README.md")))
            (install-file "queen.1c" data)
            (mkdir-p bin)
            (let ((bash (assoc-ref %build-inputs "bash")))
-- 
2.30.2

Message #14 received at 56886 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> ist.tugraz.at>
To: Felix Gruber <felgru <at> posteo.net>, 56886 <at> debbugs.gnu.org
Subject: Re: [PATCH v2] gnu: queen-de: Fix build.
Date: Fri, 05 Aug 2022 08:15:29 +0200

Am Donnerstag, dem 04.08.2022 um 19:23 +0000 schrieb Felix Gruber:
> * gnu/packages/games.scm (make-queen-package)[arguments]: Only
> install
>   readme.txt if it exists. The queen-de package that we create with
>   make-queen-package does not contain a readme file, while all the
> other
>   versions of the queen package have a readme file.
The explanation goes before the ChangeLog, also there ought to be a
link to this issue.  Other than that LGTM.

Message #19 received at 56886-done <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Felix Gruber <felgru <at> posteo.net>, 56886-done <at> debbugs.gnu.org
Subject: Re: [PATCH v2] gnu: queen-de: Fix build.
Date: Sat, 06 Aug 2022 16:55:56 +0200

Am Donnerstag, dem 04.08.2022 um 19:23 +0000 schrieb Felix Gruber:
> * gnu/packages/games.scm (make-queen-package)[arguments]: Only
> install
>   readme.txt if it exists. The queen-de package that we create with
>   make-queen-package does not contain a readme file, while all the
> other
>   versions of the queen package have a readme file.
Pushed with a slight change to the ChangeLog.

Cheers

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.