* [bug#50653] [PATCH] gnu: Add sdlpop.
@ 2021-09-18 9:49 phodina via Guix-patches via
2021-09-20 12:19 ` Xinglu Chen
2021-09-27 22:16 ` [bug#50653] [PATCH v2] " phodina via Guix-patches via
0 siblings, 2 replies; 5+ messages in thread
From: phodina via Guix-patches via @ 2021-09-18 9:49 UTC (permalink / raw)
To: 50653
* gnu/packages/games.scm (sdlpop): New variable.
[copyright]: Sort by date pkill9@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@posteo.net>
;;; Copyright © 2019, 2020 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2019 Josh Holland <josh@inv.alid.pw>
+;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
;;; Copyright © 2017, 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero <barbanegra+guix@posteo.mx>
;;; Copyright © 2020 Naga Malleswari <nagamalli@riseup.net>
@@ -63,7 +64,7 @@
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
;;; Copyright © 2021 Noisytoot <noisytoot@disroot.org>
-;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
+;;; Copyright © 2021 Petr Hodina <phodina@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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#50653] [PATCH] gnu: Add sdlpop.
2021-09-18 9:49 [bug#50653] [PATCH] gnu: Add sdlpop phodina via Guix-patches via
@ 2021-09-20 12:19 ` Xinglu Chen
2021-09-27 22:16 ` [bug#50653] [PATCH v2] " phodina via Guix-patches via
1 sibling, 0 replies; 5+ messages in thread
From: Xinglu Chen @ 2021-09-20 12:19 UTC (permalink / raw)
To: phodina, 50653
[-- Attachment #1: Type: text/plain, Size: 4449 bytes --]
On Sat, Sep 18 2021, phodina via Guix-patches via wrote:
> * gnu/packages/games.scm (sdlpop): New variable.
> [copyright]: Sort by date pkill9@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@posteo.net>
> ;;; Copyright © 2019, 2020 Timotej Lazar <timotej.lazar@araneo.si>
> ;;; Copyright © 2019 Josh Holland <josh@inv.alid.pw>
> +;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
> ;;; Copyright © 2017, 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
> ;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero <barbanegra+guix@posteo.mx>
> ;;; Copyright © 2020 Naga Malleswari <nagamalli@riseup.net>
> @@ -63,7 +64,7 @@
> ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
> ;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
> ;;; Copyright © 2021 Noisytoot <noisytoot@disroot.org>
> -;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
> +;;; Copyright © 2021 Petr Hodina <phodina@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?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 861 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#50653] [PATCH v2] gnu: Add sdlpop.
2021-09-18 9:49 [bug#50653] [PATCH] gnu: Add sdlpop phodina via Guix-patches via
2021-09-20 12:19 ` Xinglu Chen
@ 2021-09-27 22:16 ` phodina via Guix-patches via
2021-09-28 19:10 ` Xinglu Chen
1 sibling, 1 reply; 5+ messages in thread
From: phodina via Guix-patches via @ 2021-09-27 22:16 UTC (permalink / raw)
To: Xinglu Chen; +Cc: 50653
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@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@posteo.net>
;;; Copyright © 2019, 2020 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2019 Josh Holland <josh@inv.alid.pw>
+;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
;;; Copyright © 2017, 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero <barbanegra+guix@posteo.mx>
;;; Copyright © 2020 Naga Malleswari <nagamalli@riseup.net>
@@ -63,7 +64,7 @@
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
;;; Copyright © 2021 Noisytoot <noisytoot@disroot.org>
-;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
+;;; Copyright © 2021 Petr Hodina <phodina@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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#50653] [PATCH v2] gnu: Add sdlpop.
2021-09-27 22:16 ` [bug#50653] [PATCH v2] " phodina via Guix-patches via
@ 2021-09-28 19:10 ` Xinglu Chen
2021-09-28 19:37 ` bug#50653: " Nicolas Goaziou
0 siblings, 1 reply; 5+ messages in thread
From: Xinglu Chen @ 2021-09-28 19:10 UTC (permalink / raw)
To: phodina; +Cc: 50653
[-- Attachment #1: Type: text/plain, Size: 4522 bytes --]
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@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@posteo.net>
> ;;; Copyright © 2019, 2020 Timotej Lazar <timotej.lazar@araneo.si>
> ;;; Copyright © 2019 Josh Holland <josh@inv.alid.pw>
> +;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
> ;;; Copyright © 2017, 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
> ;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero <barbanegra+guix@posteo.mx>
> ;;; Copyright © 2020 Naga Malleswari <nagamalli@riseup.net>
> @@ -63,7 +64,7 @@
> ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
> ;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
> ;;; Copyright © 2021 Noisytoot <noisytoot@disroot.org>
> -;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
> +;;; Copyright © 2021 Petr Hodina <phodina@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!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 861 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* bug#50653: [PATCH v2] gnu: Add sdlpop.
2021-09-28 19:10 ` Xinglu Chen
@ 2021-09-28 19:37 ` Nicolas Goaziou
0 siblings, 0 replies; 5+ messages in thread
From: Nicolas Goaziou @ 2021-09-28 19:37 UTC (permalink / raw)
To: Xinglu Chen; +Cc: 50653-done, phodina
Hello,
Xinglu Chen <public@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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-09-28 19:38 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-18 9:49 [bug#50653] [PATCH] gnu: Add sdlpop phodina via Guix-patches via
2021-09-20 12:19 ` Xinglu Chen
2021-09-27 22:16 ` [bug#50653] [PATCH v2] " phodina via Guix-patches via
2021-09-28 19:10 ` Xinglu Chen
2021-09-28 19:37 ` bug#50653: " Nicolas Goaziou
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.