GNU bug report logs - #50653
[PATCH] gnu: Add sdlpop.

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 50653 in the body.
You can then email your comments to 50653 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: phodina <phodina <at> protonmail.com>
To: "guix-patches <at> gnu.org" <guix-patches <at> gnu.org>
Subject: [PATCH] gnu: Add sdlpop.
Date: Sat, 18 Sep 2021 09:49:10 +0000

* gnu/packages/games.scm (sdlpop): New variable.
  [copyright]: Sort by date pkill9 <at> runbox.com.

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index c39770c260..0eed238f32 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -45,6 +45,7 @@
 ;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv <at> posteo.net>
 ;;; Copyright © 2019, 2020 Timotej Lazar <timotej.lazar <at> araneo.si>
 ;;; Copyright © 2019 Josh Holland <josh <at> inv.alid.pw>
+;;; Copyright © 2019 Pkill -9 <pkill9 <at> runbox.com>
 ;;; Copyright © 2017, 2019 Hartmut Goebel <h.goebel <at> crazy-compilers.com>
 ;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero <barbanegra+guix <at> posteo.mx>
 ;;; Copyright © 2020 Naga Malleswari <nagamalli <at> riseup.net>
@@ -63,7 +64,7 @@
 ;;; Copyright © 2021 Felix Gruber <felgru <at> posteo.net>
 ;;; Copyright © 2021 Solene Rapenne <solene <at> perso.pw>
 ;;; Copyright © 2021 Noisytoot <noisytoot <at> disroot.org>
-;;; Copyright © 2019 Pkill -9 <pkill9 <at> runbox.com>
+;;; Copyright © 2021 Petr Hodina <phodina <at> protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -12480,6 +12481,62 @@ do so you need to explore the island, find food, build a shelter and try to
 get attention, so you get found.")
       (license license:cc-by4.0))))

