* [gentoo-commits] repo/gentoo:master commit in: games-puzzle/monsterz/, games-puzzle/monsterz/files/
@ 2019-12-25 19:30 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2019-12-25 19:30 UTC (permalink / raw
To: gentoo-commits
commit: 07813a42e9eb824a45d6997f578ef1f9812d15c6
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 25 19:28:35 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Dec 25 19:30:23 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07813a42
games-puzzle/monsterz: Fixes from Debian, python3 support
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
games-puzzle/monsterz/Manifest | 1 +
.../monsterz/files/monsterz-0.7.1-gentoo-r1.patch | 11 +++++
games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild | 57 ++++++++++++++++++++++
3 files changed, 69 insertions(+)
diff --git a/games-puzzle/monsterz/Manifest b/games-puzzle/monsterz/Manifest
index 874f1fe627d..dc3d0158282 100644
--- a/games-puzzle/monsterz/Manifest
+++ b/games-puzzle/monsterz/Manifest
@@ -1 +1,2 @@
DIST monsterz-0.7.1.tar.gz 1879537 BLAKE2B e1ad9f17a64bcbb07005eb61d951dbf756997a6e6bd76c48d88bb634c9b3167c9fd41ef32032925b219153eb607dc238af76b44c3ef6c47aab753d59c61958e1 SHA512 62de125251a74e7ff237c90ad88e10a4953b8841251dfec45cc6b77f416677ef6d68cf4308c3190f65896b5bb1312934abd5e438f0341f08c02884585f0e4787
+DIST monsterz_0.7.1-11.debian.tar.xz 13688 BLAKE2B 2274b6d18b2f03200e09468243bae7ede94b81bd7595f65a73fd33bc9ccc7302fbea3a4876b5bbf6cf98735652742b1cf76b3c288fc6c005f9566c04b4a4f277 SHA512 c172355667db29de949de07745469552d62dc226120f38ff76a288b14018424338f27b6a562de215b7194b8b09c6346d29e9088c8a0edb0fe915f915b8577a4b
diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo-r1.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo-r1.patch
new file mode 100644
index 00000000000..bd8a825c3c4
--- /dev/null
+++ b/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo-r1.patch
@@ -0,0 +1,11 @@
+--- a/monsterz.py.old 2019-12-25 20:25:16.680365172 +0100
++++ b/monsterz.py 2019-12-25 20:25:50.606666122 +0100
+@@ -1991,7 +1991,7 @@
+ global system, data, settings, fonter, monsterz
+ override = {}
+ scorefile = None
+- sharedir = dirname(argv[0])
++ sharedir = "GENTOO_DATADIR"
+ outfd = None
+ try:
+ long = ['help', 'version', 'music', 'sound', 'fullscreen',
diff --git a/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild b/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild
new file mode 100644
index 00000000000..74cbff40172
--- /dev/null
+++ b/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit desktop python-r1
+
+DESCRIPTION="A little puzzle game, similar to the famous Bejeweled or Zookeeper"
+HOMEPAGE="http://sam.zoy.org/projects/monsterz/"
+SRC_URI="
+ http://sam.zoy.org/projects/monsterz/${P/_p*}.tar.gz
+ mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
+"
+
+LICENSE="GPL-1+ LGPL-2+ WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/pygame[${PYTHON_USEDEP}]
+ media-libs/sdl-image[png]
+ media-libs/sdl-mixer[mod]
+"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${P/_p*}"
+
+src_prepare() {
+ default
+
+ # Debian fixes
+ for p in $(<"${WORKDIR}"/debian/patches/series) ; do
+ eapply -p1 "${WORKDIR}/debian/patches/${p}"
+ done
+
+ eapply "${FILESDIR}"/${PN}-0.7.1-gentoo-r1.patch
+ sed -i \
+ -e "s:GENTOO_DATADIR:/usr/share/${PN}:" \
+ monsterz.py || die "sed failed"
+
+ rm Makefile || die
+}
+
+src_install() {
+ insinto /usr/share/${PN}
+ doins -r graphics sound
+ newbin monsterz.py ${PN}
+ newicon graphics/icon.png ${PN}.png
+ make_desktop_entry ${PN} Monsterz
+ einstalldocs
+ python_replicate_script "${ED}"/usr/bin/monsterz
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-puzzle/monsterz/, games-puzzle/monsterz/files/
@ 2021-11-14 0:45 Ionen Wolkens
0 siblings, 0 replies; 3+ messages in thread
From: Ionen Wolkens @ 2021-11-14 0:45 UTC (permalink / raw
To: gentoo-commits
commit: 1dfc6f782485e30660bcbb93fa6cd5d1895795aa
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 13 21:45:51 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Nov 14 00:44:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dfc6f78
games-puzzle/monsterz: drop 0.7.1_p11
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-puzzle/monsterz/Manifest | 1 -
.../monsterz/files/monsterz-0.7.1-gentoo-r1.patch | 11 -----
games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild | 57 ----------------------
3 files changed, 69 deletions(-)
diff --git a/games-puzzle/monsterz/Manifest b/games-puzzle/monsterz/Manifest
index 5bddc541b67..b58cca358ec 100644
--- a/games-puzzle/monsterz/Manifest
+++ b/games-puzzle/monsterz/Manifest
@@ -1,3 +1,2 @@
DIST monsterz-0.7.1.tar.gz 1879537 BLAKE2B e1ad9f17a64bcbb07005eb61d951dbf756997a6e6bd76c48d88bb634c9b3167c9fd41ef32032925b219153eb607dc238af76b44c3ef6c47aab753d59c61958e1 SHA512 62de125251a74e7ff237c90ad88e10a4953b8841251dfec45cc6b77f416677ef6d68cf4308c3190f65896b5bb1312934abd5e438f0341f08c02884585f0e4787
-DIST monsterz_0.7.1-11.debian.tar.xz 13688 BLAKE2B 2274b6d18b2f03200e09468243bae7ede94b81bd7595f65a73fd33bc9ccc7302fbea3a4876b5bbf6cf98735652742b1cf76b3c288fc6c005f9566c04b4a4f277 SHA512 c172355667db29de949de07745469552d62dc226120f38ff76a288b14018424338f27b6a562de215b7194b8b09c6346d29e9088c8a0edb0fe915f915b8577a4b
DIST monsterz_0.7.1-12.debian.tar.xz 14196 BLAKE2B ec4f425da3502afa175e0e3772a47ed24cd5d5857a04e4627cbcc7491df70f3aa718b82aae25f36a67868ba114075dabb215cc9d1ecd3b97ad2d7ab401cdd528 SHA512 3111363010ee10952fa93c456ce2db015ef1a516bde8bba55b5cd3f2ea4c50d71bb1a81c0207cd89960c47b4e2eb10693782bdc72d7439163720bf686e389cb3
diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo-r1.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo-r1.patch
deleted file mode 100644
index bd8a825c3c4..00000000000
--- a/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo-r1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/monsterz.py.old 2019-12-25 20:25:16.680365172 +0100
-+++ b/monsterz.py 2019-12-25 20:25:50.606666122 +0100
-@@ -1991,7 +1991,7 @@
- global system, data, settings, fonter, monsterz
- override = {}
- scorefile = None
-- sharedir = dirname(argv[0])
-+ sharedir = "GENTOO_DATADIR"
- outfd = None
- try:
- long = ['help', 'version', 'music', 'sound', 'fullscreen',
diff --git a/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild b/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild
deleted file mode 100644
index dff0f0c80f7..00000000000
--- a/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit desktop python-r1
-
-DESCRIPTION="A little puzzle game, similar to the famous Bejeweled or Zookeeper"
-HOMEPAGE="http://sam.zoy.org/projects/monsterz/"
-SRC_URI="
- http://sam.zoy.org/projects/monsterz/${P/_p*}.tar.gz
- mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
-"
-
-LICENSE="GPL-1+ LGPL-2+ WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-python/pygame[${PYTHON_USEDEP}]
- media-libs/sdl-image[png]
- media-libs/sdl-mixer[mod]
-"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${P/_p*}"
-
-src_prepare() {
- default
-
- # Debian fixes
- for p in $(<"${WORKDIR}"/debian/patches/series) ; do
- eapply -p1 "${WORKDIR}/debian/patches/${p}"
- done
-
- eapply "${FILESDIR}"/${PN}-0.7.1-gentoo-r1.patch
- sed -i \
- -e "s:GENTOO_DATADIR:/usr/share/${PN}:" \
- monsterz.py || die "sed failed"
-
- rm Makefile || die
-}
-
-src_install() {
- insinto /usr/share/${PN}
- doins -r graphics sound
- newbin monsterz.py ${PN}
- newicon graphics/icon.png ${PN}.png
- make_desktop_entry ${PN} Monsterz
- einstalldocs
- python_replicate_script "${ED}"/usr/bin/monsterz
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-puzzle/monsterz/, games-puzzle/monsterz/files/
@ 2025-04-16 10:59 Ionen Wolkens
0 siblings, 0 replies; 3+ messages in thread
From: Ionen Wolkens @ 2025-04-16 10:59 UTC (permalink / raw
To: gentoo-commits
commit: d3e9d1b60d613066f646484033ec177cd8f8209a
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 16 10:12:12 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Apr 16 10:56:43 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3e9d1b6
games-puzzle/monsterz: fix with numpy2 (used through pygame)
Believe there may still be issues given runtime warnings, e.g.
/usr/bin/monsterz:860: RuntimeWarning: overflow encountered ...
But it seems to work regardless and not intending to spend more
time on this myself. Unfortunately debian does not seem to have
patches for these issues in _p13 and so haven't bumped it for now.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../monsterz/files/monsterz-0.7.1-numpy2.patch | 32 ++++++++++++++++++++++
...7.1_p12.ebuild => monsterz-0.7.1_p12-r1.ebuild} | 3 +-
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-numpy2.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-numpy2.patch
new file mode 100644
index 000000000000..917d44a1b458
--- /dev/null
+++ b/games-puzzle/monsterz/files/monsterz-0.7.1-numpy2.patch
@@ -0,0 +1,32 @@
+From ba17939f0af90905a90dce96f4540e273a744bdb Mon Sep 17 00:00:00 2001
+From: Oscar Lesta <oscar.lesta@gmail.com>
+Date: Wed, 25 Dec 2024 21:33:16 -0300
+Subject: Fix compatibility with numpy 2.2.1.
+--- a/monsterz.py
++++ b/monsterz.py
+@@ -117,6 +117,10 @@
+ for x, p in enumerate(line):
+ r, g, b = p
+- M = int(max(r, g, b))
+- m = int(min(r, g, b))
++ # convert from numpy.int8 to int
++ r = r.item()
++ g = g.item()
++ b = b.item()
++ M = max(r, g, b)
++ m = min(r, g, b)
+ val = (2 * M + r + g + b) // 5
+ p[0] = (val + r) // 2
+@@ -141,6 +145,10 @@
+ for x, p in enumerate(line):
+ r, g, b = p
+- M = int(max(r, g, b))
+- m = int(min(r, g, b))
++ # convert from numpy.int8 to int
++ r = r.item()
++ g = g.item()
++ b = b.item()
++ M = max(r, g, b)
++ m = min(r, g, b)
+ p[0] = (m + r) // 2
+ p[1] = (m + g) // 2
diff --git a/games-puzzle/monsterz/monsterz-0.7.1_p12.ebuild b/games-puzzle/monsterz/monsterz-0.7.1_p12-r1.ebuild
similarity index 93%
rename from games-puzzle/monsterz/monsterz-0.7.1_p12.ebuild
rename to games-puzzle/monsterz/monsterz-0.7.1_p12-r1.ebuild
index c39a29488956..0039d4304165 100644
--- a/games-puzzle/monsterz/monsterz-0.7.1_p12.ebuild
+++ b/games-puzzle/monsterz/monsterz-0.7.1_p12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -29,6 +29,7 @@ BDEPEND="${PYTHON_DEPS}"
PATCHES=(
"${WORKDIR}"/debian/patches
+ "${FILESDIR}"/${PN}-0.7.1-numpy2.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-04-16 11:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-25 19:30 [gentoo-commits] repo/gentoo:master commit in: games-puzzle/monsterz/, games-puzzle/monsterz/files/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2021-11-14 0:45 Ionen Wolkens
2025-04-16 10:59 Ionen Wolkens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox