From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: Re: gnu: abbaye: Update to 2.0.1 from new repository. Date: Fri, 20 Jan 2017 20:31:49 +0300 Message-ID: <87efzxmyd6.fsf@gmail.com> References: <87d1foe8n3.fsf@openmailbox.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUd2b-0001fk-Q9 for guix-devel@gnu.org; Fri, 20 Jan 2017 12:32:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cUd2Y-0004Cd-1v for guix-devel@gnu.org; Fri, 20 Jan 2017 12:31:57 -0500 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]:35462) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cUd2X-0004Ap-Qg for guix-devel@gnu.org; Fri, 20 Jan 2017 12:31:54 -0500 Received: by mail-lf0-x243.google.com with SMTP id v186so9185515lfa.2 for ; Fri, 20 Jan 2017 09:31:52 -0800 (PST) In-Reply-To: <87d1foe8n3.fsf@openmailbox.org> (Adonay Felipe Nogueira's message of "Sun, 15 Jan 2017 11:48:48 -0200") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Adonay Felipe Nogueira Cc: guix-devel@gnu.org 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 > 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 =C2=A9 2016 Efraim Flashner > ;;; Copyright =C2=A9 2016 Jan Nieuwenhuizen > ;;; Copyright =C2=A9 2016 Steve Webber > +;;; Copyright =C2=A9 2017 Adonay "adfeno" Felipe Nogueira Not sure what others think, but as for me, the above libreplanet link is redundant=E2=80=A6, 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=3Dgcc") > #: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-unio= n") > "/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/comu= n.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? --=20 Alex