+(define-public sdlpop
+  (package
+    (name "sdlpop")
+    (version "1.22")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/NagyD/SDLPoP")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1yy5r1r0hv0xggk8qd8bwk2zy7abpv89nikq4flqgi53fc5q9xl7"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (add-before 'build 'prepare-build
+           ;; Set correct environment for SDL.
+           (lambda* (#:key inputs #:allow-other-keys)
+             (setenv "CPATH"
+                     (string-append (assoc-ref inputs "sdl")
+                                    "/include/SDL2:"
+                                    (or (getenv "CPATH") "")))))
+         (add-after 'unpack 'chdir
+           (lambda* _
+             (chdir "src")))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (opt (string-append out "/opt/sdlpop"))
+                    (app (string-append out "/usr/share/applications"))
+                    (template "src/SDLPoP.desktop.template"))
+               (chdir "..")
+               (install-file "prince" bin)
+               (substitute* template (("\\$ROOT") out))
+               (install-file template app)
+               (rename-file (string-append app "/SDLPoP.desktop.template")
+                            (string-append app "/SDLPoP.desktop"))
+               (install-file "SDLPoP.ini" opt)
+               (copy-recursively "data" (string-append bin "/data"))
+               (copy-recursively "doc" opt)
+               (copy-recursively "mods" opt)))))))
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs `(("sdl" ,(sdl-union (list sdl2
+                                       sdl2-image
+                                       sdl2-mixer)))))
+    (synopsis "Open-source port of Prince of Persia")
+    (description "Open-source port of Prince of Persia, based on the disassembly
+of the DOS version, extended with new features.")
+    (home-page "https://github.com/NagyD/SDLPoP")
+    (license license:gpl3)))
+
 (define-public fheroes2
   (package
     (name "fheroes2")
--
2.32.0

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

From: Xinglu Chen <public <at> yoctocell.xyz>
To: phodina <phodina <at> protonmail.com>, 50653 <at> debbugs.gnu.org
Subject: Re: [bug#50653] [PATCH] gnu: Add sdlpop.
Date: Mon, 20 Sep 2021 14:19:26 +0200

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

On Sat, Sep 18 2021, phodina via Guix-patches via wrote:

> * gnu/packages/games.scm (sdlpop): New variable.
>   [copyright]: Sort by date pkill9 <at> runbox.com.
>
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index c39770c260..0eed238f32 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -45,6 +45,7 @@
>  ;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv <at> posteo.net>
>  ;;; Copyright © 2019, 2020 Timotej Lazar <timotej.lazar <at> araneo.si>
>  ;;; Copyright © 2019 Josh Holland <josh <at> inv.alid.pw>
> +;;; Copyright © 2019 Pkill -9 <pkill9 <at> runbox.com>
>  ;;; Copyright © 2017, 2019 Hartmut Goebel <h.goebel <at> crazy-compilers.com>
>  ;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero <barbanegra+guix <at> posteo.mx>
>  ;;; Copyright © 2020 Naga Malleswari <nagamalli <at> riseup.net>
> @@ -63,7 +64,7 @@
>  ;;; Copyright © 2021 Felix Gruber <felgru <at> posteo.net>
>  ;;; Copyright © 2021 Solene Rapenne <solene <at> perso.pw>
>  ;;; Copyright © 2021 Noisytoot <noisytoot <at> disroot.org>
> -;;; Copyright © 2019 Pkill -9 <pkill9 <at> runbox.com>
> +;;; Copyright © 2021 Petr Hodina <phodina <at> protonmail.com>

I don’t think sorting copyright lines is necessary.

>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -12480,6 +12481,62 @@ do so you need to explore the island, find food, build a shelter and try to
>  get attention, so you get found.")
>        (license license:cc-by4.0))))
>
> +(define-public sdlpop
> +  (package
> +    (name "sdlpop")
> +    (version "1.22")
> +    (source (origin
> +              (method git-fetch)
> +              (uri (git-reference
> +                    (url "https://github.com/NagyD/SDLPoP")
> +                    (commit (string-append "v" version))))
> +              (file-name (git-file-name name version))
> +              (sha256
> +               (base32
> +                "1yy5r1r0hv0xggk8qd8bwk2zy7abpv89nikq4flqgi53fc5q9xl7"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     `(#:tests? #f

What’s the reason for disabling tests?  There should a comment
explaining why.

> +       #:phases
> +       (modify-phases %standard-phases
> +         (delete 'configure)
> +         (add-before 'build 'prepare-build
> +           ;; Set correct environment for SDL.
> +           (lambda* (#:key inputs #:allow-other-keys)
> +             (setenv "CPATH"
> +                     (string-append (assoc-ref inputs "sdl")
> +                                    "/include/SDL2:"
> +                                    (or (getenv "CPATH") "")))))
> +         (add-after 'unpack 'chdir
> +           (lambda* _

Just ‘lambda’ would work.

> +             (chdir "src")))
> +         (replace 'install
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (let* ((out (assoc-ref outputs "out"))
> +                    (bin (string-append out "/bin"))
> +                    (opt (string-append out "/opt/sdlpop"))
> +                    (app (string-append out "/usr/share/applications"))
> +                    (template "src/SDLPoP.desktop.template"))
> +               (chdir "..")
> +               (install-file "prince" bin)
> +               (substitute* template (("\\$ROOT") out))
> +               (install-file template app)
> +               (rename-file (string-append app "/SDLPoP.desktop.template")
> +                            (string-append app "/SDLPoP.desktop"))
> +               (install-file "SDLPoP.ini" opt)
> +               (copy-recursively "data" (string-append bin "/data"))
> +               (copy-recursively "doc" opt)
> +               (copy-recursively "mods" opt)))))))
> +    (native-inputs `(("pkg-config" ,pkg-config)))
> +    (inputs `(("sdl" ,(sdl-union (list sdl2
> +                                       sdl2-image
> +                                       sdl2-mixer)))))
> +    (synopsis "Open-source port of Prince of Persia")
> +    (description "Open-source port of Prince of Persia, based on the disassembly
> +of the DOS version, extended with new features.")

The description should consist of one or more complete sentences, and
try to keep lines <=80 characters.

> +    (home-page "https://github.com/NagyD/SDLPoP")
> +    (license license:gpl3)))

The ‘src/GPLv3.h’ file says GPLv3 or later, so it should be
‘license:gpl3+’.

Could you send an updated patch?

[signature.asc (application/pgp-signature, inline)]

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

From: phodina <phodina <at> protonmail.com>
To: Xinglu Chen <public <at> yoctocell.xyz>
Cc: 50653 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: Add sdlpop.
Date: Mon, 27 Sep 2021 22:16:19 +0000

Hi Xinglu,

thank you for the review and comments. Here's the updated patch.

If you or anyone committing the patch disagrees with the copyright sorting then be my guest and remove it. Otherwise IMHO the list should be sorted to maintain order :-)

