From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35616) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvmPW-0004Ba-4g for guix-patches@gnu.org; Sat, 23 Sep 2017 11:32:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvmPS-0001Lt-TD for guix-patches@gnu.org; Sat, 23 Sep 2017 11:32:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:46055) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dvmPS-0001Lj-P1 for guix-patches@gnu.org; Sat, 23 Sep 2017 11:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dvmPS-0006EO-BZ for guix-patches@gnu.org; Sat, 23 Sep 2017 11:32:02 -0400 Subject: [bug#28164] gnu: red-eclipse: Add store "data" package path as default Resent-Message-ID: From: Kei Kebreau In-Reply-To: <871so63xh7.fsf@hyperbola.info> (Adonay Felipe Nogueira's message of "Sun, 20 Aug 2017 15:28:20 -0300") References: <871so63xh7.fsf@hyperbola.info> Date: Sat, 23 Sep 2017 11:30:31 -0400 Message-ID: <87vak9sa94.fsf@posteo.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Adonay Felipe Nogueira Cc: 28164@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Adonay Felipe Nogueira writes: > This is an attempt to fix bug#25034 > ([[https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D25034]]). > Nice catch! > --=20 > - [[https://libreplanet.org/wiki/User:Adfeno]] > - Palestrante e consultor sobre /software/ livre (n=C3=A3o confundir com > gratis). > - "WhatsApp"? Ele n=C3=A3o =C3=A9 livre. Por favor, use o GNU Ring ou o T= ox. > - 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=C3=A3o ODF), OGG, OPUS, PDF > (apenas sem DRM), PNG, TXT, WEBM. > >>>From 6e1d96b5aeaca1a307d8fa42d12fc233e9cd831b Mon Sep 17 00:00:00 2001 > From: Adonay Felipe Nogueira > Date: Sun, 20 Aug 2017 14:51:16 -0300 > Subject: [PATCH] gnu: red-eclipse: Add store "data" package path as defau= lt > > * gnu/packages/games.scm (red-eclipse): Remove "#t"s and extra spaces. Ma= ke 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 =C2=A9 2016, 2017 Efraim Flashner > ;;; Copyright =C2=A9 2016 Jan Nieuwenhuizen > ;;; Copyright =C2=A9 2016 Steve Webber > -;;; Copyright =C2=A9 2017 Adonay "adfeno" Felipe Nogueira > +;;; Copyright =C2=A9 2017 Adonay "adfeno" Felipe Nogueira > ;;; Copyright =C2=A9 2017 Arun Isaac > ;;; Copyright =C2=A9 2017 Tobias Geerinckx-Rice > ;;; Copyright =C2=A9 2017 nee > @@ -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+))) >=20=20 > (define-public red-eclipse > - (let ((data-sources > - '(("acerspyro" "0zmg78scrfdv33h7vszqvzylcqjwg7d5b0j2riav3rjfh= 326j8xx") > - ("actors" "0l00rsvppqzdpsikm5qpj38jiygirszxlzay2nxp4g4n2= qjq0m4a") > - ("appleflap" "0jhfr7f13hk3nswwxqc4jajriipr6zz6j63v955nv4sgx= s7lzbjd") > - ("blendbrush" "1nk0zaisbqf2khrivq8ls6z2lnh6d51m133m2ppxk7k4c= 9gq1imq") > - ("caustics" "1hq08k476wayi0kmk4ps8h6jr75yinq04f1r2p8r79xsd= pxq9my5") > - ("crosshairs" "1gmrmjm7i7n9py0qrzamk7ygi63yx1mr2pp6iwz2vwngp= rl03n8m") > - ("dziq" "0gr36ydrv8syjxv7w9dw3ix8waaq201fzxr0klkqp260p= 8xp215s") > - ("elyvisions" "05syxlpsap6nfwxnnd0ls7qj1p4vhw2jxi41pi5inwpfi= fapfphz") > - ("fonts" "184syks602xc657q08973w5ji50x5zssvd4vp2q2ig8m6= 8iyr51c") > + (let ((release "1.5.8") > + (revision 2) > + (data-sources > + '(("acerspyro" "0zmg78scrfdv33h7vszqvzylcqjwg7d5b0j2riav3rjfh32= 6j8xx") > + ("actors" "0l00rsvppqzdpsikm5qpj38jiygirszxlzay2nxp4g4n2qjq0m= 4a") > + ("appleflap" "0jhfr7f13hk3nswwxqc4jajriipr6zz6j63v955nv4sgxs7= lzbjd") > + ("blendbrush" "1nk0zaisbqf2khrivq8ls6z2lnh6d51m133m2ppxk7k4c9= gq1imq") > + ("caustics" "1hq08k476wayi0kmk4ps8h6jr75yinq04f1r2p8r79xsdpxq= 9my5") > + ("crosshairs" "1gmrmjm7i7n9py0qrzamk7ygi63yx1mr2pp6iwz2vwngpr= l03n8m") > + ("dziq" "0gr36ydrv8syjxv7w9dw3ix8waaq201fzxr0klkqp260p8xp215s= ") > + ("elyvisions" "05syxlpsap6nfwxnnd0ls7qj1p4vhw2jxi41pi5inwpfif= apfphz") > + ("fonts" "184syks602xc657q08973w5ji50x5zssvd4vp2q2ig8m68iyr51= c") > ("freezurbern" "020gpgcpy4rqjd9d18npfm96j8f02jcjnccbxcgzk1yb5= 8y687ya") > - ("john" "0hj5kwlb2gb0gsnl9bk7dkqlk8r7vxcw8gxpgrb3kfn8d= 9cwcb7k") > - ("jojo" "0fij06040r7s5p7jksxm7wxi9jqwkhhm8iywys0dagk8j= 2wcbvsz") > - ("jwin" "0ysfynjvypc8dszf7rsvk02jgw8fmsli49vy2xpm83zpk= rqpddgf") > + ("john" "0hj5kwlb2gb0gsnl9bk7dkqlk8r7vxcw8gxpgrb3kfn8d9cwcb7k= ") > + ("jojo" "0fij06040r7s5p7jksxm7wxi9jqwkhhm8iywys0dagk8j2wcbvsz= ") > + ("jwin" "0ysfynjvypc8dszf7rsvk02jgw8fmsli49vy2xpm83zpkrqpddgf= ") > ("luckystrike" "1bm0xdqjv35ry5xwbzw3a3v1xf2gj1jwfg29nyl6w3ch0= h6crr11") > - ("maps" "0c9d1zxmpnngwhchzw6xb6cf84cx8xyycmdqcvyhamrd9= 5d96qma") > - ("mayhem" "133pdql7ari159skd9qdmw0p1m73x32d1v6jswkz0xwk8= vgxmkil") > - ("mikeplus64" "1d5npn9wlw0mviz9vhzzcsj98jvfh1wbvlh1nyqfj4ws5= nfxhs7x") > - ("misc" "19x2ps6yxnfrz0xdhqdwncaq25ds7i4w2l8sdfi95yh2r= 7c5k1qn") > - ("nieb" "15029nipl92cb0jbh46z00k51hf3jk4v05pwx266b6b11= bapdz0c") > - ("nobiax" "0k9apim5z4ihd5ajmnbq4gyh24w872dv0mr5v8wqn31a8= gxzahhp") > - ("particles" "06827r9pnhzjil381xiwcbc93v9nxin7qlr59yrvk9gdz= xmklk9m") > - ("philipk" "1l6fhl6qz471vjn05hvk29bm8dhwnzqbmi2hdylpa9k99= 8nzkfc1") > + ("maps" "0c9d1zxmpnngwhchzw6xb6cf84cx8xyycmdqcvyhamrd95d96qma= ") > + ("mayhem" "133pdql7ari159skd9qdmw0p1m73x32d1v6jswkz0xwk8vgxmk= il") > + ("mikeplus64" "1d5npn9wlw0mviz9vhzzcsj98jvfh1wbvlh1nyqfj4ws5n= fxhs7x") > + ("misc" "19x2ps6yxnfrz0xdhqdwncaq25ds7i4w2l8sdfi95yh2r7c5k1qn= ") > + ("nieb" "15029nipl92cb0jbh46z00k51hf3jk4v05pwx266b6b11bapdz0c= ") > + ("nobiax" "0k9apim5z4ihd5ajmnbq4gyh24w872dv0mr5v8wqn31a8gxzah= hp") > + ("particles" "06827r9pnhzjil381xiwcbc93v9nxin7qlr59yrvk9gdzxm= klk9m") > + ("philipk" "1l6fhl6qz471vjn05hvk29bm8dhwnzqbmi2hdylpa9k998nzk= fc1") > ("projectiles" "03ay8ik52n3vx723swqlnl5gpkzf1v1gadwj3zcnh43ch= 7nd2bqh") > - ("props" "1yxz7gfmb79sqqrkyfdzp4ar9rf5f1kpfij4nrkk1l8vb= w9liksc") > - ("skyboxes" "1mm98mhb6yhb006p1hlic91jcwjxhq79mblxciwbqqa9c= 5g4yki6") > - ("snipergoth" "1vlpmwlg71g6l5b706gp82bc07i5bbw2zphzynm2fx49z= a0zdi44") > - ("sounds" "156g5wh8cvdh6zr33haqm566sd28ylnzdf2h4pqzpxbb2= i19vbfg") > - ("textures" "0wkhl5cgymr9kslzhksi83hs15rb0q01xvax5khi6b4dc= l3mrmsh") > - ("torley" "1xlag6ndjyqafl984n6d9zi96dv9aif7vrc2nvikc3iwg= jwlbxav") > - ("trak" "12x9ix8zkqn9svy56qmdgj4x2814qh25f4srplgq691lq= n9qjhvd") > - ("ulukai" "0gz1hd8hca2biskc85hw4jjacpsmqg9x4w6cwrka8x987= xmc92k5") > - ("unnamed" "09v8fjy6jqypm1i121kilg3z6zpw7dm0i4gxhd9b7ihpr= vzvy8r7") > - ("vanities" "0m3vfq9l71pbb80qz4s3k8r5azmm158chqbw8snch09ym= xm6h462") > - ("vegetation" "07yzm9lbzr624j4i652ny5p762p83gadg40c1k8gwff4y= 7yk55gn") > - ("weapons" "05fsp17gdrhjqdwia7rwdw9gcijaqwcnny8lf6krms43x= mn8cj0x") > - ("wicked" "0jjgwzdibr5my369gwvmvbklpjlwq939zgf643rv0168x= c087xb2")))) > + ("props" "1yxz7gfmb79sqqrkyfdzp4ar9rf5f1kpfij4nrkk1l8vbw9liks= c") > + ("skyboxes" "1mm98mhb6yhb006p1hlic91jcwjxhq79mblxciwbqqa9c5g4= yki6") > + ("snipergoth" "1vlpmwlg71g6l5b706gp82bc07i5bbw2zphzynm2fx49za= 0zdi44") > + ("sounds" "156g5wh8cvdh6zr33haqm566sd28ylnzdf2h4pqzpxbb2i19vb= fg") > + ("textures" "0wkhl5cgymr9kslzhksi83hs15rb0q01xvax5khi6b4dcl3m= rmsh") > + ("torley" "1xlag6ndjyqafl984n6d9zi96dv9aif7vrc2nvikc3iwgjwlbx= av") > + ("trak" "12x9ix8zkqn9svy56qmdgj4x2814qh25f4srplgq691lqn9qjhvd= ") > + ("ulukai" "0gz1hd8hca2biskc85hw4jjacpsmqg9x4w6cwrka8x987xmc92= k5") > + ("unnamed" "09v8fjy6jqypm1i121kilg3z6zpw7dm0i4gxhd9b7ihprvzvy= 8r7") > + ("vanities" "0m3vfq9l71pbb80qz4s3k8r5azmm158chqbw8snch09ymxm6= h462") > + ("vegetation" "07yzm9lbzr624j4i652ny5p762p83gadg40c1k8gwff4y7= yk55gn") > + ("weapons" "05fsp17gdrhjqdwia7rwdw9gcijaqwcnny8lf6krms43xmn8c= j0x") > + ("wicked" "0jjgwzdibr5my369gwvmvbklpjlwq939zgf643rv0168xc087x= b2")))) > (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=3Dgcc" "-Csrc" > (string-append "INSTDIR=3D" > - (assoc-ref %outputs "out") "/= bin")) > + (assoc-ref %outputs "out") "/= bin") > + (string-append "prefix=3D" > + (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! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlnGfhcACgkQ5qXuPBlG eg03eQ/+Jz2a+2+icvUCfbbXY1aTZRfzGgn9OArWnTDD/cLRl0gDGkCp9bOLGoxa Ey6oy3bwa4AsccwhUhrzlInOkO5IQJtR4ja2/iKPGrQYMxHURDzCGWtqH5IHp0Av /kkOCyJetugfR0KqJOeY0XykRHHyeChUUzwZt1U7bU6hVLPFVKHdStZasKzR8VEH Sn0o1MaEpKBBvJUhL6BK5Nk/K52exRJfJiSFoVhLRgHxiKtBA4XPLHLgD1OAWzl2 l1Zas+8MpmdDuwfzlh+aPL3Q67TAEzIIqfruya+ljCmslidSQtpNe1ju6GKvTYp5 JQ54kYtyAvpY30w2E07cxFmpg9kGWEaGk0IQe3HbZfdRIrIFdyjqmuPubqxB1gOw CVu0Xv9t34RXu5gmP4d8X60DLWIBWGRTsWyQKHkRx7EvjRDjxrYf2fYDqK2m5C9n wJmanp89tM+FjObakE24AwONqP227+bWkl5ToYBdeehTfFQ3NFFIdJjzapa2DDCC Fu8ThXWMix8fBOMHn6cEtKKCpHOwqRs4TDoqSFM+ydkF/hwQK8KtQZ/o9t3dLzQB qLoNXfaaLOSr/clWkMH2XU2YUYUWGk9EWZ+8E2RiyPP3rn8jw/It+wPb584H5LrN x3u5qAeIAF8ep4U3wTOUDtOFxyvOMYg5kIO2Rkh4UIOg+CUHBcM= =rKwZ -----END PGP SIGNATURE----- --=-=-=--