From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37064) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1b2J-00066p-4Q for guix-patches@gnu.org; Mon, 09 Oct 2017 12:36:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1b2A-00036W-Cp for guix-patches@gnu.org; Mon, 09 Oct 2017 12:36:11 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:49818) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e1b2A-00035n-7G for guix-patches@gnu.org; Mon, 09 Oct 2017 12:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e1b29-0007l5-Ot for guix-patches@gnu.org; Mon, 09 Oct 2017 12:36:01 -0400 Subject: [bug#28164] gnu: red-eclipse: Add store "data" package path as default Resent-Message-ID: From: Kei Kebreau In-Reply-To: <87bmliisyk.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Sat, 07 Oct 2017 22:49:39 +0200") References: <871so63xh7.fsf@hyperbola.info> <87vak9sa94.fsf@posteo.net> <87bmliisyk.fsf@gnu.org> Date: Mon, 09 Oct 2017 12:34:42 -0400 Message-ID: <87mv50b7q5.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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 28164@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ludo@gnu.org (Ludovic Court=C3=A8s) writes: > Kei Kebreau skribis: > >> Adonay Felipe Nogueira writes: >> >>> This is an attempt to fix bug#25034 >>> ([[https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D25034]]). >>> >> >> 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. --=-=-= Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-red-eclipse-Add-store-data-package-path-as-defau.patch Content-Transfer-Encoding: quoted-printable From=2059e71c1f353fc895318612e7cffe890e1caac029 Mon Sep 17 00:00:00 2001 From: Adonay Felipe Nogueira 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 =2D-- gnu/packages/games.scm | 110 ++++++++++++++++++++++++++++++---------------= ---- 1 file changed, 68 insertions(+), 42 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 7729c5b3b..3702c3c61 100644 =2D-- 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 =2D;;; 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) @@ -2796,60 +2797,67 @@ http://lavachat.symlynx.com/unix/") (license license:gpl2+))) =20 (define-public red-eclipse =2D (let ((data-sources =2D '(("acerspyro" "0zmg78scrfdv33h7vszqvzylcqjwg7d5b0j2riav3rjfh= 326j8xx") =2D ("actors" "0l00rsvppqzdpsikm5qpj38jiygirszxlzay2nxp4g4n2= qjq0m4a") =2D ("appleflap" "0jhfr7f13hk3nswwxqc4jajriipr6zz6j63v955nv4sgx= s7lzbjd") =2D ("blendbrush" "1nk0zaisbqf2khrivq8ls6z2lnh6d51m133m2ppxk7k4c= 9gq1imq") =2D ("caustics" "1hq08k476wayi0kmk4ps8h6jr75yinq04f1r2p8r79xsd= pxq9my5") =2D ("crosshairs" "1gmrmjm7i7n9py0qrzamk7ygi63yx1mr2pp6iwz2vwngp= rl03n8m") =2D ("dziq" "0gr36ydrv8syjxv7w9dw3ix8waaq201fzxr0klkqp260p= 8xp215s") =2D ("elyvisions" "05syxlpsap6nfwxnnd0ls7qj1p4vhw2jxi41pi5inwpfi= fapfphz") =2D ("fonts" "184syks602xc657q08973w5ji50x5zssvd4vp2q2ig8m6= 8iyr51c") + (let ((release "1.5.8") + (revision 2) + (data-sources + '(("acerspyro" "0zmg78scrfdv33h7vszqvzylcqjwg7d5b0j2riav3rjfh326j= 8xx") + ("actors" "0l00rsvppqzdpsikm5qpj38jiygirszxlzay2nxp4g4n2qjq0m4a= ") + ("appleflap" "0jhfr7f13hk3nswwxqc4jajriipr6zz6j63v955nv4sgxs7lz= bjd") + ("blendbrush" "1nk0zaisbqf2khrivq8ls6z2lnh6d51m133m2ppxk7k4c9gq= 1imq") + ("caustics" "1hq08k476wayi0kmk4ps8h6jr75yinq04f1r2p8r79xsdpxq9m= y5") + ("crosshairs" "1gmrmjm7i7n9py0qrzamk7ygi63yx1mr2pp6iwz2vwngprl0= 3n8m") + ("dziq" "0gr36ydrv8syjxv7w9dw3ix8waaq201fzxr0klkqp260p8xp215s") + ("elyvisions" "05syxlpsap6nfwxnnd0ls7qj1p4vhw2jxi41pi5inwpfifap= fphz") + ("fonts" "184syks602xc657q08973w5ji50x5zssvd4vp2q2ig8m68iyr51c") ("freezurbern" "020gpgcpy4rqjd9d18npfm96j8f02jcjnccbxcgzk1yb58y= 687ya") =2D ("john" "0hj5kwlb2gb0gsnl9bk7dkqlk8r7vxcw8gxpgrb3kfn8d= 9cwcb7k") =2D ("jojo" "0fij06040r7s5p7jksxm7wxi9jqwkhhm8iywys0dagk8j= 2wcbvsz") =2D ("jwin" "0ysfynjvypc8dszf7rsvk02jgw8fmsli49vy2xpm83zpk= rqpddgf") + ("john" "0hj5kwlb2gb0gsnl9bk7dkqlk8r7vxcw8gxpgrb3kfn8d9cwcb7k") + ("jojo" "0fij06040r7s5p7jksxm7wxi9jqwkhhm8iywys0dagk8j2wcbvsz") + ("jwin" "0ysfynjvypc8dszf7rsvk02jgw8fmsli49vy2xpm83zpkrqpddgf") ("luckystrike" "1bm0xdqjv35ry5xwbzw3a3v1xf2gj1jwfg29nyl6w3ch0h6= crr11") =2D ("maps" "0c9d1zxmpnngwhchzw6xb6cf84cx8xyycmdqcvyhamrd9= 5d96qma") =2D ("mayhem" "133pdql7ari159skd9qdmw0p1m73x32d1v6jswkz0xwk8= vgxmkil") =2D ("mikeplus64" "1d5npn9wlw0mviz9vhzzcsj98jvfh1wbvlh1nyqfj4ws5= nfxhs7x") =2D ("misc" "19x2ps6yxnfrz0xdhqdwncaq25ds7i4w2l8sdfi95yh2r= 7c5k1qn") =2D ("nieb" "15029nipl92cb0jbh46z00k51hf3jk4v05pwx266b6b11= bapdz0c") =2D ("nobiax" "0k9apim5z4ihd5ajmnbq4gyh24w872dv0mr5v8wqn31a8= gxzahhp") =2D ("particles" "06827r9pnhzjil381xiwcbc93v9nxin7qlr59yrvk9gdz= xmklk9m") =2D ("philipk" "1l6fhl6qz471vjn05hvk29bm8dhwnzqbmi2hdylpa9k99= 8nzkfc1") + ("maps" "0c9d1zxmpnngwhchzw6xb6cf84cx8xyycmdqcvyhamrd95d96qma") + ("mayhem" "133pdql7ari159skd9qdmw0p1m73x32d1v6jswkz0xwk8vgxmkil= ") + ("mikeplus64" "1d5npn9wlw0mviz9vhzzcsj98jvfh1wbvlh1nyqfj4ws5nfx= hs7x") + ("misc" "19x2ps6yxnfrz0xdhqdwncaq25ds7i4w2l8sdfi95yh2r7c5k1qn") + ("nieb" "15029nipl92cb0jbh46z00k51hf3jk4v05pwx266b6b11bapdz0c") + ("nobiax" "0k9apim5z4ihd5ajmnbq4gyh24w872dv0mr5v8wqn31a8gxzahhp= ") + ("particles" "06827r9pnhzjil381xiwcbc93v9nxin7qlr59yrvk9gdzxmkl= k9m") + ("philipk" "1l6fhl6qz471vjn05hvk29bm8dhwnzqbmi2hdylpa9k998nzkfc= 1") ("projectiles" "03ay8ik52n3vx723swqlnl5gpkzf1v1gadwj3zcnh43ch7n= d2bqh") =2D ("props" "1yxz7gfmb79sqqrkyfdzp4ar9rf5f1kpfij4nrkk1l8vb= w9liksc") =2D ("skyboxes" "1mm98mhb6yhb006p1hlic91jcwjxhq79mblxciwbqqa9c= 5g4yki6") =2D ("snipergoth" "1vlpmwlg71g6l5b706gp82bc07i5bbw2zphzynm2fx49z= a0zdi44") =2D ("sounds" "156g5wh8cvdh6zr33haqm566sd28ylnzdf2h4pqzpxbb2= i19vbfg") =2D ("textures" "0wkhl5cgymr9kslzhksi83hs15rb0q01xvax5khi6b4dc= l3mrmsh") =2D ("torley" "1xlag6ndjyqafl984n6d9zi96dv9aif7vrc2nvikc3iwg= jwlbxav") =2D ("trak" "12x9ix8zkqn9svy56qmdgj4x2814qh25f4srplgq691lq= n9qjhvd") =2D ("ulukai" "0gz1hd8hca2biskc85hw4jjacpsmqg9x4w6cwrka8x987= xmc92k5") =2D ("unnamed" "09v8fjy6jqypm1i121kilg3z6zpw7dm0i4gxhd9b7ihpr= vzvy8r7") =2D ("vanities" "0m3vfq9l71pbb80qz4s3k8r5azmm158chqbw8snch09ym= xm6h462") =2D ("vegetation" "07yzm9lbzr624j4i652ny5p762p83gadg40c1k8gwff4y= 7yk55gn") =2D ("weapons" "05fsp17gdrhjqdwia7rwdw9gcijaqwcnny8lf6krms43x= mn8cj0x") =2D ("wicked" "0jjgwzdibr5my369gwvmvbklpjlwq939zgf643rv0168x= c087xb2")))) + ("props" "1yxz7gfmb79sqqrkyfdzp4ar9rf5f1kpfij4nrkk1l8vbw9liksc") + ("skyboxes" "1mm98mhb6yhb006p1hlic91jcwjxhq79mblxciwbqqa9c5g4yk= i6") + ("snipergoth" "1vlpmwlg71g6l5b706gp82bc07i5bbw2zphzynm2fx49za0z= di44") + ("sounds" "156g5wh8cvdh6zr33haqm566sd28ylnzdf2h4pqzpxbb2i19vbfg= ") + ("textures" "0wkhl5cgymr9kslzhksi83hs15rb0q01xvax5khi6b4dcl3mrm= sh") + ("torley" "1xlag6ndjyqafl984n6d9zi96dv9aif7vrc2nvikc3iwgjwlbxav= ") + ("trak" "12x9ix8zkqn9svy56qmdgj4x2814qh25f4srplgq691lqn9qjhvd") + ("ulukai" "0gz1hd8hca2biskc85hw4jjacpsmqg9x4w6cwrka8x987xmc92k5= ") + ("unnamed" "09v8fjy6jqypm1i121kilg3z6zpw7dm0i4gxhd9b7ihprvzvy8r= 7") + ("vanities" "0m3vfq9l71pbb80qz4s3k8r5azmm158chqbw8snch09ymxm6h4= 62") + ("vegetation" "07yzm9lbzr624j4i652ny5p762p83gadg40c1k8gwff4y7yk= 55gn") + ("weapons" "05fsp17gdrhjqdwia7rwdw9gcijaqwcnny8lf6krms43xmn8cj0= x") + ("wicked" "0jjgwzdibr5my369gwvmvbklpjlwq939zgf643rv0168xc087xb2= ")))) (package (name "red-eclipse") =2D (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" =2D "/archive/v" version ".tar.gz")) + "/archive/v" release ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 =2D "1ah92axwcai0fhgm7pvfb2dxvfdiwwyh8iqyiffndh6782hxz3bc"= )))) + "0r66rsqxvd7hxrhb0fahqqmf3r0cw2drhv5vndbswcq90l1bxfmf"))= )) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target #:make-flags (list "CC=3Dgcc" "-Csrc" (string-append "INSTDIR=3D" =2D (assoc-ref %outputs "out") "/= bin")) + (assoc-ref %outputs "out") "/bi= n") + (string-append "prefix=3D" + (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (add-after 'unpack 'unpack-data @@ -2862,10 +2870,25 @@ http://lavachat.symlynx.com/unix/") "-Cdata" "--transform" (string-append "s/" =2D name "-" ,version "/" + name "-" ,release "/" name "/"))) (list ,@(map car data-sources))) #t)) + (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 + " }"))) + #t)) (delete 'configure) ; no configure script (add-after 'set-paths 'set-sdl-paths (lambda* (#:key inputs #:allow-other-keys) @@ -2881,7 +2904,10 @@ http://lavachat.symlynx.com/unix/") (copy-file "doc/examples/servinit.cfg" (string-append out "/config/servinit.cfg")) (copy-recursively "data" =2D (string-append out "/data"))) + (string-append out "/share/redeclipse/d= ata")) + (mkdir-p (string-append out "/lib/redeclipse")) + (symlink (string-append out "/share/redeclipse/data") + (string-append out "/lib/redeclipse/data"))) #t)) (add-after 'copy-data 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) @@ -2928,7 +2954,7 @@ exec -a \"$0\" ~a/.redeclipse_server_linux-real~%" (method url-fetch) (uri (string-append "https://github.com/red-eclipse/" =2D name "/archive/v" version ".tar.gz")) + name "/archive/v" release ".tar.gz")) (sha256 (base32 hash)) (file-name (string-append name "-" version ".tar.gz")))))) =2D-=20 2.14.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlnbpSIACgkQ5qXuPBlG eg1WmA/+LM9oV5B3qoUtyyZxmqtswDAIEdKi3CoM2EOO+zPU4v2WHN999tmotCLE RWTtXxJOCpc/50ILcQ5rzg2SOkG9nqU1aH7/DzZ9Fvg78+TuUZK/IRS73lQq5PK4 ZtBNFLMocPMEse54W/TpeXOWOuA/PKC6ej4uhMip7COSkwBaVKhF3xvFRmD8z18Y LhZXp1egBC8TPziGxaqGskvdGWlJJ3SYIJJyPZv3b3D8e1xtlS8NDYWTlkBU4ByV w1+ne0hy2jplcPC8iHOQAxGbZH/NTxNwF5nQT2SUBV/HU68TrNTQjS7Lu91WlZpw +rTTLXgKXXXzKe8GWtcXkaGSn+NOxx28peoPB5IbQ1RYKOaxmDTuKL5yvAjMGFyp Z0hxSXdIjqrpcTYLcxwsfVEKZQ2Xj8E3IlhrbLM8MeYU6kD6ClL9hIZKwt2Cuhbz oQm0bbPrk/lFWa1uHZr7J2GDRxvqpMGittw9Z3BPxPxV9GyZvQf9u9wC7xXbdUs6 nRy07RTXdb1qWhz/mO3kwwGumIlHiDHDZZdxge8LjCVaz78HPVvopmKk8ACpvHDx SMd9TdGstMmhiF06SeTe3Toxbr21icUfQ09DPg09cthbJ9nKMJMC7fPJawk8TOsq 4iODHU28tpJgT5G79+Zy5OjQSY+oHhtyyV3hsxUmhGrUYzHit/M= =IC2z -----END PGP SIGNATURE----- --==-=-=--