From ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 29 Feb 2020 18:01:47 +0000 Subject: gentoo (leap year) resync : 29.02.2020 --- games-simulation/lincity/Manifest | 3 +- .../lincity/files/lincity-1.13.1-gcc-10.patch | 48 ++++++++++++++++++++++ games-simulation/lincity/lincity-1.13.1-r1.ebuild | 3 +- 3 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 games-simulation/lincity/files/lincity-1.13.1-gcc-10.patch (limited to 'games-simulation/lincity') diff --git a/games-simulation/lincity/Manifest b/games-simulation/lincity/Manifest index e8bd15ae11b5..539a3b531e2f 100644 --- a/games-simulation/lincity/Manifest +++ b/games-simulation/lincity/Manifest @@ -1,4 +1,5 @@ AUX lincity-1.13.1-build.patch 2196 BLAKE2B 871577b9ac4b2536b9d46c094c6bd3492eb8e46188f2fc7d8efafa84d6e76914e60a579e30b1294e56daa96f8ab4a2b0247c0ddb5d0ce7d6d9e2180a7b0306cf SHA512 c0590673e7f04e16ffb6c9a25ce0f00d25dcaf689908117647e00989ed6db3a2c5d1db63abeb23e5c9a0f0999219515a53994ed4400f2712a8dea5b6eca5a8b3 +AUX lincity-1.13.1-gcc-10.patch 1552 BLAKE2B 7ead7d4f4ff699f20d4c06b3ac14cfae1ae234ba8f03ad7c9188fab3e38626c85767196f3dd1de7368b140d941c14485a77045a2f7775ea07bcdd00a5dccdd16 SHA512 c80aaa9b3d39fd7661c8b7d24f7e38e34389ba82520073ef6e24e6eaf8cd0e2394ade05f7fcc98d5b5597d2878b5465856fda509669871cf80ff2ac06d4734bb DIST lincity-1.13.1.tar.gz 1064236 BLAKE2B 1172ced3255048f3132f85cd9ae994c7e0558170f7e7a24909af1856669c4ad90d57acd76f330fb556656ed74843dda159005350760fc059c6b184cedf1e9393 SHA512 bc4ee7a1642b1efa25f9edaabd3aeb52d1ca1d016735c5094586f52fda3ec4e9080ff35fe518c1ccbfad9fd54babb370f4b9b6a158b4d2f43b7182155084eefc -EBUILD lincity-1.13.1-r1.ebuild 946 BLAKE2B f1592d817a747fc1283eaa77e6ce82f452b8949f1292a6c4c28159cf5ff8c40d4234e4dd1abf3c1b9152e12f084fb4dfdb2cf9fde3649130673af7b616b83129 SHA512 7a47b905d33c64cfd627af661a66ab3224e4c508e9857bc6cf054621097089eb3d7d21c138a83786f038ce860e3c4fc4a1d7dd131200fdc4886c530d7ccf6aeb +EBUILD lincity-1.13.1-r1.ebuild 976 BLAKE2B a8869f6a34959af3e537a327f186ed70c95d6d19d348e0ca0653337132cc27b64bb98e1399f8186d4735482825f04e7734852e307238e21a3bcf16f18bc8848e SHA512 bdcc7d91ed2c73fabea88eeb695c3f74b763119b91e2d1013794f276ceb84d3366c596d1627d9397279040d1bac22fc04d078ea2b0ca4073637322dec6a4c7e6 MISC metadata.xml 330 BLAKE2B 27e534512b77895bcfea8da8f49e1fa4ce2c9a8df47cf0ce813a8a88893b3c69c03d25083412d22bea3d2d73dfe2baa6a26292b983409c28d6c40bd70e222f6f SHA512 c36fecc06a5c84b3a93dfd25ffeb05bb14a5a96676eb1d7e976903ef7892a10c22ee7afa894c581c0bc3079ce2e30574143cc6b49195b346463c48f3e34ff1c0 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() { -- cgit v1.2.3