[gentoo-commits] repo/gentoo:master commit in: games-simulation/micropolis/files/, games-simulation/micropolis/
commit: 467c208fc96e7a3455aa85b97c49148a357c7602
Author: Hanno Böck gentoo org>
AuthorDate: Sun Mar 10 13:41:17 2024 +
Commit: Hanno Böck gentoo org>
CommitDate: Sun Mar 10 13:41:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=467c208f
games-simulation/micropolis: add 1.0_p20220604
Latest upstream git snapshot.
Fix errors with modern clang.
Disable parallel make.
Closes: https://bugs.gentoo.org/794754
Closes: https://bugs.gentoo.org/884345
Signed-off-by: Hanno Böck gentoo.org>
games-simulation/micropolis/Manifest | 1 +
.../micropolis/files/micropolis-fix-clang15.diff | 104 +
.../micropolis/micropolis-1.0_p20220604.ebuild | 57 +++
3 files changed, 162 insertions(+)
diff --git a/games-simulation/micropolis/Manifest
b/games-simulation/micropolis/Manifest
index cc2239cc731b..ce05ccaf3db0 100644
--- a/games-simulation/micropolis/Manifest
+++ b/games-simulation/micropolis/Manifest
@@ -1 +1,2 @@
+DIST micropolis-6f873e16d6a1a8f6f59c1e5a75ec5f52ce5c89b6.tar.bz2 6725237
BLAKE2B
0ab99ecc3e418f6df3e35aacfd99c1077aeab877ab446d788b42c8ebc95a704e37ba3cdf8fa2d1a54ad182da08f18a15dfc6baeacdf5a6216054fe6b5a162b37
SHA512
ae399d530b9ddbf5da76d6b6b2bec9b9156e0941e7106cc5b393f4758891fdce4b6b5e25fbf0ecddc4d02f346a4b03bfe9bf91e60bea7d667c1005df9f53b5db
DIST micropolis-cc31822e4ebe54c0109623ac0c5cdf0e3acad755.tar.bz2 6725746
BLAKE2B
a916389a1ccf63e1a13b5b6ea533939fdb14d814480c9e528c8b1bb89cbefbbad9ad067821c1de199f337692e226d35b3219354dc32612486d013cc20f21c5bc
SHA512
1b5f644f6d7d7cb78965d0e0edcfcc0bdab7a103dd5dc3ce97a0048da9fa29d8757063d6681febab3d03182433cfe8a7bf1b8145a21e067a4c754af3b5af8e00
diff --git a/games-simulation/micropolis/files/micropolis-fix-clang15.diff
b/games-simulation/micropolis/files/micropolis-fix-clang15.diff
new file mode 100644
index ..20454a844162
--- /dev/null
+++ b/games-simulation/micropolis/files/micropolis-fix-clang15.diff
@@ -0,0 +1,104 @@
+diff --git a/src/tclx/src/tclxgdat.y b/src/tclx/src/tclxgdat.y
+index
aea9f3d49ced8818421c6aca538df0f1a08b17b3..2439a2fc8cfd4a90be7f51216ed4bae1b9feb7e2
100644
+--- a/src/tclx/src/tclxgdat.y
b/src/tclx/src/tclxgdat.y
+@@ -46,11 +46,11 @@
+ #if 0
+ static time_t timeconv(int hh, int mm, int ss, int mer);
+ static time_t daylcorr(time_t future, time_t now);
+- static lookup(char *id);
++ static int lookup(char *id);
+ #else
+ static time_t timeconv();
+ static time_t daylcorr();
+- static lookup();
++ static int lookup();
+ #endif
+
+ #define AM 1
+@@ -463,7 +463,7 @@ struct table milzone[] = {
+ {0, 0, 0}};
+
+ static
+-lookup(id) char *id;
++int lookup(id) char *id;
+ {
+ #define gotit (yylval=i->value, i->type)
+ #define getid for(j=idvar, k=id; *j++ = *k++; )
+diff --git a/src/tclx/src/tclxmath.c b/src/tclx/src/tclxmath.c
+index
9f967bf4f2402c7f61f0f2b8f03ef835c7ceb70d..bf5a52a76f3eca59260299096436aebaf8ba2818
100644
+--- a/src/tclx/src/tclxmath.c
b/src/tclx/src/tclxmath.c
+@@ -16,6 +16,7 @@
+
*-
+ */
+
++#include
+ #include "tclxint.h"
+
+ extern int rand();
+diff --git a/src/tk/tkbitmap.c b/src/tk/tkbitmap.c
+index
cc81cd02c477b6289a25b76909b3b46f8db212a6..c7693e84a71953b340ee3b37044ec65be6050dc7
100644
+--- a/src/tk/tkbitmap.c
b/src/tk/tkbitmap.c
+@@ -434,7 +434,7 @@ Tk_GetBitmapFromData(interp, tkwin, source, width, height)
+ Tk_Uid name = NULL; /* Initialization need only to prevent
+* compiler warning. */
+ int new;
+-static autoNumber = 0;
++static int autoNumber = 0;
+ char string[20];
+
+ if (!initialized) {
+diff --git a/src/tk/tkerror.c b/src/tk/tkerror.c
+index
a58814c4599d4a8111cdf03cf67054009c7a626f..b6fdb17c41853f9fb5dbd33274d314d5ca8a723f
100644
+--- a/src/tk/tkerror.c
b/src/tk/tkerror.c
+@@ -23,7 +23,7 @@ static char rcsid[] = "$Header:
/user6/ouster/wish/RCS/tkError.c,v 1.10 92/04/12
+ #include "tkconfig.h"
+ #include "tkint.h"
+
+-static initialized = 0;
++static int initialized = 0;
+
+ /*
+ * Forward references to procedures declared later in this file:
+diff --git a/src/tk/tkpack.c b/src/tk/tkpack.c
+index
f065bd5d20d6cfa81c4ce37104a9764a99816287..a998017fcfd308595aed170ad3915817a85ec9f7
100644
+--- a/src/tk/tkpack.c
b/src/tk/tkpack.c
+@@ -95,7 +95,7 @@ static Tcl_HashTable packerHashTable;
+ * Have statics in this module been initialized?
+ */
+
+-static initialized = 0;
++static int initialized = 0;
+
+ /*
+ * Forward declarations for procedures defined later in this file:
+diff --git a/src/tk/tkpixmap.c b/src/tk/tkpixmap.c
+index
753bbe190caa3e585b82a0757e77184f1ec68b20..8d23daded56264edd6d3dbc333014f253568592a
100644
+--- a/src/tk/tkpixmap.c
b/src/tk/tkpixmap.c
+@@ -516,7 +516,7 @@ Tk_GetPixmapFromData(interp, tkwin, source, width, height)
+
[gentoo-commits] repo/gentoo:master commit in: games-simulation/micropolis/files/, games-simulation/micropolis/
commit: fd8a908064504ccfcc9d5e3a1479af15a73df6b3
Author: James Le Cuirot gentoo org>
AuthorDate: Wed Nov 20 23:24:01 2019 +
Commit: James Le Cuirot gentoo org>
CommitDate: Wed Nov 20 23:24:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd8a9080
games-simulation/micropolis: Drop old 1.0-r2
Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: James Le Cuirot gentoo.org>
games-simulation/micropolis/Manifest | 2 -
.../micropolis/files/micropolis-glibc-2.27.patch | 45
.../files/micropolis-remove-matherr.patch | 31 ---
.../micropolis/micropolis-1.0-r2.ebuild| 61 --
4 files changed, 139 deletions(-)
diff --git a/games-simulation/micropolis/Manifest
b/games-simulation/micropolis/Manifest
index 13bae919aaa..cc2239cc731 100644
--- a/games-simulation/micropolis/Manifest
+++ b/games-simulation/micropolis/Manifest
@@ -1,3 +1 @@
-DIST micropolis-activity-source.tgz 7676438 BLAKE2B
9415cf2f1980fe5a1f412561c9a53dca86d388f9fb529801af1e6071b3c92bc03daaff84c1ac1f964578d5805a4f2a9f60cfa0c56c0a1032bc0eed686207e538
SHA512
fe65966c43d044e01a63a3cfe3cad48466eb1e5ec8b13c03abb52d582395a8ab527332d4d04454a4f32e85b65e55d72fe5e4d53a3f37b422d90e9208f00d9976
DIST micropolis-cc31822e4ebe54c0109623ac0c5cdf0e3acad755.tar.bz2 6725746
BLAKE2B
a916389a1ccf63e1a13b5b6ea533939fdb14d814480c9e528c8b1bb89cbefbbad9ad067821c1de199f337692e226d35b3219354dc32612486d013cc20f21c5bc
SHA512
1b5f644f6d7d7cb78965d0e0edcfcc0bdab7a103dd5dc3ce97a0048da9fa29d8757063d6681febab3d03182433cfe8a7bf1b8145a21e067a4c754af3b5af8e00
-DIST micropolis_git.patch 83549 BLAKE2B
13cd94f3018ffd23dcbe5c1baf0b948cac7fb9b2f858d42f259003f2697060b156b900fcc8611e560a8b46e0e68fb6ff78d376bfc937cf12b55655067fb13f6d
SHA512
9d1801478a27184c48d327094cad8238f7972c2cf3624c7c196375f2dd20c3374575b393d44cb2fb99613e19d66c4cc4fb27ae52df9fddf4e42adb42523bdc17
diff --git a/games-simulation/micropolis/files/micropolis-glibc-2.27.patch
b/games-simulation/micropolis/files/micropolis-glibc-2.27.patch
deleted file mode 100644
index ee4fd33ae87..000
--- a/games-simulation/micropolis/files/micropolis-glibc-2.27.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Markus Koschany
-Date: Tue, 13 Mar 2018 20:25:31 +0100
-Subject: glibc 2.27
-
-Remove SVID error handling to fix FTBFS with glibc 2.27.
-
-Forwarded: no
-Bug-Debian: https://bugs.debian.org/891338
- src/tclx/src/tclxfmat.c | 21 +
- 1 file changed, 1 insertion(+), 20 deletions(-)
-
-diff --git a/src/tclx/src/tclxfmat.c b/src/tclx/src/tclxfmat.c
-index 19d42c3..2146566 100644
a/src/tclx/src/tclxfmat.c
-+++ b/src/tclx/src/tclxfmat.c
-@@ -119,27 +119,8 @@ static int
- ReturnFPMathError (interp)
- Tcl_Interp *interp;
- {
--char *errorMsg;
-
--switch (G_errorType) {
-- case DOMAIN:
-- errorMsg = "domain";
-- break;
-- case SING:
-- errorMsg = "singularity";
-- break;
-- case OVERFLOW:
-- errorMsg = "overflow";
-- break;
-- case UNDERFLOW:
-- errorMsg = "underflow";
-- break;
-- case TLOSS:
-- case PLOSS:
-- errorMsg = "loss of significance";
-- break;
--}
--Tcl_AppendResult (interp, "floating point ", errorMsg, " error",
-+Tcl_AppendResult (interp, "floating point error",
- (char *) NULL);
- G_gotTclFPMathErr = FALSE; /* Clear the flag. */
- return TCL_ERROR;
diff --git a/games-simulation/micropolis/files/micropolis-remove-matherr.patch
b/games-simulation/micropolis/files/micropolis-remove-matherr.patch
deleted file mode 100644
index c6bb1a1efc5..000
--- a/games-simulation/micropolis/files/micropolis-remove-matherr.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Markus Koschany
-Date: Tue, 13 Mar 2018 21:42:31 +0100
-Subject: remove matherr
-
-Work around "tclxmerr.c:40:30: error: dereferencing pointer to incomplete type
-'struct exception'"
-
- src/tclx/src/tclxmerr.c | 9 -
- 1 file changed, 9 deletions(-)
-
-diff --git a/src/tclx/src/tclxmerr.c b/src/tclx/src/tclxmerr.c
-index dc3596b..06aad3a 100644
a/src/tclx/src/tclxmerr.c
-+++ b/src/tclx/src/tclxmerr.c
-@@ -33,15 +33,6 @@
- *
-
*-
- */
--int
--matherr (except)
--struct exception *except;
--{
--if (Tcl_MathError (except->name, except->type))
--return 1;
--else
--return 0;
--}
-
- #else
-
diff --git a/games-simulation/micropolis/micropolis-1.0-r2.ebuild
b/games-simulation/micropolis/micropolis-1.0-r2.ebuild
deleted file mode 100644
index c329f78b081..000
--- a/games-simulation/micropolis/micropolis-1.0-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit
[gentoo-commits] repo/gentoo:master commit in: games-simulation/micropolis/files/, games-simulation/micropolis/
commit: 619ceeea1e04055d825b2e9896dabc393f8ccf42
Author: Hanno gentoo org>
AuthorDate: Thu Feb 7 15:58:14 2019 +
Commit: Hanno Boeck gentoo org>
CommitDate: Thu Feb 7 15:58:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=619ceeea
games-simulation/micropolis: Fix build with glibc 2.27.
Takes two patches from Debian to make it build on modern
systems and bump EAPI to 7.
Resolves: https://bugs.gentoo.org/650198
Signed-off-by: Hanno Boeck gentoo.org>
Package-Manager: Portage-2.3.59, Repoman-2.3.12
.../micropolis/files/micropolis-glibc-2.27.patch | 45
.../files/micropolis-remove-matherr.patch | 31 +++
.../micropolis/micropolis-1.0-r2.ebuild| 61 ++
3 files changed, 137 insertions(+)
diff --git a/games-simulation/micropolis/files/micropolis-glibc-2.27.patch
b/games-simulation/micropolis/files/micropolis-glibc-2.27.patch
new file mode 100644
index 000..ee4fd33ae87
--- /dev/null
+++ b/games-simulation/micropolis/files/micropolis-glibc-2.27.patch
@@ -0,0 +1,45 @@
+From: Markus Koschany
+Date: Tue, 13 Mar 2018 20:25:31 +0100
+Subject: glibc 2.27
+
+Remove SVID error handling to fix FTBFS with glibc 2.27.
+
+Forwarded: no
+Bug-Debian: https://bugs.debian.org/891338
+---
+ src/tclx/src/tclxfmat.c | 21 +
+ 1 file changed, 1 insertion(+), 20 deletions(-)
+
+diff --git a/src/tclx/src/tclxfmat.c b/src/tclx/src/tclxfmat.c
+index 19d42c3..2146566 100644
+--- a/src/tclx/src/tclxfmat.c
b/src/tclx/src/tclxfmat.c
+@@ -119,27 +119,8 @@ static int
+ ReturnFPMathError (interp)
+ Tcl_Interp *interp;
+ {
+-char *errorMsg;
+
+-switch (G_errorType) {
+- case DOMAIN:
+- errorMsg = "domain";
+- break;
+- case SING:
+- errorMsg = "singularity";
+- break;
+- case OVERFLOW:
+- errorMsg = "overflow";
+- break;
+- case UNDERFLOW:
+- errorMsg = "underflow";
+- break;
+- case TLOSS:
+- case PLOSS:
+- errorMsg = "loss of significance";
+- break;
+-}
+-Tcl_AppendResult (interp, "floating point ", errorMsg, " error",
++Tcl_AppendResult (interp, "floating point error",
+ (char *) NULL);
+ G_gotTclFPMathErr = FALSE; /* Clear the flag. */
+ return TCL_ERROR;
diff --git a/games-simulation/micropolis/files/micropolis-remove-matherr.patch
b/games-simulation/micropolis/files/micropolis-remove-matherr.patch
new file mode 100644
index 000..c6bb1a1efc5
--- /dev/null
+++ b/games-simulation/micropolis/files/micropolis-remove-matherr.patch
@@ -0,0 +1,31 @@
+From: Markus Koschany
+Date: Tue, 13 Mar 2018 21:42:31 +0100
+Subject: remove matherr
+
+Work around "tclxmerr.c:40:30: error: dereferencing pointer to incomplete type
+'struct exception'"
+
+---
+ src/tclx/src/tclxmerr.c | 9 -
+ 1 file changed, 9 deletions(-)
+
+diff --git a/src/tclx/src/tclxmerr.c b/src/tclx/src/tclxmerr.c
+index dc3596b..06aad3a 100644
+--- a/src/tclx/src/tclxmerr.c
b/src/tclx/src/tclxmerr.c
+@@ -33,15 +33,6 @@
+ *
+
*-
+ */
+-int
+-matherr (except)
+-struct exception *except;
+-{
+-if (Tcl_MathError (except->name, except->type))
+-return 1;
+-else
+-return 0;
+-}
+
+ #else
+
diff --git a/games-simulation/micropolis/micropolis-1.0-r2.ebuild
b/games-simulation/micropolis/micropolis-1.0-r2.ebuild
new file mode 100644
index 000..abf421c4d03
--- /dev/null
+++ b/games-simulation/micropolis/micropolis-1.0-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils
+
+DESCRIPTION="Free version of the well-known city building simulation"
+HOMEPAGE="http://www.donhopkins.com/home/micropolis/;
+SRC_URI="http://www.donhopkins.com/home/micropolis/${PN}-activity-source.tgz
+ http://rmdir.de/~michael/${PN}_git.patch;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ media-libs/libsdl
+ media-libs/sdl-mixer
+ x11-libs/libX11
+ x11-libs/libXpm"
+DEPEND="${RDEPEND}
+ sys-devel/bison"
+
+S=${WORKDIR}/${PN}-activity/
+
+PATCHES=(
+ "${DISTDIR}"/${PN}_git.patch
+ "${FILESDIR}/micropolis-glibc-2.27.patch"
+ "${FILESDIR}/micropolis-remove-matherr.patch"
+)
+
+src_unpack() {
+ unpack ${PN}-activity-source.tgz
+}
+
+src_prepare() {
+ default
+
+ sed -i -e "s:-O3:${CFLAGS}:" \
+ src/tclx/config.mk src/{sim,tcl,tk}/makefile || die
+ sed -i -e "s:XLDFLAGS=:&${LDFLAGS}:" \
+ src/tclx/config.mk || die
+}
+
+src_compile() {
+ emake -C src LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ local dir=/usr/share/${PN}
+
+ exeinto "${dir}/res"
+ doexe src/sim/sim
+ insinto