--8<---------------cut here---------------start------------->8---
* gnu/packages/games.scm (sdlpop): New variable.
  [copyright]: Sort by date pkill9 <at> runbox.com.

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index c39770c260..9a6e36ccc1 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -45,6 +45,7 @@
 ;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv <at> posteo.net>
 ;;; Copyright © 2019, 2020 Timotej Lazar <timotej.lazar <at> araneo.si>
 ;;; Copyright © 2019 Josh Holland <josh <at> inv.alid.pw>
+;;; Copyright © 2019 Pkill -9 <pkill9 <at> runbox.com>
 ;;; Copyright © 2017, 2019 Hartmut Goebel <h.goebel <at> crazy-compilers.com>
 ;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero <barbanegra+guix <at> posteo.mx>
 ;;; Copyright © 2020 Naga Malleswari <nagamalli <at> riseup.net>
@@ -63,7 +64,7 @@
 ;;; Copyright © 2021 Felix Gruber <felgru <at> posteo.net>
 ;;; Copyright © 2021 Solene Rapenne <solene <at> perso.pw>
 ;;; Copyright © 2021 Noisytoot <noisytoot <at> disroot.org>
-;;; Copyright © 2019 Pkill -9 <pkill9 <at> runbox.com>
+;;; Copyright © 2021 Petr Hodina <phodina <at> protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -12480,6 +12481,62 @@ do so you need to explore the island, find food, build a shelter and try to
 get attention, so you get found.")
       (license license:cc-by4.0))))

