Re: gnu: abbaye: Update to 2.0.1 from new repository.

[Alex Kost]

Adonay Felipe Nogueira (2017-01-15 11:48 -0200) wrote:

> After so much wait, we got L'Abbaye des Morts game out of Google
> Code. :)
>
> I had to remove the bundled fonts because they no longer use these
> directly in the game. It seems to be in their repository just because
> they don't want to lose the rare text font they found.

He-he :-)

> From 1991208b15a9a304224091c09dd80d01862d3e36 Mon Sep 17 00:00:00 2001
> From: Adonay Felipe Nogueira <address@hidden>
> Date: Sat, 14 Jan 2017 16:42:05 -0200
> Subject: [PATCH] gnu: abbaye: Update to 2.0.1 from new repository.
>
> * gnu/packages/games.scm: (abbaye): Update to 2.0.1.
> ---
>  gnu/packages/games.scm | 39 ++++++++++++++++++++-------------------
>  1 file changed, 20 insertions(+), 19 deletions(-)
>
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index c449f59..272fa0f 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -24,6 +24,7 @@
>  ;;; Copyright © 2016 Efraim Flashner <address@hidden>
>  ;;; Copyright © 2016 Jan Nieuwenhuizen <address@hidden>
>  ;;; Copyright © 2016 Steve Webber <address@hidden>
> +;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira 
> <https://libreplanet.org/wiki/User:Adfeno> <address@hidden>

Not sure what others think, but as for me, the above libreplanet link is
redundant…, and "adfeno" as well :-)

>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -176,22 +177,24 @@ scriptable with Guile.")
>  (define-public abbaye
>    (package
>      (name "abbaye")
> -    (version "1.13")
> +    (version "2.0.1")
>      (source
>       (origin
> -       (method url-fetch)
> -       (uri (string-append "https://storage.googleapis.com/";
> -                           
> "google-code-archive-downloads/v2/code.google.com/"
> -                           "abbaye-for-linux/abbaye-for-linux-src-"
> -                           version ".tar.gz"))
> +       (method git-fetch)
> +       (uri (git-reference
> +          (url "git://github.com/nevat/abbayedesmorts-gpl.git")
> +          (commit (string-append "v" version))))

I think we prefer to use tarball snapshots instead of git-fetch:

  https://github.com/nevat/abbayedesmorts-gpl/archive/v2.0.1.tar.gz

>         (sha256
>          (base32
> -         "1wgvckgqa2084rbskxif58wbb83xbas8s1i8s7d57xbj08ryq8rk"))))
> +         "1pwqf7r9bqb2p3xrw9i7y8pgr1401fy3mnnqpb1qkhmdl3gqi9hb"))
> +       (modules '((guix build utils)))
> +       (snippet
> +     '(begin
> +        ;; Unbundle fonts.
> +        (delete-file-recursively "fonts")))))
>      (build-system gnu-build-system)
>      (arguments
> -     '(#:modules ((ice-9 match)
> -                  (guix build gnu-build-system)
> -                  (guix build utils))
> +     '(#:make-flags '("CC=gcc")
>         #:phases (modify-phases %standard-phases
>                    (add-after 'set-paths 'set-sdl-paths
>                      (lambda* (#:key inputs #:allow-other-keys)
> @@ -199,12 +202,10 @@ scriptable with Guile.")
>                                (string-append (assoc-ref inputs "sdl-union")
>                                               "/include/SDL"))))
>                    (add-after 'patch-source-shebangs 'patch-makefile
> -                    (lambda* (#:key outputs #:allow-other-keys)
> -                      ;; Replace /usr with package output directory.
> -                      (for-each (lambda (file)
> -                                  (substitute* file
> -                                    (("/usr") (assoc-ref outputs "out"))))
> -                                '("makefile" "src/pantallas.c" 
> "src/comun.h"))))
> +                          (lambda* (#:key outputs #:allow-other-keys)
> +                                   ;; Replace /usr with package output 
> directory
> +                                   (substitute* "Makefile"
> +                                                (("/usr") (assoc-ref outputs 
> "out")))))

You broke the indentation here, (but it's not a problem; the one who
will commit it, will probably fix it).  So patching "src/pantallas.c"
and "src/comun.h" is not needed anymore, right?

-- 
Alex