| 1 |
commit: 8edf247202490c028bce701f26b52e39f996c287 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 26 09:21:56 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 26 09:22:10 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8edf2472 |
| 7 |
|
| 8 |
games-simulation/lincity: tweak for gcc-10, bug #706394 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/706394 |
| 11 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
| 12 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 13 |
|
| 14 |
.../lincity/files/lincity-1.13.1-gcc-10.patch | 48 ++++++++++++++++++++++ |
| 15 |
games-simulation/lincity/lincity-1.13.1-r1.ebuild | 3 +- |
| 16 |
2 files changed, 50 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..77f3a41dcf6 |
| 21 |
--- /dev/null |
| 22 |
+++ b/games-simulation/lincity/files/lincity-1.13.1-gcc-10.patch |
| 23 |
@@ -0,0 +1,48 @@ |
| 24 |
+https://bugs.gentoo.org/706394 |
| 25 |
+ |
| 26 |
+--- lincity-1.13.1/fileutil.c 2004-07-03 08:26:33.000000000 -0000 |
| 27 |
++++ lincity-1.13.1/fileutil.c 2020-02-26 09:16:31.406614385 -0000 |
| 28 |
+@@ -105,7 +105,7 @@ |
| 29 |
+ * ---------------------------------------------------------------------- */ |
| 30 |
+ char LIBDIR[LC_PATH_MAX]; |
| 31 |
+ |
| 32 |
+-char *lc_save_dir; |
| 33 |
++extern char *lc_save_dir; |
| 34 |
+ int lc_save_dir_len; |
| 35 |
+ static char *lc_temp_filename; |
| 36 |
+ |
| 37 |
+--- lincity-1.13.1/ldsvguts.c 2003-10-10 04:11:29.000000000 -0000 |
| 38 |
++++ lincity-1.13.1/ldsvguts.c 2020-02-26 09:17:22.410992011 -0000 |
| 39 |
+@@ -91,8 +91,6 @@ |
| 40 |
+ * Private Global Variables |
| 41 |
+ * ---------------------------------------------------------------------- */ |
| 42 |
+ |
| 43 |
+-char save_names[10][42]; |
| 44 |
+- |
| 45 |
+ /* ---------------------------------------------------------------------- * |
| 46 |
+ * Public functions |
| 47 |
+ * ---------------------------------------------------------------------- */ |
| 48 |
+--- lincity-1.13.1/main.c 2004-07-03 07:59:05.000000000 -0000 |
| 49 |
++++ lincity-1.13.1/main.c 2020-02-26 09:17:04.222857373 -0000 |
| 50 |
+@@ -96,9 +96,8 @@ |
| 51 |
+ #endif |
| 52 |
+ #endif |
| 53 |
+ |
| 54 |
+-char *lc_save_dir; |
| 55 |
++extern char *lc_save_dir; |
| 56 |
+ char *lc_temp_file; |
| 57 |
+-char save_names[10][42]; |
| 58 |
+ |
| 59 |
+ #ifdef CS_PROFILE |
| 60 |
+ int prof_countdown = PROFILE_COUNTDOWN; |
| 61 |
+--- lincity-1.13.1/screen.h 2004-06-22 13:24:19.000000000 -0000 |
| 62 |
++++ lincity-1.13.1/screen.h 2020-02-26 09:14:31.473725606 -0000 |
| 63 |
+@@ -20,7 +20,7 @@ |
| 64 |
+ extern unsigned char start_font2[4096]; |
| 65 |
+ extern unsigned char start_font3[4096]; |
| 66 |
+ |
| 67 |
+-int monthgraph_style; |
| 68 |
++extern int monthgraph_style; |
| 69 |
+ |
| 70 |
+ /* This is on in screen_full_refresh, used in *_refresh() */ |
| 71 |
+ extern char screen_refreshing; |
| 72 |
|
| 73 |
diff --git a/games-simulation/lincity/lincity-1.13.1-r1.ebuild b/games-simulation/lincity/lincity-1.13.1-r1.ebuild |
| 74 |
index 02968c06f2e..6479c984045 100644 |
| 75 |
--- a/games-simulation/lincity/lincity-1.13.1-r1.ebuild |
| 76 |
+++ b/games-simulation/lincity/lincity-1.13.1-r1.ebuild |
| 77 |
@@ -1,4 +1,4 @@ |
| 78 |
-# Copyright 1999-2016 Gentoo Foundation |
| 79 |
+# Copyright 1999-2020 Gentoo Authors |
| 80 |
# Distributed under the terms of the GNU General Public License v2 |
| 81 |
|
| 82 |
EAPI=6 |
| 83 |
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND} |
| 84 |
|
| 85 |
PATCHES=( |
| 86 |
"${FILESDIR}"/${P}-build.patch |
| 87 |
+ "${FILESDIR}"/${P}-gcc-10.patch |
| 88 |
) |
| 89 |
|
| 90 |
src_prepare() { |
Archives