From unknown Fri Aug 15 14:45:56 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#32928 <32928@debbugs.gnu.org> To: bug#32928 <32928@debbugs.gnu.org> Subject: Status: [PATCH] gnu: Add bastet. Reply-To: bug#32928 <32928@debbugs.gnu.org> Date: Fri, 15 Aug 2025 21:45:56 +0000 retitle 32928 [PATCH] gnu: Add bastet. reassign 32928 guix-patches submitter 32928 Tobias Geerinckx-Rice severity 32928 normal tag 32928 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 03 23:00:53 2018 Received: (at submit) by debbugs.gnu.org; 4 Oct 2018 03:00:53 +0000 Received: from localhost ([127.0.0.1]:36258 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g7tsf-0000Yy-3J for submit@debbugs.gnu.org; Wed, 03 Oct 2018 23:00:53 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52379) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g7tsc-0000Yj-Ry for submit@debbugs.gnu.org; Wed, 03 Oct 2018 23:00:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g7tsT-00066K-L7 for submit@debbugs.gnu.org; Wed, 03 Oct 2018 23:00:39 -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.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:46978) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g7tsR-00064b-Vv for submit@debbugs.gnu.org; Wed, 03 Oct 2018 23:00:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33700) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g7tsQ-0007z8-P4 for guix-patches@gnu.org; Wed, 03 Oct 2018 23:00:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g7tsO-0005yn-Pw for guix-patches@gnu.org; Wed, 03 Oct 2018 23:00:34 -0400 Received: from tobias.gr ([2001:470:7405::1]:43310) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g7tsM-0005qe-RI for guix-patches@gnu.org; Wed, 03 Oct 2018 23:00:32 -0400 Received: by tobias.gr (OpenSMTPD) with ESMTP id 597a1c84 for ; Thu, 4 Oct 2018 02:53:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=from:to :subject:date:message-id:mime-version:content-transfer-encoding; s=2018; i=me@tobias.gr; bh=6uoHOrc21x4YKwxAxST37PAbV3cNP3l1gUV7 CQl+/ws=; b=IHXEz7LaTKjtMyVIScBupNJpnLxkJxDX5NKUsRMf9UF96OFutwN3 c+xpgGfTjCY44Nav2OdXSQPv+3HtZvED2h/tzU8DQb2vQzymWHq59IvtvwV+s64w 5Q9DICdpSbGCQ5AgxzhEEFwzCw6/pQ/yX151aqJyr7ghJrFeiLAxhQNYQEYeobFE A93+1nGdbxbatPZ0w9OnVtPR1wmCYbTBRiu2DUWEak9/c222BQa55V9+mqfn+j+2 c7MpppqqGeE5WQFZZ5QSOgkv0p860AbdIFM5L9UKEbVeNH73xIx1APS2L2FDAjPY Mug4xyJRErVU2ThAMk+UL+HTzVAurHwcAQ== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 5d3a576a (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Thu, 4 Oct 2018 02:53:39 +0000 (UTC) From: Tobias Geerinckx-Rice To: guix-patches@gnu.org Subject: [PATCH] gnu: Add bastet. Date: Thu, 4 Oct 2018 04:53:19 +0200 Message-Id: <20181004025319.28238-1-me@tobias.gr> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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.1 (----) X-Debbugs-Envelope-To: submit 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: -5.1 (-----) * gnu/packages/games.scm (bastet): New public variable. * gnu/packages/patches/bastet-change-source-of-unordered_set.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- The Chromium of tetroids. gnu/local.mk | 1 + gnu/packages/games.scm | 64 +++++++++++++++++++ ...astet-change-source-of-unordered_set.patch | 40 ++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 gnu/packages/patches/bastet-change-source-of-unordered_set.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4152696a7..101399d9b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -591,6 +591,7 @@ dist_patch_DATA = \ %D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/azr3.patch \ %D%/packages/patches/bash-completion-directories.patch \ + %D%/packages/patches/bastet-change-source-of-unordered_set.patch \ %D%/packages/patches/bazaar-CVE-2017-14176.patch \ %D%/packages/patches/beignet-correct-file-names.patch \ %D%/packages/patches/binutils-aarch64-symbol-relocation.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ec92f508b..9ee22191a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -181,6 +181,70 @@ more advanced player there are new game modes and a wide variety of physics settings to tweak as well.") (license license:gpl2+))) +(define-public bastet + (package + (name "bastet") + (version "0.43.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fph/bastet.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "09kamxapm9jw9przpsgjfg33n9k94bccv65w95dakj0br33a75wn")) + (patches + (search-patches "bastet-change-source-of-unordered_set.patch")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list (string-append "CXXFLAGS=-I" + (assoc-ref %build-inputs "boost") "/include")) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (replace 'check + ;; The 'Test' target builds the test, but doesn't actually run it. + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "Test" make-flags) + (setenv "HOME" ".") + (invoke "./Test"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share")) + (hicolor (string-append share "/icons/hicolor"))) + (install-file "bastet" + (string-append out "/bin")) + + (install-file "bastet.desktop" + (string-append share "/applications")) + (install-file "bastet.svg" + (string-append hicolor "/scalable/apps")) + + (install-file "bastet.appdata.xml" + (string-append share "/appdata")) + + (install-file "bastet.6" + (string-append out "/share/man/man6")) + #t)))))) + (native-inputs + `(("hicolor-icon-theme" ,hicolor-icon-theme))) + (inputs + `(("boost" ,boost) + ("ncurses" ,ncurses))) + (home-page "http://fph.altervista.org/prog/bastet.html") + (synopsis "Antagonistic Tetris-style falling brick game for text terminals") + (description + "Bastet (short for Bastard Tetris) is a simple ncurses-based falling brick +game. Unlike normal Tetris, Bastet does not choose the next brick at random. +Instead, it uses a special algorithm to choose the worst brick possible. + +Playing bastet can be a painful experience, especially if you usually make +canyons and wait for the long I-shaped block to clear four rows at a time.") + (license license:gpl3+))) + (define-public cataclysm-dda (let ((commit "ad3b0c3d521292d119f97a83390e7acfe9e9e7f7") (revision "1")) diff --git a/gnu/packages/patches/bastet-change-source-of-unordered_set.patch b/gnu/packages/patches/bastet-change-source-of-unordered_set.patch new file mode 100644 index 000000000..ef3970a3e --- /dev/null +++ b/gnu/packages/patches/bastet-change-source-of-unordered_set.patch @@ -0,0 +1,40 @@ +From: Tobias Geerinckx-Rice +Date: Wed, 3 Oct 2018 23:30:42 +0200 +Subject: [PATCH] bastet: Change source of unordered_set. + +This allows building bastet 0.43.2 with boost >=1.66. +It was backported verbatim from the upstream master branch. + +From 0e03f8d4d6bc6949cf1c447e632ce0d1b98c4be1 Mon Sep 17 00:00:00 2001 +From: Federico Poloni +Date: Wed, 4 Oct 2017 19:35:01 +0200 +Subject: [PATCH] Changed source of unordered_set (should hopefully fix #6 + without reopening #1) + +--- + BastetBlockChooser.hpp | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/BastetBlockChooser.hpp b/BastetBlockChooser.hpp +index 992e556..7ee3b7c 100644 +--- a/BastetBlockChooser.hpp ++++ b/BastetBlockChooser.hpp +@@ -23,8 +23,7 @@ + + #include "Well.hpp" + +-#include +-#include ++#include + #include + + namespace Bastet{ +@@ -75,7 +74,7 @@ namespace Bastet{ + public: + Searcher(BlockType b, const Well *well, Vertex v, WellVisitor *visitor); + private: +- std::tr1::unordered_set _visited; ++ boost::unordered_set _visited; + //std::set _visited; ^^ the above is more efficient, we need to do many inserts + BlockType _block; + const Well *_well; -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 04 22:24:42 2018 Received: (at 32928) by debbugs.gnu.org; 5 Oct 2018 02:24:42 +0000 Received: from localhost ([127.0.0.1]:37287 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g8FnG-0002c5-7p for submit@debbugs.gnu.org; Thu, 04 Oct 2018 22:24:42 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:33199) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g8FnE-0002by-Pl for 32928@debbugs.gnu.org; Thu, 04 Oct 2018 22:24:41 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 1C68E21BBE; Thu, 4 Oct 2018 22:24:40 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 04 Oct 2018 22:24:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=Qfl5vCjEzHlsDka1vdxZxO2b foNubXoerPg5rb+jJuY=; b=bYfpMHUlwrl1qduk4KmXuD1HjBVWkhajHzkMpLAC VHZjZnz7QMbQA9RdnA+x15NBNb5E0+Wb1+LrJp+njQsMNZzbmBhTpp37uTsgsWe5 ZrC6ZHPoT6f6KJ2U8sLZn8WGpElak2xXc2NsDY2nG3X3NqIDzfB5c4PUAyptzAEv vqg= 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-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=Qfl5vC jEzHlsDka1vdxZxO2bfoNubXoerPg5rb+jJuY=; b=FxBAX+XFq9KTejw8hTqO1e ULr9oeMGonN0/bKSq/h9fmBKk5K7c/LmLPELfO7CN3zq0UW/TTxcCfKPCT4xIWl1 S4I82OE2QMsc+uS+ftHlxQiJmKbyMlre/UrO8Fg3gizPAXwRbsZ87mmuaomS+yxv P57/XIr4CGeNanHzNzWZGmzRv8bNk/LyvOLy1JIYEQ0/tSH8YZ2n96JaDLwjyyNS kBC1IMnry+ZmgcPTB7guEFQ72zntWNRhhXU6vqIW2XovCLTZ5Cp7RHCLk/YLS1sM pBISplW984cv1IGgiW2lhnJ5ke2Yjmtl9AcoqjaPS7dRvayU97zUBA5zIoXvPXPQ == X-ME-Sender: X-ME-Proxy: Received: from localhost (unknown [172.56.35.74]) by mail.messagingengine.com (Postfix) with ESMTPA id BC46F102E7; Thu, 4 Oct 2018 22:24:37 -0400 (EDT) Date: Thu, 4 Oct 2018 22:24:36 -0400 From: Leo Famulari To: Tobias Geerinckx-Rice Subject: Re: [bug#32928] [PATCH] gnu: Add bastet. Message-ID: <20181005022436.GA10255@jasmine.lan> References: <20181004025319.28238-1-me@tobias.gr> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="bg08WKrSYDhXBjb5" Content-Disposition: inline In-Reply-To: <20181004025319.28238-1-me@tobias.gr> User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 32928 Cc: 32928@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: -1.7 (-) --bg08WKrSYDhXBjb5 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Oct 04, 2018 at 04:53:19AM +0200, Tobias Geerinckx-Rice wrote: > * gnu/packages/games.scm (bastet): New public variable. > * gnu/packages/patches/bastet-change-source-of-unordered_set.patch: > New file. > * gnu/local.mk (dist_patch_DATA): Add it. LGTM, thanks! --bg08WKrSYDhXBjb5 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlu2y2EACgkQJkb6MLrK fwhhzxAAowjsnbConH/9fW5XkP3tYkVIEGgg5HWQBjvXBBZM85Pf64ke7sgWD4qx nqWT+AVT+Z0FYXc+qgdiK5KGSyIQaOKcoIG6XfWAhYtIZKwsNubp7OF1CKD9a1fz nUOhkViZ7i72ndWI/7kiqwClOkxAWaxkyVS5UB0F3tk+DWfRk5hmbqLFRnrLB18t WWS1Fq20q1fNnfDdnTLE/ohTw/7eqWlKy7NePtwqKB47FWSg1+wQp6WNw2hJM33R /FfZRYtOe+nRlk/2W641wuhoa6zkxCcr+Dp3sa2eTIkCTnwLiKUQPTqp0d2iHm58 ndusuQxa+WAoXdsX4aX4bur3PDB/qhW/OjqV23iseHLb2M7hps4L100l1nxe22lk ZJHeXhsfbNOKVA8BXcqDv5BEz/S0SkIrWoJ5NYH6WGwcfG7EIdhNsANKc2gJeLMz C1RflMzuotCG87j5azk/MBGN//j4wosGBUC+HtOatdJSssOnuJaAjPNYSIFxP7SY QPqNQiPO+55obNx/b4gt6tyIdHxs3vL4+tTM+fO5/jEupCZ4l8kui+sc+TMCoQTP b3U9d3o5EGYoiymwEqVzb8M2sdlNFyZ1pM8lFIuVUThIyWJUQF7QTw0tCk9Df/PV vTMRodcnqimr/DoNXJmQmXeyrSnLTdgA/JS+eMDec7r35sqAtJA= =L7BQ -----END PGP SIGNATURE----- --bg08WKrSYDhXBjb5-- From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 05 13:34:38 2018 Received: (at 32928-done) by debbugs.gnu.org; 5 Oct 2018 17:34:38 +0000 Received: from localhost ([127.0.0.1]:38174 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g8Tzp-00047T-QI for submit@debbugs.gnu.org; Fri, 05 Oct 2018 13:34:37 -0400 Received: from tobias.gr ([80.241.217.52]:48794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g8Tzm-00047J-UN for 32928-done@debbugs.gnu.org; Fri, 05 Oct 2018 13:34:35 -0400 Received: by tobias.gr (OpenSMTPD) with ESMTP id 2747355d; Fri, 5 Oct 2018 17:34:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=references :from:to:cc:subject:in-reply-to:date:message-id:mime-version :content-type; s=2018; i=me@tobias.gr; bh=MlAOaLkZK6qecsBv4e29Hj btRW/f9IF6+buwC1O1FOg=; b=Aqdfmm34eV40ogHO0I2hoUIyxhB25DDy52LRZL cui4eG8gXmKju9e1sp8tjEm4yZGmN2wJaSC6p/1wYn+yV5mDGKYW/Ht7jmWHApcp +7xGI9lfJeysSnwjlWzMm2lYFYXNXOMFs83xk6hLr7sp76siDw6iRMC3m7xK6P6o TSHMHvso1o38NOWiK2GSEOe5MKALsjZAS56tpJ6Horo6TBTyL29GSPuNbYb/K3Jx 62Hrmxl28JGLuZSSmEtdMkhAmIHZtb/0PPfnmxlv9ILC1XTjsg8JzjY97pn/ewV3 3Dku6OAQFMohpU23YGdrzqOgTmv+kDWgkZEu1UGxfIAjJ9+A== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id d043c532 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Fri, 5 Oct 2018 17:34:30 +0000 (UTC) References: <20181004025319.28238-1-me@tobias.gr> <20181005022436.GA10255@jasmine.lan> From: Tobias Geerinckx-Rice To: Leo Famulari Subject: Re: [bug#32928] [PATCH] gnu: Add bastet. In-reply-to: <20181005022436.GA10255@jasmine.lan> Date: Fri, 05 Oct 2018 19:34:32 +0200 Message-ID: <87a7nsguvr.fsf@tobias.gr> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 32928-done Cc: 32928-done@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: -1.0 (-) Leo, Leo Famulari wrote: > On Thu, Oct 04, 2018 at 04:53:19AM +0200, Tobias Geerinckx-Rice > wrote: >> * gnu/packages/games.scm (bastet): New public variable. >> * >> gnu/packages/patches/bastet-change-source-of-unordered_set.patch: >> New file. >> * gnu/local.mk (dist_patch_DATA): Add it. > > LGTM, thanks! Thank you! Pushed as fc4738149f5cbaffc8e0b37bfb61e25fac0ecd67. Kind regards, T G-R From unknown Fri Aug 15 14:45:56 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 03 Nov 2018 11:24:04 +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