+(define-public sdlpop
+  (package
+    (name "sdlpop")
+    (version "1.22")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/NagyD/SDLPoP")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1yy5r1r0hv0xggk8qd8bwk2zy7abpv89nikq4flqgi53fc5q9xl7"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; no tests provided
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (add-before 'build 'prepare-build
+           ;; Set correct environment for SDL.
+           (lambda* (#:key inputs #:allow-other-keys)
+             (setenv "CPATH"
+                     (string-append (assoc-ref inputs "sdl")
+                                    "/include/SDL2:"
+                                    (or (getenv "CPATH") "")))))
+         (add-after 'unpack 'chdir
+           (lambda _
+             (chdir "src")))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (opt (string-append out "/opt/sdlpop"))
+                    (app (string-append out "/usr/share/applications"))
+                    (template "src/SDLPoP.desktop.template"))
+               (chdir "..")
+               (install-file "prince" bin)
+               (substitute* template (("\\$ROOT") out))
+               (install-file template app)
+               (rename-file (string-append app "/SDLPoP.desktop.template")
+                            (string-append app "/SDLPoP.desktop"))
+               (install-file "SDLPoP.ini" opt)
+               (copy-recursively "data" (string-append bin "/data"))
+               (copy-recursively "doc" opt)
+               (copy-recursively "mods" opt)))))))
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs `(("sdl" ,(sdl-union (list sdl2
+                                       sdl2-image
+                                       sdl2-mixer)))))
+    (synopsis "Open-source port of Prince of Persia")
+    (description "This package provides port of Prince of Persia, based on the
+disassembly of the DOS version, extended with new features.")
+    (home-page "https://github.com/NagyD/SDLPoP")
+    (license license:gpl3+)))
+
 (define-public fheroes2
   (package
     (name "fheroes2")
--
2.32.0

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

From: Xinglu Chen <public <at> yoctocell.xyz>
To: phodina <phodina <at> protonmail.com>
Cc: 50653 <at> debbugs.gnu.org
Subject: Re: [PATCH v2] gnu: Add sdlpop.
Date: Tue, 28 Sep 2021 21:10:56 +0200

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

On Mon, Sep 27 2021, phodina wrote:

> Hi Xinglu,
>
> thank you for the review and comments. Here's the updated patch.
>
> If you or anyone committing the patch disagrees with the copyright
> sorting then be my guest and remove it. Otherwise IMHO the list should
> be sorted to maintain order :-)

I don’t have any objections; I just don’t think it really matters.

> --8<---------------cut here---------------start------------->8---

Not sure why you put this here.

> * gnu/packages/games.scm (sdlpop): New variable.
>   [copyright]: Sort by date pkill9 <at> runbox.com.
>
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index c39770c260..9a6e36ccc1 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -45,6 +45,7 @@
>  ;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv <at> posteo.net>
>  ;;; Copyright © 2019, 2020 Timotej Lazar <timotej.lazar <at> araneo.si>
>  ;;; Copyright © 2019 Josh Holland <josh <at> inv.alid.pw>
> +;;; Copyright © 2019 Pkill -9 <pkill9 <at> runbox.com>
>  ;;; Copyright © 2017, 2019 Hartmut Goebel <h.goebel <at> crazy-compilers.com>
>  ;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero <barbanegra+guix <at> posteo.mx>
>  ;;; Copyright © 2020 Naga Malleswari <nagamalli <at> riseup.net>
> @@ -63,7 +64,7 @@
>  ;;; Copyright © 2021 Felix Gruber <felgru <at> posteo.net>
>  ;;; Copyright © 2021 Solene Rapenne <solene <at> perso.pw>
>  ;;; Copyright © 2021 Noisytoot <noisytoot <at> disroot.org>
> -;;; Copyright © 2019 Pkill -9 <pkill9 <at> runbox.com>
> +;;; Copyright © 2021 Petr Hodina <phodina <at> protonmail.com>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -12480,6 +12481,62 @@ do so you need to explore the island, find food, build a shelter and try to
>  get attention, so you get found.")
>        (license license:cc-by4.0))))
>
> +(define-public sdlpop
> +  (package
> +    (name "sdlpop")
> +    (version "1.22")
> +    (source (origin
> +              (method git-fetch)
> +              (uri (git-reference
> +                    (url "https://github.com/NagyD/SDLPoP")
> +                    (commit (string-append "v" version))))
> +              (file-name (git-file-name name version))
> +              (sha256
> +               (base32
> +                "1yy5r1r0hv0xggk8qd8bwk2zy7abpv89nikq4flqgi53fc5q9xl7"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     `(#:tests? #f ; no tests provided
> +       #:phases
> +       (modify-phases %standard-phases
> +         (delete 'configure)
> +         (add-before 'build 'prepare-build
> +           ;; Set correct environment for SDL.
> +           (lambda* (#:key inputs #:allow-other-keys)
> +             (setenv "CPATH"
> +                     (string-append (assoc-ref inputs "sdl")
> +                                    "/include/SDL2:"
> +                                    (or (getenv "CPATH") "")))))
> +         (add-after 'unpack 'chdir
> +           (lambda _
> +             (chdir "src")))
> +         (replace 'install
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (let* ((out (assoc-ref outputs "out"))
> +                    (bin (string-append out "/bin"))
> +                    (opt (string-append out "/opt/sdlpop"))
> +                    (app (string-append out "/usr/share/applications"))
> +                    (template "src/SDLPoP.desktop.template"))
> +               (chdir "..")
> +               (install-file "prince" bin)
> +               (substitute* template (("\\$ROOT") out))
> +               (install-file template app)
> +               (rename-file (string-append app "/SDLPoP.desktop.template")
> +                            (string-append app "/SDLPoP.desktop"))
> +               (install-file "SDLPoP.ini" opt)
> +               (copy-recursively "data" (string-append bin "/data"))
> +               (copy-recursively "doc" opt)
> +               (copy-recursively "mods" opt)))))))
> +    (native-inputs `(("pkg-config" ,pkg-config)))
> +    (inputs `(("sdl" ,(sdl-union (list sdl2
> +                                       sdl2-image
> +                                       sdl2-mixer)))))
> +    (synopsis "Open-source port of Prince of Persia")
> +    (description "This package provides port of Prince of Persia, based on the
> +disassembly of the DOS version, extended with new features.")
> +    (home-page "https://github.com/NagyD/SDLPoP")
> +    (license license:gpl3+)))
> +

The updated patch LGTM!

[signature.asc (application/pgp-signature, inline)]

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

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Xinglu Chen <public <at> yoctocell.xyz>
Cc: 50653-done <at> debbugs.gnu.org, phodina <phodina <at> protonmail.com>
Subject: Re: [bug#50653] [PATCH v2] gnu: Add sdlpop.
Date: Tue, 28 Sep 2021 21:37:26 +0200

Hello,

Xinglu Chen <public <at> yoctocell.xyz> writes:

> The updated patch LGTM!

Thank you for the review. I removed "Open-source" from the synopsis and
pushed.

Thanks to phodina for the patch.

Regards,
-- 
Nicolas Goaziou

Previous Next

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