public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/lincity/, games-simulation/lincity/files/
@ 2015-12-16 18:39 Michael Sterrett
  0 siblings, 0 replies; 4+ messages in thread
From: Michael Sterrett @ 2015-12-16 18:39 UTC (permalink / raw
  To: gentoo-commits

commit:     e36cc21373627399a512717a80b9f4b6296acce3
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 16 18:39:16 2015 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 18:39:16 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e36cc213

fix building with gcc5 (bug #568406)

Package-Manager: portage-2.2.24

 .../lincity/files/lincity-1.13.1-build.patch       | 74 ++++++++++++++++++++++
 games-simulation/lincity/lincity-1.13.1.ebuild     | 10 +--
 2 files changed, 77 insertions(+), 7 deletions(-)

diff --git a/games-simulation/lincity/files/lincity-1.13.1-build.patch b/games-simulation/lincity/files/lincity-1.13.1-build.patch
new file mode 100644
index 0000000..f7f41f9
--- /dev/null
+++ b/games-simulation/lincity/files/lincity-1.13.1-build.patch
@@ -0,0 +1,74 @@
+--- lincity-1.13.1.orig/intl/Makefile.in
++++ lincity-1.13.1/intl/Makefile.in
+@@ -32,7 +32,7 @@
+ libdir = @libdir@
+ includedir = @includedir@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = /usr/share/locale
+ gettextsrcdir = $(datadir)/gettext/intl
+ aliaspath = $(localedir)
+ subdir = intl
+--- lincity-1.13.1.orig/mouse.c
++++ lincity-1.13.1/mouse.c
+@@ -1057,7 +1057,7 @@
+    and set to 1 if the existing transport if the more expensive sort
+    (e.g. GROUP_RAIL when overwriting GROUP_ROAD).
+ */
+-inline int
++int
+ mt_erase(int x, int y)
+ {
+     if (x < 0 || y < 0 || x >= WORLD_SIDE_LEN || y >= WORLD_SIDE_LEN)
+--- lincity-1.13.1.orig/pixmap.c
++++ lincity-1.13.1/pixmap.c
+@@ -390,7 +390,7 @@
+ 		  likes it in the file.  Still need to fix this in autoconf,
+                   but for now this will do. */
+ #if !defined (WIN32)
+-inline int 
++int 
+ pixmap_index (int x, int y)
+ {
+     return y*pixmap_width + x;
+--- lincity-1.13.1.orig/pixmap.h
++++ lincity-1.13.1/pixmap.h
+@@ -19,7 +19,7 @@
+ void initialize_pixmap (void);
+ void resize_pixmap (int new_width, int new_height);
+ int pixmap_getpixel (int x, int y);
+-inline int pixmap_index (int x, int y);
++int pixmap_index (int x, int y);
+ int pixmap_getpixel (int x, int y);
+ void pixmap_setpixel (int x, int y, int col);
+ void pixmap_hline (int x1, int y1, int x2, int col);
+@@ -33,7 +33,7 @@
+  * Public Inline Functions
+  * ---------------------------------------------------------------------- */
+ #if defined (WIN32)
+-inline int 
++int 
+ pixmap_index (int x, int y) {
+     return y*pixmap_width + x;
+ }
+--- lincity-1.13.1.orig/po/Makefile.in.in
++++ lincity-1.13.1/po/Makefile.in.in
+@@ -21,7 +21,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = /usr/share/locale
+ gettextsrcdir = $(datadir)/gettext/po
+ 
+ INSTALL = @INSTALL@
+--- lincity-1.13.1.orig/readpng.c
++++ lincity-1.13.1/readpng.c
+@@ -3,6 +3,7 @@
+  * This file is part of lincity (see COPYRIGHT for copyright information).
+  * ---------------------------------------------------------------------- */
+ #include <stdlib.h>
++#include <string.h>
+ #include "png.h"
+ #include "malloc.h"
+ #include "lin-city.h"

diff --git a/games-simulation/lincity/lincity-1.13.1.ebuild b/games-simulation/lincity/lincity-1.13.1.ebuild
index 81e0bf2..cbbe57f 100644
--- a/games-simulation/lincity/lincity-1.13.1.ebuild
+++ b/games-simulation/lincity/lincity-1.13.1.ebuild
@@ -23,17 +23,13 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_prepare() {
-	sed -i \
-		-e '/^localedir/s:$(datadir):/usr/share:' \
-		po/Makefile.in.in \
-		intl/Makefile.in \
-		|| die 'sed failed'
+	epatch "${FILESDIR}"/${P}-build.patch
 }
 
 src_configure() {
 	egamesconf \
-		--with-gzip \
 		$(use_enable nls) \
+		--with-gzip \
 		--with-x
 }
 
@@ -44,7 +40,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 	dodoc Acknowledgements CHANGES README* TODO
 	make_desktop_entry xlincity Lincity
 	dogamesbin xlincity


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-simulation/lincity/, games-simulation/lincity/files/
@ 2020-02-26  9:22 Sergei Trofimovich
  0 siblings, 0 replies; 4+ messages in thread
From: Sergei Trofimovich @ 2020-02-26  9:22 UTC (permalink / raw
  To: gentoo-commits

commit:     8edf247202490c028bce701f26b52e39f996c287
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 09:21:56 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 09:22:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8edf2472

games-simulation/lincity: tweak for gcc-10, bug #706394

Closes: https://bugs.gentoo.org/706394
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 .../lincity/files/lincity-1.13.1-gcc-10.patch      | 48 ++++++++++++++++++++++
 games-simulation/lincity/lincity-1.13.1-r1.ebuild  |  3 +-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/games-simulation/lincity/files/lincity-1.13.1-gcc-10.patch b/games-simulation/lincity/files/lincity-1.13.1-gcc-10.patch
new file mode 100644
index 00000000000..77f3a41dcf6
--- /dev/null
+++ b/games-simulation/lincity/files/lincity-1.13.1-gcc-10.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/706394
+
+--- lincity-1.13.1/fileutil.c	2004-07-03 08:26:33.000000000 -0000
++++ lincity-1.13.1/fileutil.c	2020-02-26 09:16:31.406614385 -0000
+@@ -105,7 +105,7 @@
+  * ---------------------------------------------------------------------- */
+ char LIBDIR[LC_PATH_MAX];
+ 
+-char *lc_save_dir;
++extern char *lc_save_dir;
+ int lc_save_dir_len;
+ static char *lc_temp_filename;
+ 
+--- lincity-1.13.1/ldsvguts.c	2003-10-10 04:11:29.000000000 -0000
++++ lincity-1.13.1/ldsvguts.c	2020-02-26 09:17:22.410992011 -0000
+@@ -91,8 +91,6 @@
+  * Private Global Variables
+  * ---------------------------------------------------------------------- */
+ 
+-char save_names[10][42];
+-
+ /* ---------------------------------------------------------------------- *
+  * Public functions
+  * ---------------------------------------------------------------------- */
+--- lincity-1.13.1/main.c	2004-07-03 07:59:05.000000000 -0000
++++ lincity-1.13.1/main.c	2020-02-26 09:17:04.222857373 -0000
+@@ -96,9 +96,8 @@
+ #endif
+ #endif
+ 
+-char *lc_save_dir;
++extern char *lc_save_dir;
+ char *lc_temp_file;
+-char save_names[10][42];
+ 
+ #ifdef CS_PROFILE
+ int prof_countdown = PROFILE_COUNTDOWN;
+--- lincity-1.13.1/screen.h	2004-06-22 13:24:19.000000000 -0000
++++ lincity-1.13.1/screen.h	2020-02-26 09:14:31.473725606 -0000
+@@ -20,7 +20,7 @@
+ extern unsigned char start_font2[4096];
+ extern unsigned char start_font3[4096];
+ 
+-int monthgraph_style;
++extern int monthgraph_style;
+ 
+ /* This is on in screen_full_refresh, used in *_refresh() */
+ extern char screen_refreshing;

diff --git a/games-simulation/lincity/lincity-1.13.1-r1.ebuild b/games-simulation/lincity/lincity-1.13.1-r1.ebuild
index 02968c06f2e..6479c984045 100644
--- a/games-simulation/lincity/lincity-1.13.1-r1.ebuild
+++ b/games-simulation/lincity/lincity-1.13.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-simulation/lincity/, games-simulation/lincity/files/
@ 2021-08-02  9:16 Ionen Wolkens
  0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2021-08-02  9:16 UTC (permalink / raw
  To: gentoo-commits

commit:     f34e54ba63130f9366ea71a71e9a8101fd81a5d1
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  2 05:57:37 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Aug  2 09:16:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f34e54ba

games-simulation/lincity: EAPI6->8, fix prefix, add icon

* Strip part of the patch that was formerly intended for
  games.eclass but now only broke prefix
* Update DESCRIPTION to reflect svgalib isn't supported
* Remove not-really-used libSM dependency
* Use xlincity.6 man page name to match installed binary

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-simulation/lincity/Manifest                  |  1 +
 .../lincity/files/lincity-1.13.1-build.patch       | 38 +++----------
 games-simulation/lincity/lincity-1.13.1-r1.ebuild  | 53 ------------------
 games-simulation/lincity/lincity-1.13.1-r2.ebuild  | 62 ++++++++++++++++++++++
 4 files changed, 71 insertions(+), 83 deletions(-)

diff --git a/games-simulation/lincity/Manifest b/games-simulation/lincity/Manifest
index fa6ff8bbf78..af8bf31433f 100644
--- a/games-simulation/lincity/Manifest
+++ b/games-simulation/lincity/Manifest
@@ -1 +1,2 @@
 DIST lincity-1.13.1.tar.gz 1064236 BLAKE2B 1172ced3255048f3132f85cd9ae994c7e0558170f7e7a24909af1856669c4ad90d57acd76f330fb556656ed74843dda159005350760fc059c6b184cedf1e9393 SHA512 bc4ee7a1642b1efa25f9edaabd3aeb52d1ca1d016735c5094586f52fda3ec4e9080ff35fe518c1ccbfad9fd54babb370f4b9b6a158b4d2f43b7182155084eefc
+DIST lincity.png 5377 BLAKE2B 2238140719a8c1b094fbe6d7b52b9224245f2c36f970e04aa3fcaf6090409145f17dad2c2a83f6528e695fd9d26d9c053c45978502b7e44f73cf25719d7ed3aa SHA512 40a8955fdc8397662ef0d084163e7dcad59e278429792bd7096e193a0d04791c2355a0dbd2c1f72a032bbfc71bc4e27e37a3d0d4e82de8e7170bb70205d983a3

diff --git a/games-simulation/lincity/files/lincity-1.13.1-build.patch b/games-simulation/lincity/files/lincity-1.13.1-build.patch
index f7f41f954ba..a5244b5387f 100644
--- a/games-simulation/lincity/files/lincity-1.13.1-build.patch
+++ b/games-simulation/lincity/files/lincity-1.13.1-build.patch
@@ -1,16 +1,5 @@
---- lincity-1.13.1.orig/intl/Makefile.in
-+++ lincity-1.13.1/intl/Makefile.in
-@@ -32,7 +32,7 @@
- libdir = @libdir@
- includedir = @includedir@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = /usr/share/locale
- gettextsrcdir = $(datadir)/gettext/intl
- aliaspath = $(localedir)
- subdir = intl
---- lincity-1.13.1.orig/mouse.c
-+++ lincity-1.13.1/mouse.c
+--- a/mouse.c
++++ b/mouse.c
 @@ -1057,7 +1057,7 @@
     and set to 1 if the existing transport if the more expensive sort
     (e.g. GROUP_RAIL when overwriting GROUP_ROAD).
@@ -20,8 +9,8 @@
  mt_erase(int x, int y)
  {
      if (x < 0 || y < 0 || x >= WORLD_SIDE_LEN || y >= WORLD_SIDE_LEN)
---- lincity-1.13.1.orig/pixmap.c
-+++ lincity-1.13.1/pixmap.c
+--- a/pixmap.c
++++ b/pixmap.c
 @@ -390,7 +390,7 @@
  		  likes it in the file.  Still need to fix this in autoconf,
                    but for now this will do. */
@@ -31,8 +20,8 @@
  pixmap_index (int x, int y)
  {
      return y*pixmap_width + x;
---- lincity-1.13.1.orig/pixmap.h
-+++ lincity-1.13.1/pixmap.h
+--- a/pixmap.h
++++ b/pixmap.h
 @@ -19,7 +19,7 @@
  void initialize_pixmap (void);
  void resize_pixmap (int new_width, int new_height);
@@ -51,19 +40,8 @@
  pixmap_index (int x, int y) {
      return y*pixmap_width + x;
  }
---- lincity-1.13.1.orig/po/Makefile.in.in
-+++ lincity-1.13.1/po/Makefile.in.in
-@@ -21,7 +21,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = /usr/share/locale
- gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
---- lincity-1.13.1.orig/readpng.c
-+++ lincity-1.13.1/readpng.c
+--- a/readpng.c
++++ b/readpng.c
 @@ -3,6 +3,7 @@
   * This file is part of lincity (see COPYRIGHT for copyright information).
   * ---------------------------------------------------------------------- */

diff --git a/games-simulation/lincity/lincity-1.13.1-r1.ebuild b/games-simulation/lincity/lincity-1.13.1-r1.ebuild
deleted file mode 100644
index 6479c984045..00000000000
--- a/games-simulation/lincity/lincity-1.13.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic
-
-DESCRIPTION="city/country simulation game for X and Linux SVGALib"
-HOMEPAGE="http://lincity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/lincity/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-# dep fix (bug #82318)
-RDEPEND="media-libs/libpng:0
-	x11-libs/libSM
-	x11-libs/libXext
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-	"${FILESDIR}"/${P}-gcc-10.patch
-)
-
-src_prepare() {
-	default
-
-	append-cflags -std=gnu89 # build with gcc5 (bug #570574)
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--with-gzip \
-		--with-x
-}
-
-src_compile() {
-	# build system logic is severely broken
-	emake
-	emake X_PROGS
-}
-
-src_install() {
-	default
-	dodoc Acknowledgements CHANGES README* TODO
-	make_desktop_entry xlincity Lincity
-	dobin xlincity
-}

diff --git a/games-simulation/lincity/lincity-1.13.1-r2.ebuild b/games-simulation/lincity/lincity-1.13.1-r2.ebuild
new file mode 100644
index 00000000000..f1cec025ba8
--- /dev/null
+++ b/games-simulation/lincity/lincity-1.13.1-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop flag-o-matic
+
+DESCRIPTION="City simulation game for X"
+HOMEPAGE="http://lincity.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/lincity/${P}.tar.gz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libpng:=
+	virtual/libintl
+	x11-libs/libXext"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
+)
+
+src_configure() {
+	append-cflags -std=gnu89 # build with gcc5 (bug #570574)
+
+	local econfargs=(
+		--with-gzip
+		--with-x
+		--without-svga
+		ac_cv_lib_ICE_IceConnectionNumber=no # not actually used
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_compile() {
+	emake
+	emake X_PROGS
+}
+
+src_install() {
+	default
+
+	dobin x${PN}
+
+	newman {,x}${PN}.6
+	rm "${ED}"/usr/share/man/man6/${PN}.6
+
+	dodoc Acknowledgements
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry x${PN} ${PN^}
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-simulation/lincity/, games-simulation/lincity/files/
@ 2022-10-23 14:27 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-10-23 14:27 UTC (permalink / raw
  To: gentoo-commits

commit:     235cd3184b4b6acdff7f06b47cbc91e56131c2bc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 23 12:58:33 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 23 14:27:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=235cd318

games-simulation/lincity: fix build w/ Clang 16

Closes: https://bugs.gentoo.org/874723
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...otypes-and-implicit-function-declarations.patch | 270 +++++++++++++++++++++
 ...y-1.13.1-r2.ebuild => lincity-1.13.1-r3.ebuild} |   3 +-
 2 files changed, 272 insertions(+), 1 deletion(-)

diff --git a/games-simulation/lincity/files/lincity-1.13.1-Fix-prototypes-and-implicit-function-declarations.patch b/games-simulation/lincity/files/lincity-1.13.1-Fix-prototypes-and-implicit-function-declarations.patch
new file mode 100644
index 000000000000..98d8d8750fcb
--- /dev/null
+++ b/games-simulation/lincity/files/lincity-1.13.1-Fix-prototypes-and-implicit-function-declarations.patch
@@ -0,0 +1,270 @@
+From 91953cf63f9e0a20ea37d7fc4780ee3c5d9fd917 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 23 Oct 2022 13:47:33 +0100
+Subject: [PATCH] Fix prototypes and implicit function declarations
+
+Bug: https://bugs.gentoo.org/874723
+---
+ dialbox.h        | 2 +-
+ engine.c         | 2 +-
+ fileutil.c       | 1 +
+ ldsvgui.c        | 2 +-
+ module_buttons.c | 2 +-
+ mouse.c          | 6 ++++--
+ mouse.h          | 2 +-
+ mps.c            | 2 +-
+ mps.h            | 2 +-
+ pbar.c           | 4 ++--
+ pixmap.c         | 2 +-
+ power.c          | 4 ++--
+ power.h          | 2 +-
+ screen.c         | 8 ++++----
+ 14 files changed, 22 insertions(+), 19 deletions(-)
+
+diff --git a/dialbox.h b/dialbox.h
+index 1e4f21b..0d3fa76 100644
+--- a/dialbox.h
++++ b/dialbox.h
+@@ -22,7 +22,7 @@ typedef struct dialog_box_struct Dialog_Box;
+ 
+ /* Public functions */
+ int dialog_box(int colour, int argc, ...); 
+-void dialog_refresh();
++void dialog_refresh(void);
+ void dialog_close(int return_value);
+ 
+ #define MAX_DBOX_ENTRIES 64 /* Huge, but necessary for current use */
+diff --git a/engine.c b/engine.c
+index 7c088f3..03b3998 100644
+--- a/engine.c
++++ b/engine.c
+@@ -470,7 +470,7 @@ sell_steel (int xt, int yt)
+ }
+ 
+ void
+-do_pollution ()
++do_pollution (void)
+ {
+   int x, p;
+   int* pol = &map.pollution[0][0];
+diff --git a/fileutil.c b/fileutil.c
+index 2fd6f3d..b4bf244 100644
+--- a/fileutil.c
++++ b/fileutil.c
+@@ -9,6 +9,7 @@
+ #include <stdarg.h> /* XXX: GCS FIX: What does configure need to know? */
+ #include "lcintl.h"
+ #include "lcstring.h"
++#include "lcsvga.h"
+ #include "ldsvgui.h"
+ 
+ /* XXX: Where are SVGA specific includes? */
+diff --git a/ldsvgui.c b/ldsvgui.c
+index a9c8126..f783e60 100644
+--- a/ldsvgui.c
++++ b/ldsvgui.c
+@@ -277,7 +277,7 @@ do_network_screen (void)
+ #endif
+ 
+ void
+-do_save_city ()
++do_save_city (void)
+ {
+     Rect* mw = &scr.main_win;
+     char s[200], c;
+diff --git a/module_buttons.c b/module_buttons.c
+index 1bf77cd..51c746d 100644
+--- a/module_buttons.c
++++ b/module_buttons.c
+@@ -465,7 +465,7 @@ unhighlight_module_button (int module)
+ /* draw_selected_module_cost: write info about the module to the status area */
+ 
+ void
+-draw_selected_module_cost ()
++draw_selected_module_cost (void)
+ {
+     Rect* b = &scr.select_message;
+     char s[100];
+diff --git a/mouse.c b/mouse.c
+index aaba144..85ca571 100644
+--- a/mouse.c
++++ b/mouse.c
+@@ -46,6 +46,8 @@ static Mouse_Handle * mhandle_first;
+ static Mouse_Handle * mhandle_last;
+ static Mouse_Handle * mhandle_current;
+ 
++int mode(int x, int y);
++
+ /* ---------------------------------------------------------------------- *
+  * cs_mouse_handler
+  * --
+@@ -1152,7 +1154,7 @@ mt_perm(int x, int y)
+ }
+ 
+ int
+-do_mt_draw (int x1, int x2, int y1, int y2, int (*mode)())
++do_mt_draw (int x1, int x2, int y1, int y2, int (*mode)(int x, int y))
+ {
+     int dir = 1;
+     int horiz = 1;
+@@ -1321,7 +1323,7 @@ cmp(int n1, int n2)
+ }
+ 
+ void
+-init_mouse_registry()
++init_mouse_registry(void)
+ {
+     mhandle_first = NULL;
+     mhandle_last = NULL;
+diff --git a/mouse.h b/mouse.h
+index b31721b..0d87072 100644
+--- a/mouse.h
++++ b/mouse.h
+@@ -48,7 +48,7 @@ struct mouse_button_struct {
+ /* Public functions */
+ 
+ void mouse_setup (void);
+-void init_mouse_registry();
++void init_mouse_registry(void);
+ int mouse_handle_click(int x, int y, int button); 
+ 
+ Mouse_Handle * mouse_register(Rect * r, void (*handler)(int, int, int));
+diff --git a/mps.c b/mps.c
+index 3b82f1e..79f787b 100644
+--- a/mps.c
++++ b/mps.c
+@@ -61,7 +61,7 @@ mps_handler(int x, int y, int button)
+ /* mps_init(): Initialize mps vars and mouse handles */
+ 
+ void
+-mps_init() 
++mps_init(void)
+ {
+     mps_style = MPS_GLOBAL;
+     mps_global_style = MPS_GLOBAL_FINANCE;
+diff --git a/mps.h b/mps.h
+index 49991be..98c37c1 100644
+--- a/mps.h
++++ b/mps.h
+@@ -27,7 +27,7 @@ void mappoint_stats (int, int, int);
+ 
+ #define MPS_INFO_CHARS (MAPPOINT_STATS_W / 8) + 1
+ 
+-void mps_init();
++void mps_init(void);
+ 
+ int mps_set(int style, int x, int y); /* Attaches an area or global display */
+ void mps_redraw(void);  /* Re-draw the mps area, bezel and all */
+diff --git a/pbar.c b/pbar.c
+index 0d518d1..41ec319 100644
+--- a/pbar.c
++++ b/pbar.c
+@@ -241,7 +241,7 @@ update_pbar (int pbar_num, int value, int month_flag)
+ }
+ 
+ void
+-update_pbars_daily()
++update_pbars_daily(void)
+ {
+     update_pbar (PPOP, housed_population + people_pool, 0);
+     update_pbar (PTECH, tech_level, 0);
+@@ -255,7 +255,7 @@ update_pbars_daily()
+ }
+ 
+ void
+-update_pbars_monthly()
++update_pbars_monthly(void)
+ {
+     update_pbar (PPOP, housed_population + people_pool, 1);
+     update_pbar (PTECH, tech_level, 1);
+diff --git a/pixmap.c b/pixmap.c
+index a1f1b68..b6806d3 100644
+--- a/pixmap.c
++++ b/pixmap.c
+@@ -43,7 +43,7 @@ int pixmap_width = 0;
+  * ---------------------------------------------------------------------- */
+ #ifdef USE_PIXMAPS
+ void
+-init_pixmaps ()
++init_pixmaps (void)
+ {
+     int i;
+     for (i = 1; i < NUM_OF_TYPES; i++) {
+diff --git a/power.c b/power.c
+index b428489..8392676 100644
+--- a/power.c
++++ b/power.c
+@@ -34,7 +34,7 @@ Grid * grid[MAX_GRIDS];
+    first-served basis.
+ */
+ void
+-power_time_step () 
++power_time_step (void)
+ {
+     int gi;
+     int net; /* net power */
+@@ -65,7 +65,7 @@ power_time_step ()
+ 
+ 
+ void 
+-map_power_grid ()
++map_power_grid (void)
+ {
+     int mapx, mapy;
+     grid_num = 0;  /* how many grids found so far */
+diff --git a/power.h b/power.h
+index 8aeecdc..020bff7 100644
+--- a/power.h
++++ b/power.h
+@@ -25,7 +25,7 @@ void do_power_substation(int x, int y);
+ void do_power_source(int x, int y);
+ void do_power_source_coal(int x, int y);
+ void do_power_line(int x, int y);
+-void power_time_step ();
++void power_time_step (void);
+ 
+ /* intended private */
+ void recurse_power_grid (int startx, int starty, int steps);
+diff --git a/screen.c b/screen.c
+index 73e60a7..03eeae6 100644
+--- a/screen.c
++++ b/screen.c
+@@ -72,7 +72,7 @@ static void do_history_linegraph (int draw);
+ static void do_sust_barchart (int draw);
+ static void draw_sustline (int yoffset, int count, int max, int col);
+ void monthgraph_full_refresh (void);
+-void draw_mini_pol_in_main_win ();
++void draw_mini_pol_in_main_win (void);
+ void mini_full_refresh (void);
+ void update_main_screen_normal (int full_refresh);
+ void update_main_screen_pollution (void);
+@@ -124,7 +124,7 @@ refresh_main_screen (void)
+ }
+ 
+ void 
+-clip_main_window ()
++clip_main_window (void)
+ {
+     Rect* b = &scr.main_win;
+     Fgl_enableclipping ();
+@@ -132,7 +132,7 @@ clip_main_window ()
+ }
+ 
+ void 
+-unclip_main_window ()
++unclip_main_window (void)
+ {
+     Fgl_disableclipping ();
+ }
+@@ -789,7 +789,7 @@ draw_small_yellow_bezel (int x, int y, int h, int w)
+ }
+ 
+ void
+-load_fonts()
++load_fonts(void)
+ {
+     char s[LC_PATH_MAX];
+     int i;
+-- 
+2.38.1
+

diff --git a/games-simulation/lincity/lincity-1.13.1-r2.ebuild b/games-simulation/lincity/lincity-1.13.1-r3.ebuild
similarity index 89%
rename from games-simulation/lincity/lincity-1.13.1-r2.ebuild
rename to games-simulation/lincity/lincity-1.13.1-r3.ebuild
index c67386702def..c80cf4adcb21 100644
--- a/games-simulation/lincity/lincity-1.13.1-r2.ebuild
+++ b/games-simulation/lincity/lincity-1.13.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,6 +27,7 @@ BDEPEND="sys-devel/gettext"
 PATCHES=(
 	"${FILESDIR}"/${P}-build.patch
 	"${FILESDIR}"/${P}-gcc-10.patch
+	"${FILESDIR}"/${P}-Fix-prototypes-and-implicit-function-declarations.patch
 )
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-10-23 14:27 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-26  9:22 [gentoo-commits] repo/gentoo:master commit in: games-simulation/lincity/, games-simulation/lincity/files/ Sergei Trofimovich
  -- strict thread matches above, loose matches on Subject: below --
2022-10-23 14:27 Sam James
2021-08-02  9:16 Ionen Wolkens
2015-12-16 18:39 Michael Sterrett

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox