From ba3d6ddada23eaa04f85228bee3438ab479b4442 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 23 Oct 2022 21:50:52 +0100 Subject: gentoo auto-resync : 23:10:2022 - 21:50:51 --- games-simulation/lincity/Manifest | 3 +- ...otypes-and-implicit-function-declarations.patch | 270 +++++++++++++++++++++ games-simulation/lincity/lincity-1.13.1-r2.ebuild | 60 ----- games-simulation/lincity/lincity-1.13.1-r3.ebuild | 61 +++++ 4 files changed, 333 insertions(+), 61 deletions(-) create mode 100644 games-simulation/lincity/files/lincity-1.13.1-Fix-prototypes-and-implicit-function-declarations.patch delete mode 100644 games-simulation/lincity/lincity-1.13.1-r2.ebuild create mode 100644 games-simulation/lincity/lincity-1.13.1-r3.ebuild (limited to 'games-simulation/lincity') diff --git a/games-simulation/lincity/Manifest b/games-simulation/lincity/Manifest index d1aa1e62354c..56c6e181542c 100644 --- a/games-simulation/lincity/Manifest +++ b/games-simulation/lincity/Manifest @@ -1,6 +1,7 @@ +AUX lincity-1.13.1-Fix-prototypes-and-implicit-function-declarations.patch 6756 BLAKE2B 85fe14f7e31790a051b9c6a4ff3ddcfba1f606bbbdf09758ecf350e659423a36d27a94f749a76a5e3774f7a07c863544f0c2abb4fa70a6b2bb223638891e1d14 SHA512 971f635b41aa37a7d31a2a175a3f81dc0436804bc7b0e8696e067506bf9ac580fed133b5abac2d817aa5be1aca7a3616cbc6fc626dfe441f2c9df41e01d4348b AUX lincity-1.13.1-build.patch 1476 BLAKE2B 941fca117f259915c0e55fd8febddb5c3b6b3d86e1eb9f332edbb76eb8c8361fc4e410d01a8526b73c694f059edf49e55c8f9e9635cea645f34c9fdbe3d0f819 SHA512 e2d014006e0425ab68c685b23febc27ae18500d0b62d00642964c1b37f77646143869f6fe199d34d6a5b931c7449ed0762b934f38e60f20d719bfc0a12d3ac28 AUX lincity-1.13.1-gcc-10.patch 1540 BLAKE2B 9eb02f6f5820ddb6fdd0edbd25921f7f2a01595f1c1ac3d70e0683bd3fa625ee5a477e5df5d616eb334648ff01d8379970ecb72d272abadbd4867cac349cb0fa SHA512 433929f62f2dc425304bd34ccfdcbb92cbef17486c3628bb649d0c74e0fb68c5c5ab4219a2eb1028d197769ec02566db221c2e9666cfae84dc49e96f67e8d215 DIST lincity-1.13.1.tar.gz 1064236 BLAKE2B 1172ced3255048f3132f85cd9ae994c7e0558170f7e7a24909af1856669c4ad90d57acd76f330fb556656ed74843dda159005350760fc059c6b184cedf1e9393 SHA512 bc4ee7a1642b1efa25f9edaabd3aeb52d1ca1d016735c5094586f52fda3ec4e9080ff35fe518c1ccbfad9fd54babb370f4b9b6a158b4d2f43b7182155084eefc DIST lincity.png 5377 BLAKE2B 2238140719a8c1b094fbe6d7b52b9224245f2c36f970e04aa3fcaf6090409145f17dad2c2a83f6528e695fd9d26d9c053c45978502b7e44f73cf25719d7ed3aa SHA512 40a8955fdc8397662ef0d084163e7dcad59e278429792bd7096e193a0d04791c2355a0dbd2c1f72a032bbfc71bc4e27e37a3d0d4e82de8e7170bb70205d983a3 -EBUILD lincity-1.13.1-r2.ebuild 989 BLAKE2B 6616dc088ae5d0b9712176727b1288719f81cb57db3a7910100a8b07f91133868b31ea1fc1d52571d97f2f91072ba4e6d6c9c875926bbe4bcca680c79a0d2e7e SHA512 80ce2dc386e4036ae2906c263ecb400940c85a02ab41c01243bc7fecd0e4f4c4920a9f6e71d581b032b01717212e2ed3fd45ada288c09e16d4195100a07defa4 +EBUILD lincity-1.13.1-r3.ebuild 1065 BLAKE2B db35b616bfac1b21bfa5140cc77719f846b5e0563e29709386ddda93c685e2060ba5284630973d6e269bbe60c525e75e4ccaf6dea875f81efa55b09c5c676078 SHA512 9d545ff078ffdafdf7a6716ca0909c6ea2d670b89c48d2af94b32c097e7e1639ef928d7e0e40e2986d8bf32a4558973a4a3f93c72655d6055a101955e2f0ae4b MISC metadata.xml 331 BLAKE2B 593e63be77f20f26d1f8e8b9a4eb77ca71db1f34edba26420edad3f7578f10f41b9deae0f4caeb74767de6afc1948a989a005936ef33f3f46c315823c88730d4 SHA512 ced143eeec08adb0cf97914ca2995271dd2303b715335f5f4e10591fa341c9ddf1889d75abba8cb9dcfc51effaf8f082752d9842844fe5a3c3b81cf23224d745 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 +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 /* 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-r2.ebuild deleted file mode 100644 index c67386702def..000000000000 --- a/games-simulation/lincity/lincity-1.13.1-r2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop - -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() { - 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^} -} diff --git a/games-simulation/lincity/lincity-1.13.1-r3.ebuild b/games-simulation/lincity/lincity-1.13.1-r3.ebuild new file mode 100644 index 000000000000..c80cf4adcb21 --- /dev/null +++ b/games-simulation/lincity/lincity-1.13.1-r3.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop + +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 + "${FILESDIR}"/${P}-Fix-prototypes-and-implicit-function-declarations.patch +) + +src_configure() { + 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^} +} -- cgit v1.2.3