GNU bug report logs - #36049
[PATCH] Add Ri-li

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 36049 in the body.
You can then email your comments to 36049 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: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: guix-patches <at> gnu.org
Subject: [PATCH] Add Ri-li
Date: Sun, 02 Jun 2019 01:07:23 +0200

[Message part 1 (text/plain, inline)]

Hello,

The following patch adds Ri-li game.

Regards,

-- 
Nicolas Goaziou

[0001-gnu-Add-ri-li.patch (text/x-diff, inline)]

From 05d43ade01c809d25d675e255468d1c85b877635 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
Date: Sun, 2 Jun 2019 01:03:08 +0200
Subject: [PATCH] gnu: Add ri-li.

* gnu/packages/games.scm (ri-li): New variable.
---
 gnu/packages/games.scm | 70 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 4fdc9b01e6..55f0df225d 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -7336,3 +7336,73 @@ Unfortunately, Hacker is not aware of Drascula's real ambitions: DOMINATING
 the World and demonstrating that he is even more evil than his brother Vlad.")
     ;; Drascula uses a BSD-like license.
     (license (license:non-copyleft "file:///readme.txt"))))
+
+(define-public ri-li
+  (package
+    (name "ri-li")
+    (version "2.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/ri-li/"
+                                  "Ri-li%20Linux_Unix/Ri-li%20V" version "/"
+                                  "Ri-li-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1gcdsgnnbbn1mb1hkpwniv3fhkaj1nn8gq33v5c16q3wqchcq77p"))
+              ;; Taken from
+              ;; <https://github.com/NixOS/nixpkgs/blob/master/pkgs/games/rili/moderinze_cpp.patch>.
+              ;; It doesn't build otherwise.
+              (patches (search-patches "ri-li-modernize_cpp.patch"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; Remove "gentoo" subdirectory from Makefile, as it is
+         ;; missing a make file and generates a build failure.
+         (add-after 'configure 'fix-build
+           (lambda _
+             (substitute* "Makefile"
+               ((" gentoo") ""))
+             #t))
+         (add-after 'install 'install-desktop-file
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (apps (string-append out "/share/applications"))
+                    (pixmaps (string-append out "/share/pixmaps")))
+               (for-each (lambda (f) (install-file f pixmaps))
+                         (find-files "data" "\\.(png|ico)$"))
+               (mkdir-p apps)
+               (with-output-to-file (string-append apps "/ri-li.desktop")
+                 (lambda _
+                   (format #t
+                           "[Desktop Entry]~@
+                     Name=Ri-li~@
+                     Exec=~a/bin/Ri_li~@
+                     Icon=~a/Ri-li-icon-32x32.png~@
+                     Categories=Game;ArcadeGame;~@
+                     Keywords=toy;train;wooden;snake-like;engine;~@
+                     Comment=a toy simulator game~@
+                     Comment[de]=Ein Spiel mit einem kleinen Zug~@
+                     Comment[fr]=un jeu de petit train~@
+                     Comment[ro_RO]=un joc cu un tren de jucărie~@
+                     Terminal=false~@
+                     Type=Application~%"
+                           out pixmaps))))
+             #t))
+         (add-after 'install-desktop-file 'remove-spurious-files
+           ;; Delete redundant files already installed somewhere else.
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (for-each delete-file
+                         (find-files (string-append out "/share/Ri-li")
+                                     "\\.(png|ico)|COPYING"))
+               #t))))))
+    (inputs
+     `(("sdl" ,(sdl-union (list sdl sdl-mixer)))))
+    (home-page "http://www.ri-li.org")
+    (synopsis "Toy train simulation game")
+    (description "Ri-li is a game in which you drive a wooden toy
+steam locomotive across many levels and collect all the coaches to
+win.")
+    ;; The project is dual-licensed GPL2+ and GPL3+.
+    (license (list license:gpl2+ license:gpl3+))))
-- 
2.21.0

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
Cc: 36049 <at> debbugs.gnu.org
Subject: Re: [bug#36049] [PATCH] Add Ri-li
Date: Thu, 13 Jun 2019 10:49:38 +0200

Hi Nicolas,

Nicolas Goaziou <mail <at> nicolasgoaziou.fr> skribis:

>>From 05d43ade01c809d25d675e255468d1c85b877635 Mon Sep 17 00:00:00 2001
> From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
> Date: Sun, 2 Jun 2019 01:03:08 +0200
> Subject: [PATCH] gnu: Add ri-li.
>
> * gnu/packages/games.scm (ri-li): New variable.

[...]

> +              (uri (string-append "mirror://sourceforge/ri-li/"
> +                                  "Ri-li%20Linux_Unix/Ri-li%20V" version "/"
> +                                  "Ri-li-" version ".tar.bz2"))
> +              (sha256
> +               (base32
> +                "1gcdsgnnbbn1mb1hkpwniv3fhkaj1nn8gq33v5c16q3wqchcq77p"))
> +              ;; Taken from
> +              ;; <https://github.com/NixOS/nixpkgs/blob/master/pkgs/games/rili/moderinze_cpp.patch>.
> +              ;; It doesn't build otherwise.
> +              (patches (search-patches "ri-li-modernize_cpp.patch"))))

Looks like you forgot the patch in this patch.  :-)

The rest LGTM.

Ludo’.

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

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 36049-done <at> debbugs.gnu.org
Subject: Re: [bug#36049] [PATCH] Add Ri-li
Date: Thu, 13 Jun 2019 14:01:49 +0200

Hello,

Ludovic Courtès <ludo <at> gnu.org> writes:

>> +              ;; Taken from
>> +              ;; <https://github.com/NixOS/nixpkgs/blob/master/pkgs/games/rili/moderinze_cpp.patch>.
>> +              ;; It doesn't build otherwise.
>> +              (patches (search-patches "ri-li-modernize_cpp.patch"))))
>
> Looks like you forgot the patch in this patch.  :-)

True. Peer review is a boon…

Applied. Thank you.

Regards,

-- 
Nicolas Goaziou

Previous Next

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