diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2020-02-26 09:21:56 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2020-02-26 09:22:10 +0000 |
| commit | 8edf247202490c028bce701f26b52e39f996c287 (patch) | |
| tree | f90d77d5a18e2d48e61e6390b298dc76f0252e0e /games-simulation | |
| parent | net-ftp/filezilla: Bump to version 3.47.1. Removed old (diff) | |
| download | gentoo-8edf247202490c028bce701f26b52e39f996c287.tar.gz gentoo-8edf247202490c028bce701f26b52e39f996c287.tar.bz2 gentoo-8edf247202490c028bce701f26b52e39f996c287.zip | |
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@gentoo.org>
Diffstat (limited to 'games-simulation')
| -rw-r--r-- | games-simulation/lincity/files/lincity-1.13.1-gcc-10.patch | 48 | ||||
| -rw-r--r-- | games-simulation/lincity/lincity-1.13.1-r1.ebuild | 3 |
2 files changed, 50 insertions, 1 deletions
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 000000000000..77f3a41dcf6c --- /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 02968c06f2ed..6479c984045d 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() { |