Package: guix-patches;
Reported by: Adonay Felipe Nogueira <adfeno <at> hyperbola.info>
Date: Sun, 20 Aug 2017 18:29:02 UTC
Severity: normal
Done: Kei Kebreau <kkebreau <at> posteo.net>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 28164 in the body.
You can then email your comments to 28164 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#28164; Package guix-patches.
(Sun, 20 Aug 2017 18:29:02 GMT) Full text and rfc822 format available.Adonay Felipe Nogueira <adfeno <at> hyperbola.info>:guix-patches <at> gnu.org.
(Sun, 20 Aug 2017 18:29:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Adonay Felipe Nogueira <adfeno <at> hyperbola.info> To: guix-patches <at> gnu.org Subject: gnu: red-eclipse: Add store "data" package path as default Date: Sun, 20 Aug 2017 15:28:20 -0300
[Message part 1 (text/plain, inline)]
This is an attempt to fix bug#25034 ([[https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25034]]). -- - [[https://libreplanet.org/wiki/User:Adfeno]] - Palestrante e consultor sobre /software/ livre (não confundir com gratis). - "WhatsApp"? Ele não é livre. Por favor, use o GNU Ring ou o Tox. - Contato: [[https://libreplanet.org/wiki/User:Adfeno#vCard]] - Arquivos comuns aceitos (apenas sem DRM): Corel Draw, Microsoft Office, MP3, MP4, WMA, WMV. - Arquivos comuns aceitos e enviados: CSV, GNU Dia, GNU Emacs Org, GNU GIMP, Inkscape SVG, JPG, LibreOffice (padrão ODF), OGG, OPUS, PDF (apenas sem DRM), PNG, TXT, WEBM.
[0001-gnu-red-eclipse-Add-store-data-package-path-as-defau.patch (text/x-diff, inline)]
From 6e1d96b5aeaca1a307d8fa42d12fc233e9cd831b Mon Sep 17 00:00:00 2001
From: Adonay Felipe Nogueira <adfeno <at> hyperbola.info>
Date: Sun, 20 Aug 2017 14:51:16 -0300
Subject: [PATCH] gnu: red-eclipse: Add store "data" package path as default
* gnu/packages/games.scm (red-eclipse): Remove "#t"s and extra spaces. Make version respect documentation.
[arguments]: Add "prefix" to make-flags. Add "add-store-data-package-path-as-default" phase. Improve "copy-data" phase.
---
gnu/packages/games.scm | 117 +++++++++++++++++++++++++++++--------------------
1 file changed, 69 insertions(+), 48 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 7932e84..f8243a6 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -24,7 +24,7 @@
;;; Copyright © 2016, 2017 Efraim Flashner <efraim <at> flashner.co.il>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke <at> gnu.org>
;;; Copyright © 2016 Steve Webber <webber.sl <at> gmail.com>
-;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno <at> openmailbox.org>
+;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno <at> hyperbola.info>
;;; Copyright © 2017 Arun Isaac <arunisaac <at> systemreboot.net>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me <at> tobias.gr>
;;; Copyright © 2017 nee <nee-git <at> hidamari.blue>
@@ -133,6 +133,7 @@
#:use-module (gnu packages gnuzilla)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages networking)
+ #:use-module (guix build utils)
#:use-module (guix build-system gnu)
#:use-module (guix build-system haskell)
#:use-module (guix build-system python)
@@ -2716,50 +2717,55 @@ http://lavachat.symlynx.com/unix/")
(license license:gpl2+)))
(define-public red-eclipse
- (let ((data-sources
- '(("acerspyro" "0zmg78scrfdv33h7vszqvzylcqjwg7d5b0j2riav3rjfh326j8xx")
- ("actors" "0l00rsvppqzdpsikm5qpj38jiygirszxlzay2nxp4g4n2qjq0m4a")
- ("appleflap" "0jhfr7f13hk3nswwxqc4jajriipr6zz6j63v955nv4sgxs7lzbjd")
- ("blendbrush" "1nk0zaisbqf2khrivq8ls6z2lnh6d51m133m2ppxk7k4c9gq1imq")
- ("caustics" "1hq08k476wayi0kmk4ps8h6jr75yinq04f1r2p8r79xsdpxq9my5")
- ("crosshairs" "1gmrmjm7i7n9py0qrzamk7ygi63yx1mr2pp6iwz2vwngprl03n8m")
- ("dziq" "0gr36ydrv8syjxv7w9dw3ix8waaq201fzxr0klkqp260p8xp215s")
- ("elyvisions" "05syxlpsap6nfwxnnd0ls7qj1p4vhw2jxi41pi5inwpfifapfphz")
- ("fonts" "184syks602xc657q08973w5ji50x5zssvd4vp2q2ig8m68iyr51c")
+ (let ((release "1.5.8")
+ (revision 2)
+ (data-sources
+ '(("acerspyro" "0zmg78scrfdv33h7vszqvzylcqjwg7d5b0j2riav3rjfh326j8xx")
+ ("actors" "0l00rsvppqzdpsikm5qpj38jiygirszxlzay2nxp4g4n2qjq0m4a")
+ ("appleflap" "0jhfr7f13hk3nswwxqc4jajriipr6zz6j63v955nv4sgxs7lzbjd")
+ ("blendbrush" "1nk0zaisbqf2khrivq8ls6z2lnh6d51m133m2ppxk7k4c9gq1imq")
+ ("caustics" "1hq08k476wayi0kmk4ps8h6jr75yinq04f1r2p8r79xsdpxq9my5")
+ ("crosshairs" "1gmrmjm7i7n9py0qrzamk7ygi63yx1mr2pp6iwz2vwngprl03n8m")
+ ("dziq" "0gr36ydrv8syjxv7w9dw3ix8waaq201fzxr0klkqp260p8xp215s")
+ ("elyvisions" "05syxlpsap6nfwxnnd0ls7qj1p4vhw2jxi41pi5inwpfifapfphz")
+ ("fonts" "184syks602xc657q08973w5ji50x5zssvd4vp2q2ig8m68iyr51c")
("freezurbern" "020gpgcpy4rqjd9d18npfm96j8f02jcjnccbxcgzk1yb58y687ya")
- ("john" "0hj5kwlb2gb0gsnl9bk7dkqlk8r7vxcw8gxpgrb3kfn8d9cwcb7k")
- ("jojo" "0fij06040r7s5p7jksxm7wxi9jqwkhhm8iywys0dagk8j2wcbvsz")
- ("jwin" "0ysfynjvypc8dszf7rsvk02jgw8fmsli49vy2xpm83zpkrqpddgf")
+ ("john" "0hj5kwlb2gb0gsnl9bk7dkqlk8r7vxcw8gxpgrb3kfn8d9cwcb7k")
+ ("jojo" "0fij06040r7s5p7jksxm7wxi9jqwkhhm8iywys0dagk8j2wcbvsz")
+ ("jwin" "0ysfynjvypc8dszf7rsvk02jgw8fmsli49vy2xpm83zpkrqpddgf")
("luckystrike" "1bm0xdqjv35ry5xwbzw3a3v1xf2gj1jwfg29nyl6w3ch0h6crr11")
- ("maps" "0c9d1zxmpnngwhchzw6xb6cf84cx8xyycmdqcvyhamrd95d96qma")
- ("mayhem" "133pdql7ari159skd9qdmw0p1m73x32d1v6jswkz0xwk8vgxmkil")
- ("mikeplus64" "1d5npn9wlw0mviz9vhzzcsj98jvfh1wbvlh1nyqfj4ws5nfxhs7x")
- ("misc" "19x2ps6yxnfrz0xdhqdwncaq25ds7i4w2l8sdfi95yh2r7c5k1qn")
- ("nieb" "15029nipl92cb0jbh46z00k51hf3jk4v05pwx266b6b11bapdz0c")
- ("nobiax" "0k9apim5z4ihd5ajmnbq4gyh24w872dv0mr5v8wqn31a8gxzahhp")
- ("particles" "06827r9pnhzjil381xiwcbc93v9nxin7qlr59yrvk9gdzxmklk9m")
- ("philipk" "1l6fhl6qz471vjn05hvk29bm8dhwnzqbmi2hdylpa9k998nzkfc1")
+ ("maps" "0c9d1zxmpnngwhchzw6xb6cf84cx8xyycmdqcvyhamrd95d96qma")
+ ("mayhem" "133pdql7ari159skd9qdmw0p1m73x32d1v6jswkz0xwk8vgxmkil")
+ ("mikeplus64" "1d5npn9wlw0mviz9vhzzcsj98jvfh1wbvlh1nyqfj4ws5nfxhs7x")
+ ("misc" "19x2ps6yxnfrz0xdhqdwncaq25ds7i4w2l8sdfi95yh2r7c5k1qn")
+ ("nieb" "15029nipl92cb0jbh46z00k51hf3jk4v05pwx266b6b11bapdz0c")
+ ("nobiax" "0k9apim5z4ihd5ajmnbq4gyh24w872dv0mr5v8wqn31a8gxzahhp")
+ ("particles" "06827r9pnhzjil381xiwcbc93v9nxin7qlr59yrvk9gdzxmklk9m")
+ ("philipk" "1l6fhl6qz471vjn05hvk29bm8dhwnzqbmi2hdylpa9k998nzkfc1")
("projectiles" "03ay8ik52n3vx723swqlnl5gpkzf1v1gadwj3zcnh43ch7nd2bqh")
- ("props" "1yxz7gfmb79sqqrkyfdzp4ar9rf5f1kpfij4nrkk1l8vbw9liksc")
- ("skyboxes" "1mm98mhb6yhb006p1hlic91jcwjxhq79mblxciwbqqa9c5g4yki6")
- ("snipergoth" "1vlpmwlg71g6l5b706gp82bc07i5bbw2zphzynm2fx49za0zdi44")
- ("sounds" "156g5wh8cvdh6zr33haqm566sd28ylnzdf2h4pqzpxbb2i19vbfg")
- ("textures" "0wkhl5cgymr9kslzhksi83hs15rb0q01xvax5khi6b4dcl3mrmsh")
- ("torley" "1xlag6ndjyqafl984n6d9zi96dv9aif7vrc2nvikc3iwgjwlbxav")
- ("trak" "12x9ix8zkqn9svy56qmdgj4x2814qh25f4srplgq691lqn9qjhvd")
- ("ulukai" "0gz1hd8hca2biskc85hw4jjacpsmqg9x4w6cwrka8x987xmc92k5")
- ("unnamed" "09v8fjy6jqypm1i121kilg3z6zpw7dm0i4gxhd9b7ihprvzvy8r7")
- ("vanities" "0m3vfq9l71pbb80qz4s3k8r5azmm158chqbw8snch09ymxm6h462")
- ("vegetation" "07yzm9lbzr624j4i652ny5p762p83gadg40c1k8gwff4y7yk55gn")
- ("weapons" "05fsp17gdrhjqdwia7rwdw9gcijaqwcnny8lf6krms43xmn8cj0x")
- ("wicked" "0jjgwzdibr5my369gwvmvbklpjlwq939zgf643rv0168xc087xb2"))))
+ ("props" "1yxz7gfmb79sqqrkyfdzp4ar9rf5f1kpfij4nrkk1l8vbw9liksc")
+ ("skyboxes" "1mm98mhb6yhb006p1hlic91jcwjxhq79mblxciwbqqa9c5g4yki6")
+ ("snipergoth" "1vlpmwlg71g6l5b706gp82bc07i5bbw2zphzynm2fx49za0zdi44")
+ ("sounds" "156g5wh8cvdh6zr33haqm566sd28ylnzdf2h4pqzpxbb2i19vbfg")
+ ("textures" "0wkhl5cgymr9kslzhksi83hs15rb0q01xvax5khi6b4dcl3mrmsh")
+ ("torley" "1xlag6ndjyqafl984n6d9zi96dv9aif7vrc2nvikc3iwgjwlbxav")
+ ("trak" "12x9ix8zkqn9svy56qmdgj4x2814qh25f4srplgq691lqn9qjhvd")
+ ("ulukai" "0gz1hd8hca2biskc85hw4jjacpsmqg9x4w6cwrka8x987xmc92k5")
+ ("unnamed" "09v8fjy6jqypm1i121kilg3z6zpw7dm0i4gxhd9b7ihprvzvy8r7")
+ ("vanities" "0m3vfq9l71pbb80qz4s3k8r5azmm158chqbw8snch09ymxm6h462")
+ ("vegetation" "07yzm9lbzr624j4i652ny5p762p83gadg40c1k8gwff4y7yk55gn")
+ ("weapons" "05fsp17gdrhjqdwia7rwdw9gcijaqwcnny8lf6krms43xmn8cj0x")
+ ("wicked" "0jjgwzdibr5my369gwvmvbklpjlwq939zgf643rv0168xc087xb2"))))
(package
(name "red-eclipse")
- (version "1.5.8")
+ (version (if (zero? revision)
+ release
+ (string-append release "-"
+ (number->string revision))))
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/red-eclipse/base"
- "/archive/v" version ".tar.gz"))
+ "/archive/v" release ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
@@ -2769,7 +2775,9 @@ http://lavachat.symlynx.com/unix/")
`(#:tests? #f ; no check target
#:make-flags (list "CC=gcc" "-Csrc"
(string-append "INSTDIR="
- (assoc-ref %outputs "out") "/bin"))
+ (assoc-ref %outputs "out") "/bin")
+ (string-append "prefix="
+ (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'unpack-data
@@ -2782,17 +2790,29 @@ http://lavachat.symlynx.com/unix/")
"-Cdata"
"--transform"
(string-append "s/"
- name "-" ,version "/"
+ name "-" ,release "/"
name "/")))
- (list ,@(map car data-sources)))
- #t))
+ (list ,@(map car data-sources)))))
+ (add-after 'unpack-data 'add-store-data-package-path-as-default
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "src/engine/server.cpp"
+ (("(else[[:space:]]*)((addpackagedir\\()\"data\"(\\);))" _ else_part addpackagedir_original addpackagedir_open addpackagedir_close)
+ (string-append else_part
+ "{ "
+ addpackagedir_open
+ "\""
+ (assoc-ref outputs "out")
+ "/share/redeclipse/data\""
+ addpackagedir_close
+ " "
+ addpackagedir_original
+ " }")))))
(delete 'configure) ; no configure script
(add-after 'set-paths 'set-sdl-paths
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CPATH"
(string-append (assoc-ref inputs "sdl-union")
- "/include/SDL2"))
- #t))
+ "/include/SDL2"))))
(add-after 'install 'copy-data
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
@@ -2801,8 +2821,10 @@ http://lavachat.symlynx.com/unix/")
(copy-file "doc/examples/servinit.cfg"
(string-append out "/config/servinit.cfg"))
(copy-recursively "data"
- (string-append out "/data")))
- #t))
+ (string-append out "/share/redeclipse/data"))
+ (mkdir-p (string-append out "/lib/redeclipse"))
+ (symlink (string-append out "/share/redeclipse/data")
+ (string-append out "/lib/redeclipse/data")))))
(add-after 'copy-data 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -2831,8 +2853,7 @@ exec -a \"$0\" ~a/.redeclipse_server_linux-real~%"
(string-append out)
(string-append bin))))
(chmod "redeclipse_linux" #o555)
- (chmod "redeclipse_server_linux" #o555)))
- #t)))))
+ (chmod "redeclipse_server_linux" #o555))))))))
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs
`(("curl" ,curl)
@@ -2848,7 +2869,7 @@ exec -a \"$0\" ~a/.redeclipse_server_linux-real~%"
(method url-fetch)
(uri (string-append
"https://github.com/red-eclipse/"
- name "/archive/v" version ".tar.gz"))
+ name "/archive/v" release ".tar.gz"))
(sha256 (base32 hash))
(file-name (string-append name "-" version
".tar.gz"))))))
--
1.9.1
guix-patches <at> gnu.org:bug#28164; Package guix-patches.
(Sat, 23 Sep 2017 15:32:02 GMT) Full text and rfc822 format available.Message #8 received at 28164 <at> debbugs.gnu.org (full text, mbox):
From: Kei Kebreau <kkebreau <at> posteo.net> To: Adonay Felipe Nogueira <adfeno <at> hyperbola.info> Cc: 28164 <at> debbugs.gnu.org Subject: Re: [bug#28164] gnu: red-eclipse: Add store "data" package path as default Date: Sat, 23 Sep 2017 11:30:31 -0400
[Message part 1 (text/plain, inline)]
Adonay Felipe Nogueira <adfeno <at> hyperbola.info> writes:
> This is an attempt to fix bug#25034
> ([[https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25034]]).
>
Nice catch!
> --
> - [[https://libreplanet.org/wiki/User:Adfeno]]
> - Palestrante e consultor sobre /software/ livre (não confundir com
> gratis).
> - "WhatsApp"? Ele não é livre. Por favor, use o GNU Ring ou o Tox.
> - Contato: [[https://libreplanet.org/wiki/User:Adfeno#vCard]]
> - Arquivos comuns aceitos (apenas sem DRM): Corel Draw, Microsoft
> Office, MP3, MP4, WMA, WMV.
> - Arquivos comuns aceitos e enviados: CSV, GNU Dia, GNU Emacs Org, GNU
> GIMP, Inkscape SVG, JPG, LibreOffice (padrão ODF), OGG, OPUS, PDF
> (apenas sem DRM), PNG, TXT, WEBM.
>
>>From 6e1d96b5aeaca1a307d8fa42d12fc233e9cd831b Mon Sep 17 00:00:00 2001
> From: Adonay Felipe Nogueira <adfeno <at> hyperbola.info>
> Date: Sun, 20 Aug 2017 14:51:16 -0300
> Subject: [PATCH] gnu: red-eclipse: Add store "data" package path as default
>
> * gnu/packages/games.scm (red-eclipse): Remove "#t"s and extra spaces. Make version respect documentation.
This spacing is there to make the list more readable. I suppose the
spaces could be removed, but I'd prefer to keep them if we don't have to
get rid of them.
Also, the "#t"s were there to make sure that the phases returned true
like they're supposed to. They should probably stay unless that
convention has changed.
> [arguments]: Add "prefix" to make-flags. Add
> "add-store-data-package-path-as-default" phase. Improve "copy-data"
> phase.
I tried removing "prefix" from the make-flags and everything still seems
to work fine. Am I missing what this is intended to do, or was it left
over from some earlier work on this patch?
> ---
> gnu/packages/games.scm | 117 +++++++++++++++++++++++++++++--------------------
> 1 file changed, 69 insertions(+), 48 deletions(-)
>
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index 7932e84..f8243a6 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -24,7 +24,7 @@
> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim <at> flashner.co.il>
> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke <at> gnu.org>
> ;;; Copyright © 2016 Steve Webber <webber.sl <at> gmail.com>
> -;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno <at> openmailbox.org>
> +;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno <at> hyperbola.info>
> ;;; Copyright © 2017 Arun Isaac <arunisaac <at> systemreboot.net>
> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me <at> tobias.gr>
> ;;; Copyright © 2017 nee <nee-git <at> hidamari.blue>
> @@ -133,6 +133,7 @@
> #:use-module (gnu packages gnuzilla)
> #:use-module (gnu packages icu4c)
> #:use-module (gnu packages networking)
> + #:use-module (guix build utils)
> #:use-module (guix build-system gnu)
> #:use-module (guix build-system haskell)
> #:use-module (guix build-system python)
> @@ -2716,50 +2717,55 @@ http://lavachat.symlynx.com/unix/")
> (license license:gpl2+)))
>
> (define-public red-eclipse
> - (let ((data-sources
> - '(("acerspyro" "0zmg78scrfdv33h7vszqvzylcqjwg7d5b0j2riav3rjfh326j8xx")
> - ("actors" "0l00rsvppqzdpsikm5qpj38jiygirszxlzay2nxp4g4n2qjq0m4a")
> - ("appleflap" "0jhfr7f13hk3nswwxqc4jajriipr6zz6j63v955nv4sgxs7lzbjd")
> - ("blendbrush" "1nk0zaisbqf2khrivq8ls6z2lnh6d51m133m2ppxk7k4c9gq1imq")
> - ("caustics" "1hq08k476wayi0kmk4ps8h6jr75yinq04f1r2p8r79xsdpxq9my5")
> - ("crosshairs" "1gmrmjm7i7n9py0qrzamk7ygi63yx1mr2pp6iwz2vwngprl03n8m")
> - ("dziq" "0gr36ydrv8syjxv7w9dw3ix8waaq201fzxr0klkqp260p8xp215s")
> - ("elyvisions" "05syxlpsap6nfwxnnd0ls7qj1p4vhw2jxi41pi5inwpfifapfphz")
> - ("fonts" "184syks602xc657q08973w5ji50x5zssvd4vp2q2ig8m68iyr51c")
> + (let ((release "1.5.8")
> + (revision 2)
> + (data-sources
> + '(("acerspyro" "0zmg78scrfdv33h7vszqvzylcqjwg7d5b0j2riav3rjfh326j8xx")
> + ("actors" "0l00rsvppqzdpsikm5qpj38jiygirszxlzay2nxp4g4n2qjq0m4a")
> + ("appleflap" "0jhfr7f13hk3nswwxqc4jajriipr6zz6j63v955nv4sgxs7lzbjd")
> + ("blendbrush" "1nk0zaisbqf2khrivq8ls6z2lnh6d51m133m2ppxk7k4c9gq1imq")
> + ("caustics" "1hq08k476wayi0kmk4ps8h6jr75yinq04f1r2p8r79xsdpxq9my5")
> + ("crosshairs" "1gmrmjm7i7n9py0qrzamk7ygi63yx1mr2pp6iwz2vwngprl03n8m")
> + ("dziq" "0gr36ydrv8syjxv7w9dw3ix8waaq201fzxr0klkqp260p8xp215s")
> + ("elyvisions" "05syxlpsap6nfwxnnd0ls7qj1p4vhw2jxi41pi5inwpfifapfphz")
> + ("fonts" "184syks602xc657q08973w5ji50x5zssvd4vp2q2ig8m68iyr51c")
> ("freezurbern" "020gpgcpy4rqjd9d18npfm96j8f02jcjnccbxcgzk1yb58y687ya")
> - ("john" "0hj5kwlb2gb0gsnl9bk7dkqlk8r7vxcw8gxpgrb3kfn8d9cwcb7k")
> - ("jojo" "0fij06040r7s5p7jksxm7wxi9jqwkhhm8iywys0dagk8j2wcbvsz")
> - ("jwin" "0ysfynjvypc8dszf7rsvk02jgw8fmsli49vy2xpm83zpkrqpddgf")
> + ("john" "0hj5kwlb2gb0gsnl9bk7dkqlk8r7vxcw8gxpgrb3kfn8d9cwcb7k")
> + ("jojo" "0fij06040r7s5p7jksxm7wxi9jqwkhhm8iywys0dagk8j2wcbvsz")
> + ("jwin" "0ysfynjvypc8dszf7rsvk02jgw8fmsli49vy2xpm83zpkrqpddgf")
> ("luckystrike" "1bm0xdqjv35ry5xwbzw3a3v1xf2gj1jwfg29nyl6w3ch0h6crr11")
> - ("maps" "0c9d1zxmpnngwhchzw6xb6cf84cx8xyycmdqcvyhamrd95d96qma")
> - ("mayhem" "133pdql7ari159skd9qdmw0p1m73x32d1v6jswkz0xwk8vgxmkil")
> - ("mikeplus64" "1d5npn9wlw0mviz9vhzzcsj98jvfh1wbvlh1nyqfj4ws5nfxhs7x")
> - ("misc" "19x2ps6yxnfrz0xdhqdwncaq25ds7i4w2l8sdfi95yh2r7c5k1qn")
> - ("nieb" "15029nipl92cb0jbh46z00k51hf3jk4v05pwx266b6b11bapdz0c")
> - ("nobiax" "0k9apim5z4ihd5ajmnbq4gyh24w872dv0mr5v8wqn31a8gxzahhp")
> - ("particles" "06827r9pnhzjil381xiwcbc93v9nxin7qlr59yrvk9gdzxmklk9m")
> - ("philipk" "1l6fhl6qz471vjn05hvk29bm8dhwnzqbmi2hdylpa9k998nzkfc1")
> + ("maps" "0c9d1zxmpnngwhchzw6xb6cf84cx8xyycmdqcvyhamrd95d96qma")
> + ("mayhem" "133pdql7ari159skd9qdmw0p1m73x32d1v6jswkz0xwk8vgxmkil")
> + ("mikeplus64" "1d5npn9wlw0mviz9vhzzcsj98jvfh1wbvlh1nyqfj4ws5nfxhs7x")
> + ("misc" "19x2ps6yxnfrz0xdhqdwncaq25ds7i4w2l8sdfi95yh2r7c5k1qn")
> + ("nieb" "15029nipl92cb0jbh46z00k51hf3jk4v05pwx266b6b11bapdz0c")
> + ("nobiax" "0k9apim5z4ihd5ajmnbq4gyh24w872dv0mr5v8wqn31a8gxzahhp")
> + ("particles" "06827r9pnhzjil381xiwcbc93v9nxin7qlr59yrvk9gdzxmklk9m")
> + ("philipk" "1l6fhl6qz471vjn05hvk29bm8dhwnzqbmi2hdylpa9k998nzkfc1")
> ("projectiles" "03ay8ik52n3vx723swqlnl5gpkzf1v1gadwj3zcnh43ch7nd2bqh")
> - ("props" "1yxz7gfmb79sqqrkyfdzp4ar9rf5f1kpfij4nrkk1l8vbw9liksc")
> - ("skyboxes" "1mm98mhb6yhb006p1hlic91jcwjxhq79mblxciwbqqa9c5g4yki6")
> - ("snipergoth" "1vlpmwlg71g6l5b706gp82bc07i5bbw2zphzynm2fx49za0zdi44")
> - ("sounds" "156g5wh8cvdh6zr33haqm566sd28ylnzdf2h4pqzpxbb2i19vbfg")
> - ("textures" "0wkhl5cgymr9kslzhksi83hs15rb0q01xvax5khi6b4dcl3mrmsh")
> - ("torley" "1xlag6ndjyqafl984n6d9zi96dv9aif7vrc2nvikc3iwgjwlbxav")
> - ("trak" "12x9ix8zkqn9svy56qmdgj4x2814qh25f4srplgq691lqn9qjhvd")
> - ("ulukai" "0gz1hd8hca2biskc85hw4jjacpsmqg9x4w6cwrka8x987xmc92k5")
> - ("unnamed" "09v8fjy6jqypm1i121kilg3z6zpw7dm0i4gxhd9b7ihprvzvy8r7")
> - ("vanities" "0m3vfq9l71pbb80qz4s3k8r5azmm158chqbw8snch09ymxm6h462")
> - ("vegetation" "07yzm9lbzr624j4i652ny5p762p83gadg40c1k8gwff4y7yk55gn")
> - ("weapons" "05fsp17gdrhjqdwia7rwdw9gcijaqwcnny8lf6krms43xmn8cj0x")
> - ("wicked" "0jjgwzdibr5my369gwvmvbklpjlwq939zgf643rv0168xc087xb2"))))
> + ("props" "1yxz7gfmb79sqqrkyfdzp4ar9rf5f1kpfij4nrkk1l8vbw9liksc")
> + ("skyboxes" "1mm98mhb6yhb006p1hlic91jcwjxhq79mblxciwbqqa9c5g4yki6")
> + ("snipergoth" "1vlpmwlg71g6l5b706gp82bc07i5bbw2zphzynm2fx49za0zdi44")
> + ("sounds" "156g5wh8cvdh6zr33haqm566sd28ylnzdf2h4pqzpxbb2i19vbfg")
> + ("textures" "0wkhl5cgymr9kslzhksi83hs15rb0q01xvax5khi6b4dcl3mrmsh")
> + ("torley" "1xlag6ndjyqafl984n6d9zi96dv9aif7vrc2nvikc3iwgjwlbxav")
> + ("trak" "12x9ix8zkqn9svy56qmdgj4x2814qh25f4srplgq691lqn9qjhvd")
> + ("ulukai" "0gz1hd8hca2biskc85hw4jjacpsmqg9x4w6cwrka8x987xmc92k5")
> + ("unnamed" "09v8fjy6jqypm1i121kilg3z6zpw7dm0i4gxhd9b7ihprvzvy8r7")
> + ("vanities" "0m3vfq9l71pbb80qz4s3k8r5azmm158chqbw8snch09ymxm6h462")
> + ("vegetation" "07yzm9lbzr624j4i652ny5p762p83gadg40c1k8gwff4y7yk55gn")
> + ("weapons" "05fsp17gdrhjqdwia7rwdw9gcijaqwcnny8lf6krms43xmn8cj0x")
> + ("wicked" "0jjgwzdibr5my369gwvmvbklpjlwq939zgf643rv0168xc087xb2"))))
> (package
> (name "red-eclipse")
> - (version "1.5.8")
> + (version (if (zero? revision)
> + release
> + (string-append release "-"
> + (number->string revision))))
> (source (origin
> (method url-fetch)
> (uri (string-append "https://github.com/red-eclipse/base"
> - "/archive/v" version ".tar.gz"))
> + "/archive/v" release ".tar.gz"))
> (file-name (string-append name "-" version ".tar.gz"))
The file-name now needs to use the upstream release number instead of the
Guix-specific version number.
> (sha256
> (base32
> @@ -2769,7 +2775,9 @@ http://lavachat.symlynx.com/unix/")
> `(#:tests? #f ; no check target
> #:make-flags (list "CC=gcc" "-Csrc"
> (string-append "INSTDIR="
> - (assoc-ref %outputs "out") "/bin"))
> + (assoc-ref %outputs "out") "/bin")
> + (string-append "prefix="
> + (assoc-ref %outputs "out")))
> #:phases
> (modify-phases %standard-phases
> (add-after 'unpack 'unpack-data
> @@ -2782,17 +2790,29 @@ http://lavachat.symlynx.com/unix/")
> "-Cdata"
> "--transform"
> (string-append "s/"
> - name "-" ,version "/"
> + name "-" ,release "/"
> name "/")))
> - (list ,@(map car data-sources)))
> - #t))
> + (list ,@(map car data-sources)))))
> + (add-after 'unpack-data 'add-store-data-package-path-as-default
> + (lambda* (#:key outputs #:allow-other-keys)
> + (substitute* "src/engine/server.cpp"
> + (("(else[[:space:]]*)((addpackagedir\\()\"data\"(\\);))" _ else_part addpackagedir_original addpackagedir_open addpackagedir_close)
> + (string-append else_part
> + "{ "
> + addpackagedir_open
> + "\""
> + (assoc-ref outputs "out")
> + "/share/redeclipse/data\""
> + addpackagedir_close
> + " "
> + addpackagedir_original
> + " }")))))
> (delete 'configure) ; no configure script
> (add-after 'set-paths 'set-sdl-paths
> (lambda* (#:key inputs #:allow-other-keys)
> (setenv "CPATH"
> (string-append (assoc-ref inputs "sdl-union")
> - "/include/SDL2"))
> - #t))
> + "/include/SDL2"))))
> (add-after 'install 'copy-data
> (lambda* (#:key outputs #:allow-other-keys)
> (let ((out (assoc-ref outputs "out")))
> @@ -2801,8 +2821,10 @@ http://lavachat.symlynx.com/unix/")
> (copy-file "doc/examples/servinit.cfg"
> (string-append out "/config/servinit.cfg"))
> (copy-recursively "data"
> - (string-append out "/data")))
> - #t))
> + (string-append out "/share/redeclipse/data"))
> + (mkdir-p (string-append out "/lib/redeclipse"))
> + (symlink (string-append out "/share/redeclipse/data")
> + (string-append out "/lib/redeclipse/data")))))
> (add-after 'copy-data 'wrap-program
> (lambda* (#:key inputs outputs #:allow-other-keys)
> (let* ((out (assoc-ref outputs "out"))
> @@ -2831,8 +2853,7 @@ exec -a \"$0\" ~a/.redeclipse_server_linux-real~%"
> (string-append out)
> (string-append bin))))
> (chmod "redeclipse_linux" #o555)
> - (chmod "redeclipse_server_linux" #o555)))
> - #t)))))
> + (chmod "redeclipse_server_linux" #o555))))))))
> (native-inputs `(("pkg-config" ,pkg-config)))
> (inputs
> `(("curl" ,curl)
> @@ -2848,7 +2869,7 @@ exec -a \"$0\" ~a/.redeclipse_server_linux-real~%"
> (method url-fetch)
> (uri (string-append
> "https://github.com/red-eclipse/"
> - name "/archive/v" version ".tar.gz"))
> + name "/archive/v" release ".tar.gz"))
> (sha256 (base32 hash))
> (file-name (string-append name "-" version
> ".tar.gz"))))))
Thanks for your work!
[signature.asc (application/pgp-signature, inline)]
guix-patches <at> gnu.org:bug#28164; Package guix-patches.
(Sat, 07 Oct 2017 20:50:02 GMT) Full text and rfc822 format available.Message #11 received at 28164 <at> debbugs.gnu.org (full text, mbox):
From: ludo <at> gnu.org (Ludovic Courtès) To: Kei Kebreau <kkebreau <at> posteo.net> Cc: 28164 <at> debbugs.gnu.org, Adonay Felipe Nogueira <adfeno <at> hyperbola.info> Subject: Re: [bug#28164] gnu: red-eclipse: Add store "data" package path as default Date: Sat, 07 Oct 2017 22:49:39 +0200
Kei Kebreau <kkebreau <at> posteo.net> skribis: > Adonay Felipe Nogueira <adfeno <at> hyperbola.info> writes: > >> This is an attempt to fix bug#25034 >> ([[https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25034]]). >> > > Nice catch! Kei, Adonay: what's the status of this patch? https://bugs.gnu.org/28164 TIA, Ludo'.
guix-patches <at> gnu.org:bug#28164; Package guix-patches.
(Mon, 09 Oct 2017 16:36:01 GMT) Full text and rfc822 format available.Message #14 received at 28164 <at> debbugs.gnu.org (full text, mbox):
From: Kei Kebreau <kkebreau <at> posteo.net> To: ludo <at> gnu.org (Ludovic Courtès) Cc: Adonay Felipe Nogueira <adfeno <at> hyperbola.info>, 28164 <at> debbugs.gnu.org Subject: Re: [bug#28164] gnu: red-eclipse: Add store "data" package path as default Date: Mon, 09 Oct 2017 12:34:42 -0400
[Message part 1 (text/plain, inline)]
ludo <at> gnu.org (Ludovic Courtès) writes:
> Kei Kebreau <kkebreau <at> posteo.net> skribis:
>
>> Adonay Felipe Nogueira <adfeno <at> hyperbola.info> writes:
>>
>>> This is an attempt to fix bug#25034
>>> ([[https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25034]]).
>>>
>>
>> Nice catch!
>
> Kei, Adonay: what's the status of this patch?
>
> https://bugs.gnu.org/28164
>
> TIA,
> Ludo'.
I've attached the tentative patch, which differs a bit from Adonay's
patch. Namely, I've kept the #t's at the end of the phases, changed
from the version string ("1.5.8-2") to release ("1.5.8") in the URL so
the download works again and corrected the sha256 hash becuase of the
new file name based on the version string.
[0001-gnu-red-eclipse-Add-store-data-package-path-as-defau.patch (text/plain, attachment)]
[signature.asc (application/pgp-signature, inline)]
guix-patches <at> gnu.org:bug#28164; Package guix-patches.
(Mon, 09 Oct 2017 16:59:01 GMT) Full text and rfc822 format available.Message #17 received at 28164 <at> debbugs.gnu.org (full text, mbox):
From: Adonay Felipe Nogueira <adfeno <at> hyperbola.info> To: 28164 <at> debbugs.gnu.org Subject: Re: [bug#28164] gnu: red-eclipse: Add store "data" package path as default Date: Mon, 09 Oct 2017 13:58:12 -0300
Looks good to me. ;)
Kei Kebreau <kkebreau <at> posteo.net> writes:
> I've attached the tentative patch, which differs a bit from Adonay's
> patch. Namely, I've kept the #t's at the end of the phases, changed
> from the version string ("1.5.8-2") to release ("1.5.8") in the URL so
> the download works again and corrected the sha256 hash becuase of the
> new file name based on the version string.
guix-patches <at> gnu.org:bug#28164; Package guix-patches.
(Tue, 10 Oct 2017 07:21:01 GMT) Full text and rfc822 format available.Message #20 received at 28164 <at> debbugs.gnu.org (full text, mbox):
From: ludo <at> gnu.org (Ludovic Courtès) To: Kei Kebreau <kkebreau <at> posteo.net> Cc: Adonay Felipe Nogueira <adfeno <at> hyperbola.info>, 28164 <at> debbugs.gnu.org Subject: Re: [bug#28164] gnu: red-eclipse: Add store "data" package path as default Date: Tue, 10 Oct 2017 09:20:25 +0200
Kei Kebreau <kkebreau <at> posteo.net> skribis: > From 59e71c1f353fc895318612e7cffe890e1caac029 Mon Sep 17 00:00:00 2001 > From: Adonay Felipe Nogueira <adfeno <at> hyperbola.info> > Date: Sun, 20 Aug 2017 15:28:20 -0300 > Subject: [PATCH] gnu: red-eclipse: Add store "data" package path as default. > > * gnu/packages/games.scm (red-eclipse): Remove extra spaces. Make version > respect documentation. > [arguments]: Add "prefix" to make-flags. Add > "add-store-data-package-path-as-default" phase. Improve "copy-data" phase. > > Signed-off-by: Kei Kebreau <kkebreau <at> posteo.net> At first sight, it LGTM. I think you can go ahead. Thank you Adonay & Kei! Ludo’.
Kei Kebreau <kkebreau <at> posteo.net>:Adonay Felipe Nogueira <adfeno <at> hyperbola.info>:Message #25 received at 28164-done <at> debbugs.gnu.org (full text, mbox):
From: Kei Kebreau <kkebreau <at> posteo.net> To: ludo <at> gnu.org (Ludovic Courtès) Cc: Adonay Felipe Nogueira <adfeno <at> hyperbola.info>, 28164-done <at> debbugs.gnu.org Subject: Re: [bug#28164] gnu: red-eclipse: Add store "data" package path as default Date: Tue, 10 Oct 2017 08:27:14 -0400
[Message part 1 (text/plain, inline)]
ludo <at> gnu.org (Ludovic Courtès) writes: > Kei Kebreau <kkebreau <at> posteo.net> skribis: > >> From 59e71c1f353fc895318612e7cffe890e1caac029 Mon Sep 17 00:00:00 2001 >> From: Adonay Felipe Nogueira <adfeno <at> hyperbola.info> >> Date: Sun, 20 Aug 2017 15:28:20 -0300 >> Subject: [PATCH] gnu: red-eclipse: Add store "data" package path as default. >> >> * gnu/packages/games.scm (red-eclipse): Remove extra spaces. Make version >> respect documentation. >> [arguments]: Add "prefix" to make-flags. Add >> "add-store-data-package-path-as-default" phase. Improve "copy-data" phase. >> >> Signed-off-by: Kei Kebreau <kkebreau <at> posteo.net> > > At first sight, it LGTM. I think you can go ahead. > > Thank you Adonay & Kei! > > Ludo’. Pushed to master as 42abb842f64f5dd7834cabd445a5f4d01f1e68a4.
[signature.asc (application/pgp-signature, inline)]
guix-patches <at> gnu.org:bug#28164; Package guix-patches.
(Thu, 12 Oct 2017 13:34:01 GMT) Full text and rfc822 format available.Message #28 received at 28164 <at> debbugs.gnu.org (full text, mbox):
From: Adonay Felipe Nogueira <adfeno <at> hyperbola.info> To: 28164 <at> debbugs.gnu.org Subject: Re: [bug#28164] gnu: red-eclipse: Add store "data" package path as default Date: Thu, 12 Oct 2017 10:33:18 -0300
You're welcome! ;) ludo <at> gnu.org (Ludovic Courtès) writes: > At first sight, it LGTM. I think you can go ahead. > > Thank you Adonay & Kei! > > Ludo’. >
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Fri, 10 Nov 2017 12:24:04 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.