From: awest03 <awest03@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] New package: bastet-0.43.2
Date: Mon, 03 Oct 2022 14:24:37 +0200 [thread overview]
Message-ID: <20221003122437.C2Or9GU5wUQxpj2a-FvSzrMLqqJh9XVCeNtXxiZvXaY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39558@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1221 bytes --]
There is an updated pull request by awest03 against master on the void-packages repository
https://github.com/awest03/void-packages bastet
https://github.com/void-linux/void-packages/pull/39558
[WIP] New package: bastet-0.43.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- i686
- armv6l
Fails to build on musl
A patch file from https://github.com/void-linux/void-packages/pull/39558.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bastet-39558.patch --]
[-- Type: text/x-diff, Size: 4291 bytes --]
From 5497cf6b16f44801dde9412ce290ddb4b33cade1 Mon Sep 17 00:00:00 2001
From: Alaisdair West <alaisdair.west@outlook.com.au>
Date: Mon, 3 Oct 2022 20:37:25 +1000
Subject: [PATCH] New package: bastet-0.43.2
---
srcpkgs/bastet/patches/musl.patch | 9 ++++++
srcpkgs/bastet/patches/new-boost.patch | 22 +++++++++++++
.../bastet/patches/scorer-names-bugfix.patch | 12 +++++++
srcpkgs/bastet/template | 31 +++++++++++++++++++
4 files changed, 74 insertions(+)
create mode 100644 srcpkgs/bastet/patches/musl.patch
create mode 100644 srcpkgs/bastet/patches/new-boost.patch
create mode 100644 srcpkgs/bastet/patches/scorer-names-bugfix.patch
create mode 100644 srcpkgs/bastet/template
diff --git a/srcpkgs/bastet/patches/musl.patch b/srcpkgs/bastet/patches/musl.patch
new file mode 100644
index 000000000000..e5cfd52d1317
--- /dev/null
+++ b/srcpkgs/bastet/patches/musl.patch
@@ -0,0 +1,9 @@
+diff -Np1 a/Ui.cpp b/Ui.cpp
+*** a/Ui.cpp 2015-08-30 17:04:24.000000000 +1000
+--- b/Ui.cpp 2022-10-03 21:07:31.638179807 +1000
+***************
+*** 29,30 ****
+--- 29,31 ----
+ #include <boost/algorithm/string.hpp>
++ #include <sys/select.h>
+
diff --git a/srcpkgs/bastet/patches/new-boost.patch b/srcpkgs/bastet/patches/new-boost.patch
new file mode 100644
index 000000000000..5ae11cb2f81d
--- /dev/null
+++ b/srcpkgs/bastet/patches/new-boost.patch
@@ -0,0 +1,22 @@
+diff -Np1 a/BastetBlockChooser.hpp b/BastetBlockChooser.hpp
+*** a/BastetBlockChooser.hpp 2015-08-30 17:04:24.000000000 +1000
+--- b/BastetBlockChooser.hpp 2022-09-30 12:18:43.100123811 +1000
+***************
+*** 25,28 ****
+
+! #include <boost/tr1/tr1/unordered_set>
+! #include <set>
+ #include <boost/functional/hash.hpp>
+--- 25,27 ----
+
+! #include <boost/unordered_set.hpp>
+ #include <boost/functional/hash.hpp>
+*************** namespace Bastet{
+*** 77,79 ****
+ private:
+! std::tr1::unordered_set<Vertex> _visited;
+ //std::set<Vertex> _visited; ^^ the above is more efficient, we need to do many inserts
+--- 76,78 ----
+ private:
+! boost::unordered_set<Vertex> _visited;
+ //std::set<Vertex> _visited; ^^ the above is more efficient, we need to do many inserts
diff --git a/srcpkgs/bastet/patches/scorer-names-bugfix.patch b/srcpkgs/bastet/patches/scorer-names-bugfix.patch
new file mode 100644
index 000000000000..ffff7fb65889
--- /dev/null
+++ b/srcpkgs/bastet/patches/scorer-names-bugfix.patch
@@ -0,0 +1,12 @@
+diff -Np1 a/Config.cpp b/Config.cpp
+*** a/Config.cpp 2015-08-30 17:04:24.000000000 +1000
+--- b/Config.cpp 2022-10-03 21:45:30.198811697 +1000
+*************** namespace Bastet{
+*** 189,191 ****
+ BOOST_FOREACH(const HighScore &hs, _hs[difficulty]){
+! ofs2<<str(scorer % difficulty % i) << " = \"" << hs.Scorer << "\"\n";
+ ofs2<<str(score % difficulty % i) << " = " << hs.Score <<"\n";
+--- 189,191 ----
+ BOOST_FOREACH(const HighScore &hs, _hs[difficulty]){
+! ofs2<<str(scorer % difficulty % i) << " = " << hs.Scorer << "\n";
+ ofs2<<str(score % difficulty % i) << " = " << hs.Score <<"\n";
diff --git a/srcpkgs/bastet/template b/srcpkgs/bastet/template
new file mode 100644
index 000000000000..a0051d691d20
--- /dev/null
+++ b/srcpkgs/bastet/template
@@ -0,0 +1,31 @@
+# Template file for 'bastet'
+pkgname=bastet
+version=0.43.2
+revision=1
+makedepends="boost-devel ncurses-devel"
+depends="boost ncurses"
+short_desc="Evil falling block game"
+maintainer="Alaisdair West <alaisdair.west2@outlook.com>"
+license="GPL-3.0-or-later"
+homepage="http://fph.altervista.org/prog/bastet.html"
+changelog="https://raw.githubusercontent.com/fph/bastet/master/NEWS"
+distfiles="https://github.com/fph/${pkgname}/archive/refs/tags/${version}.tar.gz"
+checksum=f219510afc1d83e4651fbffd5921b1e0b926d5311da4f8fa7df103dc7f2c403f
+nocheckperms=yes # For High Score file
+
+do_build() {
+ # Bastet's makefile does not work with build_style="gnu-makefile"
+ make
+}
+
+do_install() {
+ vbin ./${pkgname}
+ vinstall ${pkgname}.desktop 0644 usr/share/applications
+ vinstall ${pkgname}.png 0644 usr/share/pixmaps
+ # Don't overwrite the high scores file on update
+ if [! -f ${pkgname}.scores2]; then
+ vmkdir -m 0666 var/games
+ touch ${pkgname}.scores2
+ vinstall ${pkgname}.scores2 0666 var/games
+ fi
+}
next prev parent reply other threads:[~2022-10-03 12:24 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-01 0:36 [PR PATCH] " awest03
2022-10-01 1:23 ` [PR PATCH] [Updated] " awest03
2022-10-02 19:54 ` [PR REVIEW] " Johnnynator
2022-10-02 19:54 ` Johnnynator
2022-10-02 19:55 ` Johnnynator
2022-10-03 8:42 ` [PR PATCH] [Updated] " awest03
2022-10-03 9:15 ` [WIP] " awest03
2022-10-03 9:16 ` [PR REVIEW] " awest03
2022-10-03 10:40 ` [PR PATCH] [Updated] " awest03
2022-10-03 10:42 ` [PR REVIEW] " awest03
2022-10-03 10:43 ` awest03
2022-10-03 10:49 ` sgn
2022-10-03 10:54 ` awest03
2022-10-03 11:11 ` awest03
2022-10-03 12:24 ` awest03 [this message]
2022-10-03 13:14 ` awest03
2022-10-03 13:15 ` awest03
2023-01-03 12:06 ` sgn
2023-01-04 15:38 ` [PR PATCH] [Closed]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221003122437.C2Or9GU5wUQxpj2a-FvSzrMLqqJh9XVCeNtXxiZvXaY@z \
--to=awest03@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).