gnu: abbaye: Update to 2.0.1 from new repository.

gnu: abbaye: Update to 2.0.1 from new repository.

[Adonay Felipe Nogueira]

[-- Attachment #1: Type: text/plain, Size: 604 bytes --]

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.

I'm not a player myself, but I hope the players of this game enjoy
it. :)


Respectfully, Adonay.
-- 
* pt-BR: Brasileiro | en: Brazilian
* pt-BR: Ativista do software livre | en: Free/libre software activist
* https://libreplanet.org/wiki/User:Adfeno
* pt-BR: Palestrante, consultor e avaliador | en: Speaker, consultant and evaluator

[-- Attachment #2: gnu packages games abbaye.patch --]
[-- Type: text/x-diff, Size: 4338 bytes --]

> From 1991208b15a9a304224091c09dd80d01862d3e36 Mon Sep 17 00:00:00 2001
From: Adonay Felipe Nogueira <adfeno@openmailbox.org>
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 <efraim@flashner.co.il>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2016 Steve Webber <webber.sl@gmail.com>
+;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
 ;;;
 ;;; 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))))
        (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")))))
                   (add-before 'install 'make-install-dirs
                     (lambda* (#:key outputs #:allow-other-keys)
                       (let ((prefix (assoc-ref outputs "out")))
@@ -216,15 +217,15 @@ scriptable with Guile.")
                   (delete 'configure))
        #:tests? #f)) ;; No check target.
     (native-inputs `(("pkg-config" ,pkg-config)))
-    (inputs `(("sdl-union" ,(sdl-union))))
-    (home-page "http://code.google.com/p/abbaye-for-linux/")
+    (inputs `(("sdl-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer)))))
+    (home-page "https://github.com/nevat/abbayedesmorts-gpl")
     (synopsis "GNU/Linux port of the indie game \"l'Abbaye des Morts\"")
     (description "L'Abbaye des Morts is a 2D platform game set in 13th century
 France.  The Cathars, who preach about good Christian beliefs, were being
 expelled by the Catholic Church out of the Languedoc region in France.  One of
 them, called Jean Raymond, found an old church in which to hide, not knowing
 that beneath its ruins lay buried an ancient evil.")
-    (license license:gpl3+)))
+    (license license:gpl3)))
 
 (define-public pingus
   (package
-- 
1.9.1

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 <adfeno@openmailbox.org>
> 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 <efraim@flashner.co.il>
>  ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
>  ;;; Copyright © 2016 Steve Webber <webber.sl@gmail.com>
> +;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>

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

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

[Adonay Felipe Nogueira]

Hi all! :)

About my copyright notice: I try to always expose alternative ways with
which people can reach me, from less varying to most varying.

For example, last weeks I was forced to update the vCard I pointed out
in my LibrePlanet wiki user-page such that the reader knows that I would
be sending replies for emails received in my usual inbox from another
email address I trust. Now, however, since I can send emails with my
normal email address, I reverted the changes to the vCard file.

About suggestion to use tarball snapshots instead of git-fetch: That's
interesting, I once read that `guix refresh` would behave better with
git-fetch methods than with url-fetch methods. But, as I found out
recently, it does seem that git-fetch imposes heavy load due to the
current innability to make shallow clones. So I'm now waiting for
others' input in this matter: Should I reformat the patch such that
url-fetch is used instead?

About indentation: It seems my indentation setup is broken somewhere,
I'll try to redo my setup.

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

[Leo Famulari]

On Mon, Jan 23, 2017 at 10:46:01AM -0200, Adonay Felipe Nogueira wrote:
> About suggestion to use tarball snapshots instead of git-fetch: That's
> interesting, I once read that `guix refresh` would behave better with
> git-fetch methods than with url-fetch methods. But, as I found out
> recently, it does seem that git-fetch imposes heavy load due to the
> current innability to make shallow clones. So I'm now waiting for
> others' input in this matter: Should I reformat the patch such that
> url-fetch is used instead?

I prefer to use url-fetch with a tarball. First, upstream maintainers
have typically prepared the tarball beyond what can be found from a Git
tag. Second, it prevents the package from depending on Git, which is a
large package.

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

[Alex Kost]

Adonay Felipe Nogueira (2017-01-23 10:46 -0200) wrote:

> Hi all! :)
>
> About my copyright notice: I try to always expose alternative ways with
> which people can reach me, from less varying to most varying.

OK, I see that your other commits also have this libreplanet URL in the
copyright line, so I left it.

> About suggestion to use tarball snapshots instead of git-fetch: That's
> interesting, I once read that `guix refresh` would behave better with
> git-fetch methods than with url-fetch methods. But, as I found out
> recently, it does seem that git-fetch imposes heavy load due to the
> current innability to make shallow clones. So I'm now waiting for
> others' input in this matter: Should I reformat the patch such that
> url-fetch is used instead?

I modified it to use the tarball and applied as efc12a8, thanks! and
sorry for the delay.

-- 
Alex

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

[Adonay Felipe Nogueira]

I must also apologize for the late reply.

Thank you very much for your considerations, and also for expressing
your concerns! :)

I'm also sorry that I coudn't be of much help regarding correcting my
mistakes in the patch.
-- 
* https://libreplanet.org/wiki/User:Adfeno
* Palestrante e consultor sobre software livre (não confundir com
  gratis).
* "WhatsApp"? Ele não é livre, por isso não uso. Iguais a ele prefiro
  Ring, ou Tox. Quer outras formas de contato? Adicione o vCard que
  está no endereço acima aos teus contatos.
* Pretende me enviar arquivos .doc, .ppt, .cdr, ou .mp3? OK, eu
  aceito, mas não repasso. Entrego apenas em formatos favoráveis ao
  software livre. Favor entrar em contato em caso de dúvida.
* "People said I should accept the world. Bullshit! I don't accept the
  world."
                                                 --- Richard Stallman