From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 26 16:07:19 2017 Received: (at submit) by debbugs.gnu.org; 26 Mar 2017 20:07:19 +0000 Received: from localhost ([127.0.0.1]:46220 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1csERa-00070g-Ot for submit@debbugs.gnu.org; Sun, 26 Mar 2017 16:07:19 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35523) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1csERZ-00070R-Ld for submit@debbugs.gnu.org; Sun, 26 Mar 2017 16:07:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1csERS-0007O1-GS for submit@debbugs.gnu.org; Sun, 26 Mar 2017 16:07:11 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_20,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:48206) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1csERS-0007Ni-Cw for submit@debbugs.gnu.org; Sun, 26 Mar 2017 16:07:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54724) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csERQ-0004BS-Nr for guix-patches@gnu.org; Sun, 26 Mar 2017 16:07:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1csERN-0007Hv-ER for guix-patches@gnu.org; Sun, 26 Mar 2017 16:07:08 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:45599 helo=mail.openmailbox.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1csERN-0007CV-1X for guix-patches@gnu.org; Sun, 26 Mar 2017 16:07:05 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id DCA62504580; Sun, 26 Mar 2017 22:06:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1490558819; bh=pOs/lqL90fYpED685pBvOHZeM/opZRje23DiM8Czjsk=; h=From:To:Cc:Subject:Date:From; b=rZbNfPc+oYaogrLcIpFw+z93gpCzMkD8SmBlGLEjQD5sqyasY6bVeL30CkJLD8hx9 Z3mplwAYlKAsvkdFphvb/K76yKtqEvJyWS+UzeW6qKDdODGbphwAzsv+ShSzOn7gUv fGRGamk1NIxwh8AzM/k7emdE3VmXpyNIAGvpLyU0= From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1490558815; bh=pOs/lqL90fYpED685pBvOHZeM/opZRje23DiM8Czjsk=; h=From:To:Cc:Subject:Date:From; b=bw59lcMlLRlW5S9AsJOaSGV5ujS/uC0J58txUPJX/yz9ips63RBPUAulVTXOReZHO auz5t9CJTZv6adszUZjG6syZwYJc7qXIuRbKjRATuzIT9cT730CsVBOhbalNrezMZ/ df66tCNMJD3uepQ1BW4LBYiV+fOIBhi4N5bC3dXQ= To: guix-patches@gnu.org Subject: [PATCH] gnu: hyperrogue: Update to 9.4c. Date: Sun, 26 Mar 2017 16:06:43 -0400 Message-Id: <20170326200643.5256-1-kei@openmailbox.org> X-Mailer: git-send-email 2.12.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit Cc: Kei Kebreau X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) * gnu/packages/games.scm (hyperrogue): Update to 9.4c. --- gnu/packages/games.scm | 89 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 58 insertions(+), 31 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 67fcb7b49..fcfa656e3 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3163,23 +3163,19 @@ throwing people around in pseudo-randomly generated buildings.") (define-public hyperrogue (package (name "hyperrogue") - (version "8.3j") + (version "9.4c") (source (origin (method url-fetch) (uri (string-append "http://www.roguetemple.com/z/hyper/" - name "-83j.zip")) + name (string-join (string-split version #\.) "") + "-src.tgz")) (sha256 (base32 - "1ag95d84m4j0rqyn9hj7655znixw2j57bpf93nk14nfy02xz1g6p")) - (modules '((guix build utils))) - ;; Remove .exe and .dll files. - (snippet - '(for-each delete-file (find-files "." "\\.(exe|dll)$"))))) + "1ri5fllnhqjm3dlnl1xbb9mlv79iigc940vbvcnk0v5k6p58pavq")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no check target - #:make-flags '("-Csrc") #:phases (modify-phases %standard-phases (add-after 'set-paths 'set-sdl-paths @@ -3190,21 +3186,24 @@ throwing people around in pseudo-randomly generated buildings.") ;; Fix font and music paths. (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (dejavu-dir (string-append - (assoc-ref inputs "font-dejavu") - "/share/fonts/truetype")) - (dejavu-font "DejaVuSans-Bold.ttf") - (music-file "hyperrogue-music.txt")) - (with-directory-excursion "src" - (substitute* "graph.cpp" - ((dejavu-font) - (string-append dejavu-dir "/" dejavu-font)) - (((string-append "\\./" music-file)) - (string-append out "/share/hyperrogue/" music-file))) - (substitute* music-file - (("\\*/") - (string-append out "/share/hyperrogue/"))))) + (let* ((out (assoc-ref outputs "out")) + (share-dir (string-append out "/share/hyperrogue")) + (dejavu-dir (string-append + (assoc-ref inputs "font-dejavu") + "/share/fonts/truetype")) + (dejavu-font "DejaVuSans-Bold.ttf") + (music-file "hyperrogue-music.txt")) + (substitute* "graph.cpp" + ((dejavu-font) + (string-append dejavu-dir "/" dejavu-font))) + (substitute* "sound.cpp" + (((string-append "\\./" music-file)) + (string-append share-dir "/" music-file)) + (("sounds/") + (string-append share-dir "/sounds/"))) + (substitute* music-file + (("\\*/") + (string-append share-dir "/sounds/")))) #t)) (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) @@ -3212,13 +3211,25 @@ throwing people around in pseudo-randomly generated buildings.") (bin (string-append out "/bin")) (share-dir (string-append out "/share/hyperrogue"))) (mkdir-p bin) - (copy-file "src/hyper" (string-append bin "/hyperrogue")) - (mkdir-p share-dir) - (copy-file "src/hyperrogue-music.txt" - (string-append share-dir "/hyperrogue-music.txt")) - (for-each (lambda (file) - (copy-file file (string-append share-dir "/" file))) - (find-files "." "\\.ogg$"))) + (copy-file "hyper" (string-append bin "/hyperrogue")) + (install-file "hyperrogue-music.txt" share-dir)) + #t)) + (add-after 'install 'install-data + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((data (assoc-ref inputs "hyperrogue-data")) + (out (assoc-ref outputs "out")) + (share-dir (string-append out "/share/hyperrogue"))) + (system* "tar" "xvf" data "-C" ".") + (with-directory-excursion "hyperrogue94c-win" + (for-each + (lambda (file) + (install-file file (string-append share-dir "/sounds"))) + (append (find-files "." "\\.ogg$") + (find-files "sounds" ".*$"))) + (for-each + (lambda (file) + (install-file file share-dir)) + '("papermodeldata.txt" "papermodeldata-help.txt")))) #t))))) (inputs `(("font-dejavu" ,font-dejavu) @@ -3227,7 +3238,23 @@ throwing people around in pseudo-randomly generated buildings.") ("sdl-union" ,(sdl-union (list sdl sdl-gfx sdl-mixer - sdl-ttf))))) + sdl-ttf))) + ("hyperrogue-data" + ,(origin + (method url-fetch) + (uri + (string-append + "http://www.roguetemple.com/z/hyper/" name + (string-join (string-split version #\.) "") + "-win.zip")) + (sha256 + (base32 + "1cyyrsnrixygg3zyz97hpsm6jzwbhydiwk3kl0lm7qjnw2nzkhhh")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove .exe and .dll files. + (for-each delete-file (find-files "." "\\.(exe|dll)$")))))))) (home-page "http://www.roguetemple.com/z/hyper/") (synopsis "Non-euclidean graphical rogue-like game") (description -- 2.12.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 27 15:11:43 2017 Received: (at 26267) by debbugs.gnu.org; 27 Mar 2017 19:11:43 +0000 Received: from localhost ([127.0.0.1]:47734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1csa3L-0000MP-3Z for submit@debbugs.gnu.org; Mon, 27 Mar 2017 15:11:43 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:56875) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1csa3K-0000MI-0S for 26267@debbugs.gnu.org; Mon, 27 Mar 2017 15:11:42 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 094292081D; Mon, 27 Mar 2017 15:11:39 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Mon, 27 Mar 2017 15:11:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=Roqwu6WKNSwxmJM8bBvIKczCif608sMaoC+a6/ NP9DY=; b=v3UbsE1KyAnDGyvygSGDlF/nQVigGkyZeh8Gbh2NTuUO+WVtQawZ5M 433zatgvVqA3RiEqJdxTM9FFSAqIVu12Xa80Qf0kHgGX9JoQsvCyQnIKUbZsMP2O jYvxiAluYaoDyFxriWhK6Nl9QJdP80jo2YGVdFcOtWXkcSV+vD1ZE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=Roqwu6WKNSwxmJM8bB vIKczCif608sMaoC+a6/NP9DY=; b=lMTgaBJotvBBn74CJ05squyBWNwY4UeNxG LOuOyrfrH7dao38/2+zpMKOIqGCwNc5GipQSlbngl4pDIoYi76dryfTerbGoRine Z0/PH99YEmsvbNPxpillis1l0O0tQYnonTDOw6ZIiPxfMSGxKrgjC7Sk+ZU8CyXZ koRVP6gukgOZ67J4AxC0sFcU1uXbw+LvE9Dpc+h3psDEOQerQpY8T1GHKmkvHH5m 3RCb0H3pIgH+EO/oc5j9JDZ0q3NGs7Fz2ZmhnisYRYN+BPMqs+xEw/4pWn0INxAj ukR2JQ37l466TPvQIU8NdzdeHBrjG2qoSh3RuAnqFxznTtEbl6ug== X-ME-Sender: X-Sasl-enc: 2zRF7YCngAvgrFutreBev6Cfbxv8fMXaMU8gpU55xWuq 1490641898 Received: from localhost (c-73-188-17-148.hsd1.pa.comcast.net [73.188.17.148]) by mail.messagingengine.com (Postfix) with ESMTPA id BA5457E0EE; Mon, 27 Mar 2017 15:11:38 -0400 (EDT) Date: Mon, 27 Mar 2017 15:11:37 -0400 From: Leo Famulari To: Kei Kebreau Subject: Re: bug#26267: [PATCH] gnu: hyperrogue: Update to 9.4c. Message-ID: <20170327191137.GA16539@jasmine> References: <20170326200643.5256-1-kei@openmailbox.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170326200643.5256-1-kei@openmailbox.org> User-Agent: Mutt/1.8.0 (2017-02-23) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26267 Cc: 26267@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On Sun, Mar 26, 2017 at 04:06:43PM -0400, Kei Kebreau wrote: > * gnu/packages/games.scm (hyperrogue): Update to 9.4c. Can you complete the changelog and send a revised patch? From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 27 16:40:33 2017 Received: (at 26267) by debbugs.gnu.org; 27 Mar 2017 20:40:33 +0000 Received: from localhost ([127.0.0.1]:47797 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1csbRI-0002b0-Uj for submit@debbugs.gnu.org; Mon, 27 Mar 2017 16:40:33 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:47693 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1csbRG-0002ap-JR for 26267@debbugs.gnu.org; Mon, 27 Mar 2017 16:40:31 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 3B2DA512735; Mon, 27 Mar 2017 22:40:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1490647229; bh=q7ml+qEIqaZ+8OA0/xy4kDI4u6dXY7+BxV9Y4/5ptZ4=; h=From:To:Cc:Subject:Date:From; b=Bd8+jCLQofFfc8ZJNwmQrUAmh3JZNExYdBBlkWn/2iJKZjVST7K6lRUHyD0P0PCKK wXw65DaQxHeXSyI76S99xRISDRMI54TAvN3RoNpjumbyBne5D+X/6LVa2oPI8dS+vy 1bhR/kHMpQ6hoz8FzrzXpd6zh/4ntkHs4WAACBkw= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR003 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1490647227; bh=q7ml+qEIqaZ+8OA0/xy4kDI4u6dXY7+BxV9Y4/5ptZ4=; h=From:To:Cc:Subject:Date:From; b=BmHslDkC2cp4W4oE948x4FTXQBZZHZaW3VIfdZdzGXYtT/7gitrReyflqOMLhnfju 17jd+tGn59MZ7CXqhshMNuH61D55/EJxH9OG+ul8AnLu70GAQC/6+3JzuP6EPqSEHZ b6dGSchJr0hqESQjFA4LV6G9rGbJC1akadBbSwSU= To: 26267@debbugs.gnu.org Subject: [PATCH] gnu: hyperrogue: Update to 9.4c. Date: Mon, 27 Mar 2017 16:40:17 -0400 Message-Id: <20170327204017.3529-1-kei@openmailbox.org> X-Mailer: git-send-email 2.12.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 26267 Cc: Kei Kebreau X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) * gnu/packages/games.scm (hyperrogue): Update to 9.4c. [source]: Remove snippet. [arguments]: Remove #:make-flags; adjust configure and install phases; add install-data phase. [inputs]: Add hyperrogue-data. --- gnu/packages/games.scm | 89 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 58 insertions(+), 31 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 67fcb7b49..fcfa656e3 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3163,23 +3163,19 @@ throwing people around in pseudo-randomly generated buildings.") (define-public hyperrogue (package (name "hyperrogue") - (version "8.3j") + (version "9.4c") (source (origin (method url-fetch) (uri (string-append "http://www.roguetemple.com/z/hyper/" - name "-83j.zip")) + name (string-join (string-split version #\.) "") + "-src.tgz")) (sha256 (base32 - "1ag95d84m4j0rqyn9hj7655znixw2j57bpf93nk14nfy02xz1g6p")) - (modules '((guix build utils))) - ;; Remove .exe and .dll files. - (snippet - '(for-each delete-file (find-files "." "\\.(exe|dll)$"))))) + "1ri5fllnhqjm3dlnl1xbb9mlv79iigc940vbvcnk0v5k6p58pavq")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no check target - #:make-flags '("-Csrc") #:phases (modify-phases %standard-phases (add-after 'set-paths 'set-sdl-paths @@ -3190,21 +3186,24 @@ throwing people around in pseudo-randomly generated buildings.") ;; Fix font and music paths. (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (dejavu-dir (string-append - (assoc-ref inputs "font-dejavu") - "/share/fonts/truetype")) - (dejavu-font "DejaVuSans-Bold.ttf") - (music-file "hyperrogue-music.txt")) - (with-directory-excursion "src" - (substitute* "graph.cpp" - ((dejavu-font) - (string-append dejavu-dir "/" dejavu-font)) - (((string-append "\\./" music-file)) - (string-append out "/share/hyperrogue/" music-file))) - (substitute* music-file - (("\\*/") - (string-append out "/share/hyperrogue/"))))) + (let* ((out (assoc-ref outputs "out")) + (share-dir (string-append out "/share/hyperrogue")) + (dejavu-dir (string-append + (assoc-ref inputs "font-dejavu") + "/share/fonts/truetype")) + (dejavu-font "DejaVuSans-Bold.ttf") + (music-file "hyperrogue-music.txt")) + (substitute* "graph.cpp" + ((dejavu-font) + (string-append dejavu-dir "/" dejavu-font))) + (substitute* "sound.cpp" + (((string-append "\\./" music-file)) + (string-append share-dir "/" music-file)) + (("sounds/") + (string-append share-dir "/sounds/"))) + (substitute* music-file + (("\\*/") + (string-append share-dir "/sounds/")))) #t)) (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) @@ -3212,13 +3211,25 @@ throwing people around in pseudo-randomly generated buildings.") (bin (string-append out "/bin")) (share-dir (string-append out "/share/hyperrogue"))) (mkdir-p bin) - (copy-file "src/hyper" (string-append bin "/hyperrogue")) - (mkdir-p share-dir) - (copy-file "src/hyperrogue-music.txt" - (string-append share-dir "/hyperrogue-music.txt")) - (for-each (lambda (file) - (copy-file file (string-append share-dir "/" file))) - (find-files "." "\\.ogg$"))) + (copy-file "hyper" (string-append bin "/hyperrogue")) + (install-file "hyperrogue-music.txt" share-dir)) + #t)) + (add-after 'install 'install-data + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((data (assoc-ref inputs "hyperrogue-data")) + (out (assoc-ref outputs "out")) + (share-dir (string-append out "/share/hyperrogue"))) + (system* "tar" "xvf" data "-C" ".") + (with-directory-excursion "hyperrogue94c-win" + (for-each + (lambda (file) + (install-file file (string-append share-dir "/sounds"))) + (append (find-files "." "\\.ogg$") + (find-files "sounds" ".*$"))) + (for-each + (lambda (file) + (install-file file share-dir)) + '("papermodeldata.txt" "papermodeldata-help.txt")))) #t))))) (inputs `(("font-dejavu" ,font-dejavu) @@ -3227,7 +3238,23 @@ throwing people around in pseudo-randomly generated buildings.") ("sdl-union" ,(sdl-union (list sdl sdl-gfx sdl-mixer - sdl-ttf))))) + sdl-ttf))) + ("hyperrogue-data" + ,(origin + (method url-fetch) + (uri + (string-append + "http://www.roguetemple.com/z/hyper/" name + (string-join (string-split version #\.) "") + "-win.zip")) + (sha256 + (base32 + "1cyyrsnrixygg3zyz97hpsm6jzwbhydiwk3kl0lm7qjnw2nzkhhh")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove .exe and .dll files. + (for-each delete-file (find-files "." "\\.(exe|dll)$")))))))) (home-page "http://www.roguetemple.com/z/hyper/") (synopsis "Non-euclidean graphical rogue-like game") (description -- 2.12.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 27 16:42:15 2017 Received: (at 26267) by debbugs.gnu.org; 27 Mar 2017 20:42:15 +0000 Received: from localhost ([127.0.0.1]:47803 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1csbSx-0002dv-Fi for submit@debbugs.gnu.org; Mon, 27 Mar 2017 16:42:15 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:55462 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1csbSt-0002di-Q9 for 26267@debbugs.gnu.org; Mon, 27 Mar 2017 16:42:13 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id F3D0B51261D; Mon, 27 Mar 2017 22:42:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1490647331; bh=LIY8isMgy1b5s+pG66fWxE2unnRhB71aiDv7NHijQDk=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=iAT9KCTSusto4i6Rh/H1Ni0B4MHTSF0s/ozX9Z7twzU7bpeRzT3NGg8txClnDuILP hNDv1BjnfiypqotmP/UOJABWKimDu3eovkDC6k0CymvnSjALFSa9Gw8hq36IFbqTzs 9eXIQosmhAYbJs0OFT11qido9axjRqFndytYh97o= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR003 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1490647329; bh=LIY8isMgy1b5s+pG66fWxE2unnRhB71aiDv7NHijQDk=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=X/rFh7qOhW7cfGPCO1SjDk/acdWAVbbsHDCTg6vpu5SWwUS1Fii0FasJDrLr699Np mrAbaLiSDo+XJ1PPBuFnSvhfwhJGubLMV5d84lLNN2su0qDFN9w7gh+dT2cB8dS1br Tkio/RJClfqZEYLbJoua7rnII6CuNgoHgZJVywY4= To: Leo Famulari Subject: Re: bug#26267: [PATCH] gnu: hyperrogue: Update to 9.4c. References: <20170326200643.5256-1-kei@openmailbox.org> <20170327191137.GA16539@jasmine> Date: Mon, 27 Mar 2017 16:42:05 -0400 In-Reply-To: <20170327191137.GA16539@jasmine> (Leo Famulari's message of "Mon, 27 Mar 2017 15:11:37 -0400") Message-ID: <87inmua1uq.fsf@openmailbox.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 26267 Cc: 26267@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) --=-=-= Content-Type: text/plain Leo Famulari writes: > On Sun, Mar 26, 2017 at 04:06:43PM -0400, Kei Kebreau wrote: >> * gnu/packages/games.scm (hyperrogue): Update to 9.4c. > > Can you complete the changelog and send a revised patch? The new patch is submitted. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAljZeR0ACgkQ5qXuPBlG eg2BDw//YuL1kWD66APB9B2jT4VyNFYKlrhukC6VMvxzgOCSnZKaKerwHW7tIHxJ Err5W6HrW263DrrTR/OMX4r3FT3eZiUGyHIisnY0N043qwVrdTK4R6G4voYeOCE1 hFCg1w5xuG5LnQQ4493vDwG8jGbBGdfOG3otI1FDBZC0D61GnQ5ShT8DCvFXk30u VC9rCMZ9O7nOIdO2tHs41iaPFpX3coKD6DMu142W89brC70sc3BAzaB/cWn3GecF D7ihoxAiL5MRRJsqWkCvCMXn98cJxpobhIyGHWg4V8xu4sAnVpXp7ePH90RC9hzX 26wK73QONttee2BX3CdVTxh555wmdI8p43AWz/+MOeRmHUdS6MK4Msz18HY8Dz86 xArqT+Yb+jycGQqgx+MN/kVslCiSvM7wdxnfOufwIvDfv4qac6KmLySScSxogANm CwDnepE+eKYIjg9DUFPZxFNT0wQhs6SjvH/8fAawxZEXGO/aTWHKs34WOr8n2gEA OdGMEP8/1Y1IP9YUStWlazA57rm2lnRpcnBlFp/gjFvakWa1weIryY0XmZg8NImy c5nMsUgl+jMvBW+tYiJzkKjwkMV0kWb98hHruG6xruwdtzbNKO6JdeOa07JjD5kn rD8vIkgw2cAQiayQ+3FBS7xiP4mcXuqTjj+dOpq9Ph36cZ1y5eA= =5Jdn -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 27 17:29:16 2017 Received: (at 26267) by debbugs.gnu.org; 27 Mar 2017 21:29:16 +0000 Received: from localhost ([127.0.0.1]:47825 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cscCS-0003o8-4h for submit@debbugs.gnu.org; Mon, 27 Mar 2017 17:29:16 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:36564) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cscCP-0003nz-PS for 26267@debbugs.gnu.org; Mon, 27 Mar 2017 17:29:14 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 18F7620998; Mon, 27 Mar 2017 17:29:13 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Mon, 27 Mar 2017 17:29:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=UhMVVMVGUnzijHZOdpe8ls/y9jCh3br8WOHNqDG08 zw=; b=NGx7VQvFhi55pMVAd/+jcJxLdhOaB8QhNtFPK4IpDy1a1iJkvVtUURlqv EdPKZ5xqL4dkzrI9c4vyul7HU6w84BYc7kdYRY9dGOcLHoy9EenLjxGDngjz8HwQ tmNr8RlHHrrY6ddf5ntpduCFSS2xE7GuusTuMqAv69qUsntENZjzD1pf2jf3carO /Yd62GwY36v5bvEpc2Qlbo12O/16lUCwSzqShft+/9q7+1LfcQys5QoiX784DGlG hl3JwjED3fY+jX4cm5xmy0X/d74Kuqw1NmDfL3fF+iFHOKiU8ZOuL1a1MzXciyrI KFz53NLqhWe7UXI0cjEnmHhJEYSeQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=UhMVVMVGUnzijHZOdp e8ls/y9jCh3br8WOHNqDG08zw=; b=rwfWUX5iWLuhY6tfM1egiQJqdmWCphIfNq OpmsqorsVqtR8wzgMrOcvQCYBYk0A5Tcsf2umfhMHWG/1VMz9mKMS2LdyO+jybJ+ xpss918g8VenBwrWN6XTeRs8PYP5dVy802t5+z1x29HqMMNjjU1wJ705NGZLlTH5 CpH3ve9HEt+1QmnnxL9qWlYLNGaSPkxDjHEcaGOvtUkjjK0aGlwkvGELD+OexgVq Ol7DFowE/0rh6D92DK+kVHO1g+WtGrN7bziLssoMdu2/WOQigEa8K0KlGZAJQhrc /QZuVshNF1+JVmlCMF/5ZMfGCvQtB7AwJZ9utlG/4cWT+xwdFVzg== X-ME-Sender: X-Sasl-enc: q+RGKEuNtvxJht4Nt2Wzm1s7rTXBhOuJywSGciXW3PiA 1490650152 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 52FCB2400E; Mon, 27 Mar 2017 17:29:12 -0400 (EDT) From: Marius Bakke To: Kei Kebreau , 26267@debbugs.gnu.org Subject: Re: bug#26267: [PATCH] gnu: hyperrogue: Update to 9.4c. In-Reply-To: <20170327204017.3529-1-kei@openmailbox.org> References: <20170326200643.5256-1-kei@openmailbox.org> <20170327204017.3529-1-kei@openmailbox.org> User-Agent: Notmuch/0.24 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Mon, 27 Mar 2017 23:29:10 +0200 Message-ID: <87y3vqv26x.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26267 Cc: Kei Kebreau X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Kei Kebreau writes: > * gnu/packages/games.scm (hyperrogue): Update to 9.4c. > [source]: Remove snippet. > [arguments]: Remove #:make-flags; adjust configure and install phases; add > install-data phase. > [inputs]: Add hyperrogue-data. Thanks! [...] > + (add-after 'install 'install-data > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (let* ((data (assoc-ref inputs "hyperrogue-data")) > + (out (assoc-ref outputs "out")) > + (share-dir (string-append out "/share/hyperrogue"))) > + (system* "tar" "xvf" data "-C" ".") > + (with-directory-excursion "hyperrogue94c-win" You can access the "version" variable here by "unquoting" it (with comma). Another approach is skipping the "top folder" of the tarball with "--strip-components=3D1". Maybe the "sounds" subdirectory can be extracted directly to "out/share/sounds"? See e.g. "font-adobe-source-code-pro" for some tar trickery. > + (for-each > + (lambda (file) > + (install-file file (string-append share-dir "/sounds= "))) > + (append (find-files "." "\\.ogg$") > + (find-files "sounds" ".*$"))) > + (for-each > + (lambda (file) > + (install-file file share-dir)) > + '("papermodeldata.txt" "papermodeldata-help.txt")))) > #t))))) > (inputs > `(("font-dejavu" ,font-dejavu) > @@ -3227,7 +3238,23 @@ throwing people around in pseudo-randomly generate= d buildings.") > ("sdl-union" ,(sdl-union (list sdl > sdl-gfx > sdl-mixer > - sdl-ttf))))) > + sdl-ttf))) > + ("hyperrogue-data" > + ,(origin > + (method url-fetch) > + (uri > + (string-append > + "http://www.roguetemple.com/z/hyper/" name > + (string-join (string-split version #\.) "") > + "-win.zip")) > + (sha256 > + (base32 > + "1cyyrsnrixygg3zyz97hpsm6jzwbhydiwk3kl0lm7qjnw2nzkhhh")) It would be good to have a comment near the source stating "remember to update hyperrogue-data as well". Otherwise, if the enterprising Guix contributor already have the old tarball in their store, they may not notice the impending version/hash mismatch. Also, this can be a "native-input" since it's downloaded, extracted and thrown away, and only carry platform-independent data (for us, anyway). > + (modules '((guix build utils))) > + (snippet > + '(begin > + ;; Remove .exe and .dll files. > + (for-each delete-file (find-files "." "\\.(exe|dll)$"))))= )))) ...for the same reason, I don't think this is necessary, especially if we can avoid extracting these files to begin with. It will just use up *more* space in the store, since it creates a derivation in addition to the tarball. :-) The rest LGTM, thanks! > (home-page "http://www.roguetemple.com/z/hyper/") > (synopsis "Non-euclidean graphical rogue-like game") > (description > --=20 > 2.12.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAljZhCYACgkQoqBt8qM6 VPoqKwgA0NPaTiREYR9crMVlD7AkHxKuF0QegkQrW15rRiM2WnBo+RbkwPDpyOVc IwmTh7FWA1MHKIj6naHXKyWhTsa83Ee82AAuBaPJep2rR1hBI3Kie2Fog9jvx88G MyC6gHyUwRz1TjS+//D+O2NKNPl0uokDKpMkMdeNjx9uWNCvnKStGt9Oq5wv9uNN 6S7yt0fzdndgMEahJP5alYAD4l+iaexFKo9t9OrDN4kWJzRZwS3zZQVNSdHMTRI2 q5MWLXx3i0YTgAyTcK762ZrKWkGdQdJHwpA82v6mR9oQCTPa3nEtUn+qmaqweKxZ ody0repq76ymM76rn3m+gRTesWVdbA== =RAHh -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 28 07:36:33 2017 Received: (at 26267) by debbugs.gnu.org; 28 Mar 2017 11:36:33 +0000 Received: from localhost ([127.0.0.1]:48580 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cspQP-00041d-62 for submit@debbugs.gnu.org; Tue, 28 Mar 2017 07:36:33 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:44411 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cspQM-00041T-88 for 26267@debbugs.gnu.org; Tue, 28 Mar 2017 07:36:31 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id D3D6B51319E; Tue, 28 Mar 2017 13:36:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1490700988; bh=Zjrxc1uhT5a6r+rq+DEsG9JOkzTT/dV5BgWSgtb55Jg=; h=From:To:Subject:References:Date:In-Reply-To:From; b=NSsHhFIUXHnDy4JJAxYsMWJx70Sqk0txNpXYkkD3Yh8R1Hyt0oPr+aNLDrMExpzp4 O9dEOz7ZGs1ewnM33eZ0cSktwdvJWmfnp10CmK5WnS1K80yzp21rd307PIAl312fOE aZT7KWD2IWCojB2QgQp+ikTIXi2ZQDCH2UgoIR6A= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR003 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1490700987; bh=Zjrxc1uhT5a6r+rq+DEsG9JOkzTT/dV5BgWSgtb55Jg=; h=From:To:Subject:References:Date:In-Reply-To:From; b=E98Vhnv2JeZtsBWef2Wy4NWlckp9IhMmriWooKeTUSsjhTpZgiZ7VKzhoANeukqIF VGVqjSzOOhN5VIkjhOSHVzKBWxPml+QvN25GHz8EuQp6+zNEh3X+mRrCtmHi8VZLpY jCxHTGkWkf7Rmc8aWYw/7BWJp4X2YnYRq5OGLIv4= To: 26267@debbugs.gnu.org Subject: Re: bug#26267: [PATCH] gnu: hyperrogue: Update to 9.4c. References: <20170326200643.5256-1-kei@openmailbox.org> Date: Tue, 28 Mar 2017 07:36:25 -0400 In-Reply-To: <20170326200643.5256-1-kei@openmailbox.org> (Kei Kebreau's message of "Sun, 26 Mar 2017 16:06:43 -0400") Message-ID: <87inmtpr9i.fsf@openmailbox.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 26267 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) * gnu/packages/games.scm (hyperrogue): Update to 9.4c. [source]: Remove snippet. [arguments]: Remove #:make-flags; adjust configure and install phases; add install-data phase. [native-inputs]: Add hyperrogue-data and unzip. --- gnu/packages/games.scm | 94 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 62 insertions(+), 32 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 67fcb7b49..6c92cffd2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3163,23 +3163,21 @@ throwing people around in pseudo-randomly generated buildings.") (define-public hyperrogue (package (name "hyperrogue") - (version "8.3j") + (version "9.4c") + ;; When updating this package, be sure to update the "hyperrogue-data" + ;; origin in native-inputs. (source (origin (method url-fetch) (uri (string-append "http://www.roguetemple.com/z/hyper/" - name "-83j.zip")) + name (string-join (string-split version #\.) "") + "-src.tgz")) (sha256 (base32 - "1ag95d84m4j0rqyn9hj7655znixw2j57bpf93nk14nfy02xz1g6p")) - (modules '((guix build utils))) - ;; Remove .exe and .dll files. - (snippet - '(for-each delete-file (find-files "." "\\.(exe|dll)$"))))) + "1ri5fllnhqjm3dlnl1xbb9mlv79iigc940vbvcnk0v5k6p58pavq")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no check target - #:make-flags '("-Csrc") + `(#:tests? #f ; no check target #:phases (modify-phases %standard-phases (add-after 'set-paths 'set-sdl-paths @@ -3190,21 +3188,24 @@ throwing people around in pseudo-randomly generated buildings.") ;; Fix font and music paths. (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (dejavu-dir (string-append - (assoc-ref inputs "font-dejavu") - "/share/fonts/truetype")) - (dejavu-font "DejaVuSans-Bold.ttf") - (music-file "hyperrogue-music.txt")) - (with-directory-excursion "src" - (substitute* "graph.cpp" - ((dejavu-font) - (string-append dejavu-dir "/" dejavu-font)) - (((string-append "\\./" music-file)) - (string-append out "/share/hyperrogue/" music-file))) - (substitute* music-file - (("\\*/") - (string-append out "/share/hyperrogue/"))))) + (let* ((out (assoc-ref outputs "out")) + (share-dir (string-append out "/share/hyperrogue")) + (dejavu-dir (string-append + (assoc-ref inputs "font-dejavu") + "/share/fonts/truetype")) + (dejavu-font "DejaVuSans-Bold.ttf") + (music-file "hyperrogue-music.txt")) + (substitute* "graph.cpp" + ((dejavu-font) + (string-append dejavu-dir "/" dejavu-font))) + (substitute* "sound.cpp" + (((string-append "\\./" music-file)) + (string-append share-dir "/" music-file)) + (("sounds/") + (string-append share-dir "/sounds/"))) + (substitute* music-file + (("\\*/") + (string-append share-dir "/sounds/")))) #t)) (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) @@ -3212,14 +3213,43 @@ throwing people around in pseudo-randomly generated buildings.") (bin (string-append out "/bin")) (share-dir (string-append out "/share/hyperrogue"))) (mkdir-p bin) - (copy-file "src/hyper" (string-append bin "/hyperrogue")) - (mkdir-p share-dir) - (copy-file "src/hyperrogue-music.txt" - (string-append share-dir "/hyperrogue-music.txt")) - (for-each (lambda (file) - (copy-file file (string-append share-dir "/" file))) - (find-files "." "\\.ogg$"))) - #t))))) + (copy-file "hyper" (string-append bin "/hyperrogue")) + (install-file "hyperrogue-music.txt" share-dir)) + #t)) + (add-after 'install 'install-data + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((data (assoc-ref inputs "hyperrogue-data")) + (out (assoc-ref outputs "out")) + (sounds (string-append out "/share/hyperrogue/sounds")) + (unzip (string-append (assoc-ref inputs "unzip") "/bin/unzip"))) + (and + ;; Extract music into sounds directory. + (zero? + (system* unzip "-j" data + (string-append + "'hyperrogue" + (string-join (string-split ,version #\.) "") + "-win/sounds/*'") "-d" sounds)) + ;; Extract sounds into sounds directory. + (zero? + (system* "unzip" "-j" data + (string-append + "'hyperrogue" + (string-join (string-split ,version #\.) "") + "-win/*.ogg'") "-d" sounds))))))))) + (native-inputs + `(("hyperrogue-data" + ,(origin + (method url-fetch) + (uri + (string-append + "http://www.roguetemple.com/z/hyper/" name + (string-join (string-split version #\.) "") + "-win.zip")) + (sha256 + (base32 + "1cyyrsnrixygg3zyz97hpsm6jzwbhydiwk3kl0lm7qjnw2nzkhhh")))) + ("unzip" ,unzip))) (inputs `(("font-dejavu" ,font-dejavu) ("glew" ,glew) -- 2.12.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 28 07:38:10 2017 Received: (at 26267) by debbugs.gnu.org; 28 Mar 2017 11:38:10 +0000 Received: from localhost ([127.0.0.1]:48584 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cspRx-00044D-NF for submit@debbugs.gnu.org; Tue, 28 Mar 2017 07:38:09 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:48795 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cspRw-000444-8F for 26267@debbugs.gnu.org; Tue, 28 Mar 2017 07:38:08 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 7A71351300C; Tue, 28 Mar 2017 13:38:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1490701087; bh=saiBy9WGB/otMMgST69XP0b9ZVebQeEaalwg0kzXhYA=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=w3adjuFsrzCi3b+4JpfWWHeNmrdtnwDAs2IxIkvjWQG9R4iJWKWO/uzIoYVkWjWID h2fRu76AVMQifWq7fT8H+me1s0EeO992RLGWcGD+rabVp6GhYfjj1+2u0ZcAFykk91 3sFxsWBWwv+1KU4wT7GSUwuAlqPvVhal0rALGdBA= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR003 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1490701085; bh=saiBy9WGB/otMMgST69XP0b9ZVebQeEaalwg0kzXhYA=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=w+ZrJRF2eVrRlARbzAY/1XCxFro5UqXagCRvxHCjAJ3Yv3ADZH2ydgNaMEAQ5xlM0 oR+LZdQljeC2rFnyLC1m106TI5R2NqaTdd70JQmWr27wncK2ryB31nW44A5oGzr9TQ KcR8QFIWXoR1zSMdPVigBiFlJIIACGC9dRznYqYg= To: Marius Bakke Subject: Re: bug#26267: [PATCH] gnu: hyperrogue: Update to 9.4c. References: <20170326200643.5256-1-kei@openmailbox.org> <20170327204017.3529-1-kei@openmailbox.org> <87y3vqv26x.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> Date: Tue, 28 Mar 2017 07:37:53 -0400 In-Reply-To: <87y3vqv26x.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> (Marius Bakke's message of "Mon, 27 Mar 2017 23:29:10 +0200") Message-ID: <87fuhxpr72.fsf@openmailbox.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 26267 Cc: 26267@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Marius Bakke writes: > Kei Kebreau writes: > >> * gnu/packages/games.scm (hyperrogue): Update to 9.4c. >> [source]: Remove snippet. >> [arguments]: Remove #:make-flags; adjust configure and install phases; a= dd >> install-data phase. >> [inputs]: Add hyperrogue-data. > > Thanks! > > [...] > >> + (add-after 'install 'install-data >> + (lambda* (#:key inputs outputs #:allow-other-keys) >> + (let* ((data (assoc-ref inputs "hyperrogue-data")) >> + (out (assoc-ref outputs "out")) >> + (share-dir (string-append out "/share/hyperrogue"))) >> + (system* "tar" "xvf" data "-C" ".") >> + (with-directory-excursion "hyperrogue94c-win" > > You can access the "version" variable here by "unquoting" it (with > comma). Another approach is skipping the "top folder" of the tarball > with "--strip-components=3D1". Maybe the "sounds" subdirectory can be > extracted directly to "out/share/sounds"? See e.g. > "font-adobe-source-code-pro" for some tar trickery. > >> + (for-each >> + (lambda (file) >> + (install-file file (string-append share-dir "/sound= s"))) >> + (append (find-files "." "\\.ogg$") >> + (find-files "sounds" ".*$"))) >> + (for-each >> + (lambda (file) >> + (install-file file share-dir)) >> + '("papermodeldata.txt" "papermodeldata-help.txt")))) >> #t))))) >> (inputs >> `(("font-dejavu" ,font-dejavu) >> @@ -3227,7 +3238,23 @@ throwing people around in pseudo-randomly generat= ed buildings.") >> ("sdl-union" ,(sdl-union (list sdl >> sdl-gfx >> sdl-mixer >> - sdl-ttf))))) >> + sdl-ttf))) >> + ("hyperrogue-data" >> + ,(origin >> + (method url-fetch) >> + (uri >> + (string-append >> + "http://www.roguetemple.com/z/hyper/" name >> + (string-join (string-split version #\.) "") >> + "-win.zip")) >> + (sha256 >> + (base32 >> + "1cyyrsnrixygg3zyz97hpsm6jzwbhydiwk3kl0lm7qjnw2nzkhhh")) > > It would be good to have a comment near the source stating "remember to > update hyperrogue-data as well". Otherwise, if the enterprising Guix > contributor already have the old tarball in their store, they may not > notice the impending version/hash mismatch. > > Also, this can be a "native-input" since it's downloaded, extracted and > thrown away, and only carry platform-independent data (for us, anyway). > >> + (modules '((guix build utils))) >> + (snippet >> + '(begin >> + ;; Remove .exe and .dll files. >> + (for-each delete-file (find-files "." "\\.(exe|dll)$")))= ))))) > > ...for the same reason, I don't think this is necessary, especially if > we can avoid extracting these files to begin with. It will just use up > *more* space in the store, since it creates a derivation in addition to > the tarball. :-) > > The rest LGTM, thanks! > >> (home-page "http://www.roguetemple.com/z/hyper/") >> (synopsis "Non-euclidean graphical rogue-like game") >> (description >> --=20 >> 2.12.0 The new patch that I sent attempts to take care of these issues, but the unzip pattern matching in the install-data phase is not working for some reason. Any ideas? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJY2ksSAAoJEOal7jwZRnoNxLwP/jT+L7wX2U5cp/IydHpCZarm 9ROq+FuFwtkGSRtI7mfgxDwPmWPCAbYVGT+0HjoZjUkcepdJzJpPA2+CmNbJF8AB b3IuyhgPO9fcMOj+POUC+11rASzZeF6UvnZeI6TXPhXqtW/lxOswbT9OVPulQEKn jA+wsuX/NI0LQ3cTPQ6mgvseSXE1Qugfm5CoGKngyourcfYjLeGRtBioYCox7caH 5EQ5jZV07ZWaGoOmauyD7jUOytJ0tWdEurC8P7xzxWNOwF51/t+p8LV6vR/jbKvi UmAY4uo4c3FI5L88k0Cpq8ofgDv1kTmPNPEnhMAR1OhkhHX9PYGujWrtzcdEe4EZ R+TIsCkfPgiRC5aoft/5+ZSpEEsOfegNAwzMs1Zjg12phFGWavWS+L2XaTw3U+7f SQn5tS+Q9tWcWkB6ttTO9m92+sSXSTIbd9hf7JCM+CYC2yh9d7JV5Xen20v7EcO/ c6PZNwkOCsnco4Wr0NC+XV+zPWxEKfbkeUE9KzViP/H7tnuN+koq3DB3fOgAFvaa FWBibhxnkG8v5WyTfCD0k2xdLrEpVSdSPozbDyJnIgYlRdjErYGjqH+ujRWexxia n9O5zcnbnI6e0sU72VCGR8U93jPBbId5x0kb+CSzOvKWYeS0c5WQ/E3YBJy7xZjR MsD/ssIolgrGWBZCjKo6 =0/Fw -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 28 09:35:49 2017 Received: (at 26267) by debbugs.gnu.org; 28 Mar 2017 13:35:49 +0000 Received: from localhost ([127.0.0.1]:48689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1csrHp-0006ww-6E for submit@debbugs.gnu.org; Tue, 28 Mar 2017 09:35:49 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:44086) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1csrHn-0006wo-4V for 26267@debbugs.gnu.org; Tue, 28 Mar 2017 09:35:47 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 619DA20BF9; Tue, 28 Mar 2017 09:35:46 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Tue, 28 Mar 2017 09:35:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=qRd2QwGwsg0wVhZXfrfKI1K1o80J6QRCDkLxEGSpP zc=; b=XUSnJnAhAc2YuJVP9ZIgWj5b8aC1KYcE8/0/0CDYWHsORBPGaz0+pMAH2 Eyatyex2oDEpnRqpcJkIx+T70YDQ6wNKyzuCwX75nnYB7N1Mu/IHGtAmbtk0sGoY /R9rlOQANYhOvyjk+Qo2h6/SjhvsLARVrzEZ2FWq/LcVeR5yOcg1NseAB7bUM+Jo /v3kVZbxCOsNoATmld5qUtLhtLhQKLG3Pj4qXQtKsJCLkYBRBoUdjURzXWTXMIgW nSCMfc9vkqEqRqMxkjzJknMYaXB+/SmEjq47RpVsBjnx61J6Wk5OeLqrzD3f5gdj mWKeqYpNSAODXoDMjoerCTVr3jHFQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=qRd2QwGwsg0wVhZXfr fKI1K1o80J6QRCDkLxEGSpPzc=; b=UEmPmk2yLDHkhWqfMkgAiIdfQ4VP1vv3gl gF/nb1H4bKlZIC0uaYx8tqZY4A0SnSEU64ImTqLJSK90c7f+mJIzrlo44jDEUrVI 1/cd1qPuomrTLe7Ef4I5tvMSJKW6N4OYVoOPiYwmB+EXBAwjGJZqhsG/cFH02o8i EqWpO2r9qycO+6MAQF7sjiS3pnouW2J/wNXWqJmt3ZlDvm6Wj6OZE0G0U8m8n91o 8efDjanDdoOCUiEf+iWlHSce/wCo9XIlsHC+bVpgKvl62FW9YiZARPlGFSTXN6vO 9ystjU4OU67zZaUTDZBfv1X7YGA6j2AKAf8WuHuVXxxXN8ovJXPA== X-ME-Sender: X-Sasl-enc: FixjqsOg3BbxqzJ3KsWirFFH/zrxz4HGECFVzJ+Asgjg 1490708145 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id E9B2F2438A; Tue, 28 Mar 2017 09:35:45 -0400 (EDT) From: Marius Bakke To: Kei Kebreau Subject: Re: bug#26267: [PATCH] gnu: hyperrogue: Update to 9.4c. In-Reply-To: <87fuhxpr72.fsf@openmailbox.org> References: <20170326200643.5256-1-kei@openmailbox.org> <20170327204017.3529-1-kei@openmailbox.org> <87y3vqv26x.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <87fuhxpr72.fsf@openmailbox.org> User-Agent: Notmuch/0.24 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Tue, 28 Mar 2017 15:35:44 +0200 Message-ID: <87vaqtttfz.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26267 Cc: 26267@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Kei Kebreau writes: > The new patch that I sent attempts to take care of these issues, but the > unzip pattern matching in the install-data phase is not working for some > reason. Any ideas? I was able to extract it by removing the single quotes (these strings are already 'quoted' when passed to the unzip command). However the second extraction seems to match some files from the first, perhaps an additional filter needs to be passed to avoid descending into sounds/. The example for the '-x' option in the manual looks like it should do the job. LGTM and HTH! :-) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAljaZrAACgkQoqBt8qM6 VPrL9wgAlBJMtudXhsJ0NMdrWsL6thtUcFx0WNXOLBNaJnmHT61ny43ur+SRkplV 6YveLG3rEXOh3bHlcamR/uDO0Js4QnJVUEUliTDEY2qO6JXZyaTv8Ut85ORmcGfn ghjMxrmmsEGxOuN6sETY+SmYhFvh8NdxPdw9iRHL3b3Xc1Z6Nek9+gJhIDW+Fx7Y MjT6zLmFhVpJfLXEts2blIF3ha0XHIhYHsesdBbTbaHM3auVE7zK1I62znSrKw+e NYduWlAoOeolx3SIRrKt8tTrOM0VoejCI4Wxk0zuRypPk9AHQbGef9DrG53vqLfa 4Q0g5YoO5XiCHB2OpvJ0enAHmw7OZw== =AXEG -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 28 11:31:55 2017 Received: (at 26267) by debbugs.gnu.org; 28 Mar 2017 15:31:55 +0000 Received: from localhost ([127.0.0.1]:49525 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cst6B-00057v-E7 for submit@debbugs.gnu.org; Tue, 28 Mar 2017 11:31:55 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:50791 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cst6A-00057m-0h for 26267@debbugs.gnu.org; Tue, 28 Mar 2017 11:31:55 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id C883E5096F9; Tue, 28 Mar 2017 17:31:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1490715112; bh=en32BLoaSlOVD15Lb50tN81WmWlUTcduL+kbIn9KCp8=; h=From:To:Subject:References:Date:In-Reply-To:From; b=hqKMXL5mC6+rR5QL07G7cSbVg1wN8FY7ln6xaiWMIBQgGke5RujhBuVt34yh4nG3l oHZBF8/Xdhvj4NOV13HUAXMkEnPnSk931jgDF7qoUEdTmWR4yAq186HpFXOKDwMnBr mtQwjIET873XwKqNUAbprD6pU3lB4rJD/g46otfU= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR002 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1490715086; bh=en32BLoaSlOVD15Lb50tN81WmWlUTcduL+kbIn9KCp8=; h=From:To:Subject:References:Date:In-Reply-To:From; b=0BLDbCC6aktYqkP9vl2fbqACC90HbB6WCA04elwRhSBM35jjwk7tmPiCBARjSGTuf /ke9jTMFhToOqGBOt+Q3lsz8Ev7dGaJf9kgtrLRPRZwOrYf3SQW2FyVhdsZAOarmAU 2ti5h6oe8lCYecH2auOxriQJa6bjY+ZDB8BeDK/k= To: 26267@debbugs.gnu.org Subject: Re: bug#26267: [PATCH] gnu: hyperrogue: Update to 9.4c. References: <20170326200643.5256-1-kei@openmailbox.org> Date: Tue, 28 Mar 2017 11:31:14 -0400 In-Reply-To: <20170326200643.5256-1-kei@openmailbox.org> (Kei Kebreau's message of "Sun, 26 Mar 2017 16:06:43 -0400") Message-ID: <87bmslpge5.fsf@openmailbox.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 26267 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable * gnu/packages/games.scm (hyperrogue): Update to 9.4c. [source]: Remove snippet. [arguments]: Remove #:make-flags; adjust configure and install phases; add install-data phase. [native-inputs]: Add hyperrogue-data and unzip. [license]: Add cc-by-sa4.0 and cc0 licenses for sounds. =2D-- gnu/packages/games.scm | 104 ++++++++++++++++++++++++++++++++-------------= ---- 1 file changed, 68 insertions(+), 36 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 67fcb7b49..19f9c9d39 100644 =2D-- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3163,23 +3163,21 @@ throwing people around in pseudo-randomly generated= buildings.") (define-public hyperrogue (package (name "hyperrogue") =2D (version "8.3j") + (version "9.4c") + ;; When updating this package, be sure to update the "hyperrogue-data" + ;; origin in native-inputs. (source (origin (method url-fetch) (uri (string-append "http://www.roguetemple.com/z/hyper/" =2D name "-83j.zip")) + name (string-join (string-split version #\.) "") + "-src.tgz")) (sha256 (base32 =2D "1ag95d84m4j0rqyn9hj7655znixw2j57bpf93nk14nfy02xz1g6p")) =2D (modules '((guix build utils))) =2D ;; Remove .exe and .dll files. =2D (snippet =2D '(for-each delete-file (find-files "." "\\.(exe|dll)$")))= )) + "1ri5fllnhqjm3dlnl1xbb9mlv79iigc940vbvcnk0v5k6p58pavq")))) (build-system gnu-build-system) (arguments =2D '(#:tests? #f ; no check target =2D #:make-flags '("-Csrc") + `(#:tests? #f ; no check target #:phases (modify-phases %standard-phases (add-after 'set-paths 'set-sdl-paths @@ -3190,21 +3188,24 @@ throwing people around in pseudo-randomly generated= buildings.") ;; Fix font and music paths. (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) =2D (let ((out (assoc-ref outputs "out")) =2D (dejavu-dir (string-append =2D (assoc-ref inputs "font-dejavu") =2D "/share/fonts/truetype")) =2D (dejavu-font "DejaVuSans-Bold.ttf") =2D (music-file "hyperrogue-music.txt")) =2D (with-directory-excursion "src" =2D (substitute* "graph.cpp" =2D ((dejavu-font) =2D (string-append dejavu-dir "/" dejavu-font)) =2D (((string-append "\\./" music-file)) =2D (string-append out "/share/hyperrogue/" music-file))) =2D (substitute* music-file =2D (("\\*/") =2D (string-append out "/share/hyperrogue/"))))) + (let* ((out (assoc-ref outputs "out")) + (share-dir (string-append out "/share/hyperrogue")) + (dejavu-dir (string-append + (assoc-ref inputs "font-dejavu") + "/share/fonts/truetype")) + (dejavu-font "DejaVuSans-Bold.ttf") + (music-file "hyperrogue-music.txt")) + (substitute* "graph.cpp" + ((dejavu-font) + (string-append dejavu-dir "/" dejavu-font))) + (substitute* "sound.cpp" + (((string-append "\\./" music-file)) + (string-append share-dir "/" music-file)) + (("sounds/") + (string-append share-dir "/sounds/"))) + (substitute* music-file + (("\\*/") + (string-append share-dir "/sounds/")))) #t)) (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) @@ -3212,14 +3213,43 @@ throwing people around in pseudo-randomly generated= buildings.") (bin (string-append out "/bin")) (share-dir (string-append out "/share/hyperrogue"))) (mkdir-p bin) =2D (copy-file "src/hyper" (string-append bin "/hyperrogue")) =2D (mkdir-p share-dir) =2D (copy-file "src/hyperrogue-music.txt" =2D (string-append share-dir "/hyperrogue-music.tx= t")) =2D (for-each (lambda (file) =2D (copy-file file (string-append share-dir "/" = file))) =2D (find-files "." "\\.ogg$"))) =2D #t))))) + (copy-file "hyper" (string-append bin "/hyperrogue")) + (install-file "hyperrogue-music.txt" share-dir)) + #t)) + (add-after 'install 'install-data + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((data (assoc-ref inputs "hyperrogue-data")) + (out (assoc-ref outputs "out")) + (sounds (string-append out "/share/hyperrogue/sounds")) + (unzip (string-append (assoc-ref inputs "unzip") "/bin= /unzip"))) + (and + ;; Extract media license information into sounds directory. + (zero? + (system* unzip "-j" data + (string-append + "hyperrogue" + (string-join (string-split ,version #\.) "") + "-win/sounds/credits.txt") "-d" sounds)) + ;; Extract sounds and music into sounds directory. + (zero? + (system* "unzip" "-j" data + (string-append + "hyperrogue" + (string-join (string-split ,version #\.) "") + "-win/*.ogg") "-d" sounds))))))))) + (native-inputs + `(("hyperrogue-data" + ,(origin + (method url-fetch) + (uri + (string-append + "http://www.roguetemple.com/z/hyper/" name + (string-join (string-split version #\.) "") + "-win.zip")) + (sha256 + (base32 + "1cyyrsnrixygg3zyz97hpsm6jzwbhydiwk3kl0lm7qjnw2nzkhhh")))) + ("unzip" ,unzip))) (inputs `(("font-dejavu" ,font-dejavu) ("glew" ,glew) @@ -3240,10 +3270,12 @@ are home to particular creatures and may be subject= to own rules of \"physics\". =20 While it can use ASCII characters to display the world the classical rogue symbols, the game needs graphics to render the non-euclidean world.") =2D (license (list license:bsd-3 ; src/glew.c, src/mtrand.* =2D license:cc-by-sa3.0 ; *.ogg =2D license:public-domain ; src/direntx.* =2D license:zlib ; src/savepng.* + (license (list license:bsd-3 ; glew.c, mtrand.* + license:cc-by-sa3.0 ; music + license:cc-by-sa4.0 ; sounds + license:cc0 + license:public-domain ; direntx.*, some sounds + license:zlib ; savepng.* license:gpl2+)))) ; remaining files =20 (define-public kobodeluxe =2D-=20 2.12.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJY2oHCAAoJEOal7jwZRnoNPSQQAMCyDmg977KrUxBuDoLLxLc/ mbgzQdCk6etFK0UydAPED6EBjWd384/hL7biddQnr0sao8ZjKG9pzZV3oPxqksnO dpv+8brhu9Lr3MF2YX9QVOw3NBg1gJTp1VG6a3IU66RI6DF5trN0CNLwRfeauxh1 uZGmMOdNRKcZXFF0WaljRPu44KT9u74+Jo/oq9/jnk6B0wUcn1tKx2RkPReBt8du +cdE7+lGJ0xwHmfxi4mg1wNw38cuGS4kjAVUVIbNFUejWNLTiDcQHLP8ruCVpZRv 46lQ7jDupzl96CK8Dcrw5EBC9/R3Mu2FTJC3iXb6vbfji0kgkLl0Vlov+rJnts2Z mvzqQSP3c8/hKX6ZKggScKNoBkWLegGuJV8ysBfvdxrt5hq+U9iCpZKHWyyfEsLb GObx8yv53brrwlWSwBZRRox/3Mkj81IPzfTTaRpaiGzxTPB6nNHVUaNpWeGMf2S0 VwK38sCWbsBZr7okz7C3jIkMgwxsbPrjfVkVMzKPSXqH/QpEtmrkp7l4aXnoRa2D rCRdKwKsFLnGdSPh3zUGdQ8urp2kppYkc14czSgDCsozxXODVRMy1oO8PYpJ5Ak3 fcX/OlGDgPebMH2PrN0EFBJSj5SzAb9RNdyzKusJ93qzE0XC57wVyzmOQm7Hylr9 /jC3S9VsufFWZ8VJrqRC =tIAA -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 28 11:35:39 2017 Received: (at 26267) by debbugs.gnu.org; 28 Mar 2017 15:35:39 +0000 Received: from localhost ([127.0.0.1]:49529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cst9n-0005DT-2k for submit@debbugs.gnu.org; Tue, 28 Mar 2017 11:35:39 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:37946 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cst9l-0005DM-VI for 26267@debbugs.gnu.org; Tue, 28 Mar 2017 11:35:38 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 43656512459; Tue, 28 Mar 2017 17:35:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1490715337; bh=wDoKX6jejiGye6IokqEAAd4WAU2VAgUViPgtn9cBleo=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=kDLUIgwFVSaGgksH7yo49AkDdXf8igJyRz0eIBKrNP6sVm2+nR6SKQNnQ8RwLI5br r632ReL6S6rMlNgxBW/wbTvh5qHL5pc0LRjqUaUzOEG1Gr7+sHM+i2xCjD0ZrdBe0Y 3SvJMIJlHQButjO0BvaR8kBT9KpCVwPC1PpQyJSQ= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR003 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1490715336; bh=wDoKX6jejiGye6IokqEAAd4WAU2VAgUViPgtn9cBleo=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=htLRuedlzZa3ugI0EujM/0OwUencv7HSY1RXQet8TOB9HXWaeL1YKoL7MJ+HC2ESG 1KFmlG/KnSJXsDRZK+wwwpVZ5QZdxehRItN6Pd6YnftvXLBWVW2xZtfL1YeVxCKKlk m+RYbfX15+Cx6UyJoMcRau0B43YcwMZ8OsmIpcqY= To: Marius Bakke Subject: Re: bug#26267: [PATCH] gnu: hyperrogue: Update to 9.4c. References: <20170326200643.5256-1-kei@openmailbox.org> <20170327204017.3529-1-kei@openmailbox.org> <87y3vqv26x.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <87fuhxpr72.fsf@openmailbox.org> <87vaqtttfz.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> Date: Tue, 28 Mar 2017 11:35:29 -0400 In-Reply-To: <87vaqtttfz.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> (Marius Bakke's message of "Tue, 28 Mar 2017 15:35:44 +0200") Message-ID: <878tnppg72.fsf@openmailbox.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 26267 Cc: 26267@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) --=-=-= Content-Type: text/plain Marius Bakke writes: > I was able to extract it by removing the single quotes (these strings > are already 'quoted' when passed to the unzip command). I learned something new today. :-P > However the > second extraction seems to match some files from the first, perhaps an > additional filter needs to be passed to avoid descending into sounds/. > > The example for the '-x' option in the manual looks like it should do > the job. > I only needed to include the credits.txt file in the sounds directory, so I just used "extract all .ogg files + the credits.txt file." > LGTM and HTH! :-) I submitted one last patch in case I missed anything obvious. Thanks to you and Leo for the reviews. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJY2oLBAAoJEOal7jwZRnoNJawQAMDaCd0d7s7bCr7FhPOYT27a YgzxFRPi4RREPjQjEO47F418CAkRN99NTy36xdGIcgKMHx44XM/fjg4Ui/qPPAK/ ckJgQVFzZxvVhXOPL6EAb7KW7iYaCRS8HI3INDiCjkOK3ZKh9km0dK+vIV2e5uI6 vQu8ZprhphlP4U9vBo4aDn6rsyu9FYUS5ucx7tmR3aMv7DxlBdUVcOMuwZtimy9T FLjOSpxMg3Sw5KD0PChA4BndrTgjPD44noCJ7uFD+bsWTg463GUnrbiQCF+PeW0Q 8Ammi/AqzUWKosIFEn+86nDekPq7D+ckVmP76VFvG30YRtjIhwquzzpG8apu0C1S b63oYktLW9jtAsN4qJdrFv9GQWv3rh/12PY/Q0Bw87cBJ7TFLwHMLamUxSBWhVuc B8Hx5PeQqge8JJSpgQvlJQkoh7UJnRXdSV3ttoxCZCBb3whnUwoQqKq4XYrGHKb7 bTTEFkp9hAF/B6gi3ModrGjGz0xVB+7L1WcgEsjNp7leMWFC9jz1Bl3Xp/U+QoSF ppSJToJmsgGY7yJUzyU1Bt202/ujVTZgtYL6W0NJqjVuJlrhfTxGghxdZ6UW+uzq C2JOI1T6rgpBFnGBsL7yX469HVO5YE8qCAbOxbhW/eM+BLqdwM2YAk5qvHyZ+8k5 VqKQo0XOaXqPr/DY/OMi =wu5U -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 28 21:16:59 2017 Received: (at 26267) by debbugs.gnu.org; 29 Mar 2017 01:17:00 +0000 Received: from localhost ([127.0.0.1]:49837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ct2EN-0004Dt-N8 for submit@debbugs.gnu.org; Tue, 28 Mar 2017 21:16:59 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:46706) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ct2EL-0004Dl-Td for 26267@debbugs.gnu.org; Tue, 28 Mar 2017 21:16:58 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id BFF8220701; Tue, 28 Mar 2017 21:16:57 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Tue, 28 Mar 2017 21:16:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=T8n096SJqu5aMhKf6HPfrDpWvuhOmpP2i8B3Ewqt6 0E=; b=KfRLRDwrHhEda3RtgAS0CPmHBRbGN8XlpnutKPLanhvFFpmJhemxYOla4 RH+D0vjqke99jKd9fyG5bf9AE7iaU/y9jIbXBYgvoXtua6/O5tYFR4+m6tkPIuTJ G3hovGckyIQlU1nhIIaLSR9AMKshIq/zp3BTZFX6Eh7qS1t1nZyKrWfmbG1y7eb4 41tuX4kbcTA9nz1OvYxWbHgL61d05/4nn1Bu5hrqQcI8lTHkbT03PaGIyguRYEAC x+gbNF1EbPg3VeMmKO8y1OQs/EAkugRk7h/7FPbehWoqLKsmA2G2dMvGQ9WivJ0Q UVcI1YZQl9ZsREihHLqqlmiDg3vsw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=T8n096SJqu5aMhKf6H PfrDpWvuhOmpP2i8B3Ewqt60E=; b=GonVh0A6+jPpcds7mtov36mGieX/L7Ny4G qtEwoJX5tg1+OwF+lDhJQkXafPtvNIMzpPu06OkZarLSGSwdjpkjJg9hC9ek9CAQ KdMqsDxo4adparbcL6199ilpmNc6HjQJ2wIECSzZM6Qvh3cGyx2qgxWVaDVSK2P4 a7fZw/YsVOo9b8VZxUz7XLZ6z1iHQYu67Gf/rfmGr0gAyTopKfDKgV6IVQybika1 wUvUp1mB6lhHayjiJJFtBzbwdke/m/RXFZlkfdwKcCOKNhEuPRXCQyPAQQW9StKl myOI8KDIbwrTm7z1FlN+Uk9qikFx07olbloHFYexI1uU8wIwgQJg== X-ME-Sender: X-Sasl-enc: F00zHIwmulc2R3vzx7x55FS3jnsLcaxLmg6dTbLx+3iJ 1490750217 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 5D0567E273; Tue, 28 Mar 2017 21:16:57 -0400 (EDT) From: Marius Bakke To: Kei Kebreau Subject: Re: bug#26267: [PATCH] gnu: hyperrogue: Update to 9.4c. In-Reply-To: <878tnppg72.fsf@openmailbox.org> References: <20170326200643.5256-1-kei@openmailbox.org> <20170327204017.3529-1-kei@openmailbox.org> <87y3vqv26x.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <87fuhxpr72.fsf@openmailbox.org> <87vaqtttfz.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <878tnppg72.fsf@openmailbox.org> User-Agent: Notmuch/0.24 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Wed, 29 Mar 2017 03:16:55 +0200 Message-ID: <87d1d0ubjs.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26267 Cc: 26267@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Kei Kebreau writes: > Marius Bakke writes: > >> I was able to extract it by removing the single quotes (these strings >> are already 'quoted' when passed to the unzip command). > > I learned something new today. :-P > >> However the >> second extraction seems to match some files from the first, perhaps an >> additional filter needs to be passed to avoid descending into sounds/. >> >> The example for the '-x' option in the manual looks like it should do >> the job. >> > > I only needed to include the credits.txt file in the sounds directory, > so I just used "extract all .ogg files + the credits.txt file." Great. :-) > >> LGTM and HTH! :-) > > I submitted one last patch in case I missed anything obvious. Thanks to > you and Leo for the reviews. LGTM! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAljbCwgACgkQoqBt8qM6 VPrH4gf/ZK2z6w7+9KRkBTpmqQLsnZRVt9vazs3Af/PUB59WGFsX6CSBORy8iAtH dtdDEV7WBU5nBsTEqAJrgpuuL8tAwMWByUOQt2t/Ek9Chlx17OhwuSgJcbuCup4a wlMAFn3EBbJfSAQf45BXU8uC/HgVpyxaCm9btJMaG32WBR5YV90Dw6dzDlCVUsIX xP5+Gi7l3/qPBjvbrqdeeYHvk7LN6lHHjP41dED+DaxQGv1Ga7bytBfXD3mmy2qg Y/TtjvNb03uE4rKnJUQe+/NCTtE90alGCgKZOezQ6r9d7d8rsGHcWNkAYkObfSo4 F3JdAL3pBXWhbTh/7bVNTb5Rov94Hw== =Pe3S -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 28 23:41:08 2017 Received: (at 26267-done) by debbugs.gnu.org; 29 Mar 2017 03:41:08 +0000 Received: from localhost ([127.0.0.1]:49892 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ct4Ts-00012p-CG for submit@debbugs.gnu.org; Tue, 28 Mar 2017 23:41:08 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:40625 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ct4Tr-00012g-8K for 26267-done@debbugs.gnu.org; Tue, 28 Mar 2017 23:41:07 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 0250F50DD00; Wed, 29 Mar 2017 05:41:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1490758866; bh=jRMt82ZOWpa33AYtIFo6YMGQeweAA9hdki3KiKkc86Q=; h=From:To:Subject:References:Date:In-Reply-To:From; b=fZmZT5L+xelRrnqjPMoLGeQmJJl4zUqV1Avh+IJ93DW+3zH8ioVMTqvNMpCPXvC4H +dACL++ef1KGM3tt2pXDmMhqSwQbTMQjuH4K3ouacbi53xluw/gWETCUStJE+5bImp BmR1EzDES8iDefBMA+uJXc7PXLsF7NoRMFwGc0t4= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR002 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1490758865; bh=jRMt82ZOWpa33AYtIFo6YMGQeweAA9hdki3KiKkc86Q=; h=From:To:Subject:References:Date:In-Reply-To:From; b=AGwKm0O/5uiYWBsuhc/CHlznxk+k2NT683+PZ68fOCXgHDPrB8RdgoxgcxZOUjWto npUiaFWJPh3tYjgIfW2YhGCS1i/1bHALVTyOVOs6sPbtFHjcf82ILV+OB2aOC9Jcok p893D4K+iusB9RLtB4u/IsFAz3gQ5kE8HiWYE1O0= To: 26267-done@debbugs.gnu.org Subject: Re: bug#26267: [PATCH] gnu: hyperrogue: Update to 9.4c. References: <20170326200643.5256-1-kei@openmailbox.org> Date: Tue, 28 Mar 2017 23:40:49 -0400 In-Reply-To: <20170326200643.5256-1-kei@openmailbox.org> (Kei Kebreau's message of "Sun, 26 Mar 2017 16:06:43 -0400") Message-ID: <8760ispx6m.fsf@openmailbox.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 26267-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) --=-=-= Content-Type: text/plain Pushed to master as f8279ba46baa5a1ad7e6c32546d71819eff72e4e. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJY2yzBAAoJEOal7jwZRnoN5K8QALxnPSpOuDY8/ZYsfaezuIZV sEVD1OjuZRSj6NiP66mwXA1zDfQ9D2zFkOg/xifalY4RlUmwauCBOeITBlCKJtKO dMYkEdKA0gev4ZHbQh+Ddn4CIVkKlzUJa1fBvchcafHaD7+Kz3XsC5uIcMu4OdOZ NfMlRF0DywTcc3Se+6GCHskCihF5/m8zP7fBI7j1n+roL46ItpIIcQT+JBl7ZGwy sAZ00KY5Nzq4bRnSlYgHurXEAK7XX5WQ0ZxVK7VJRlkaz+0CpeVfbEwXSiXitOjQ +DaW+u5fwwVsTtZaadfxePyKRkpvDubuxGlOJfklbkYFXl6Ag1K0NmzKLCWAlvIr KoKABVAZ+4eJuJ+eYX6BEociIuqOhQRAnglOUe1788sLS5+Tuyzu2/9yEHFLdhc8 pFa88cdgaV7BepG+BXsybFp9XptM/4QOskQLjMf31YZP+p3tE2S+mc48eQOG6NW0 HQVhlNCEcxCLVhdofZ4imeZCh5BcTpHN/wj/a592cXpKYenfI9jFTUIl0CYhc1W0 IbGAZBlwxmf9gSWdPdhBlGuUTz7SnKcpTgsnfdA4HqTysb5GEhGOmyRKcG0xI6HB oV1vFmgi8Uuf3iZPvTF+AT+aOuksj3txxKxwsGyYBcKmMDEFP6xY4BUbalYE/NHK qu7apzoVECynEmqzHf07 =qBph -----END PGP SIGNATURE----- --=-=-=-- From unknown Fri Jun 20 20:09:29 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 26 Apr 2017 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator