diff options
Diffstat (limited to 'games-simulation/lincity')
| -rw-r--r-- | games-simulation/lincity/Manifest | 7 | ||||
| -rw-r--r-- | games-simulation/lincity/files/lincity-1.13.1-build.patch | 38 | ||||
| -rw-r--r-- | games-simulation/lincity/files/lincity-1.13.1-gcc-10.patch | 37 | ||||
| -rw-r--r-- | games-simulation/lincity/lincity-1.13.1-r1.ebuild | 53 | ||||
| -rw-r--r-- | games-simulation/lincity/lincity-1.13.1-r2.ebuild | 60 |
5 files changed, 101 insertions, 94 deletions
diff --git a/games-simulation/lincity/Manifest b/games-simulation/lincity/Manifest index 539a3b531e2f..afeb062be4f1 100644 --- a/games-simulation/lincity/Manifest +++ b/games-simulation/lincity/Manifest @@ -1,5 +1,6 @@ -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 +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 -EBUILD lincity-1.13.1-r1.ebuild 976 BLAKE2B a8869f6a34959af3e537a327f186ed70c95d6d19d348e0ca0653337132cc27b64bb98e1399f8186d4735482825f04e7734852e307238e21a3bcf16f18bc8848e SHA512 bdcc7d91ed2c73fabea88eeb695c3f74b763119b91e2d1013794f276ceb84d3366c596d1627d9397279040d1bac22fc04d078ea2b0ca4073637322dec6a4c7e6 +DIST lincity.png 5377 BLAKE2B 2238140719a8c1b094fbe6d7b52b9224245f2c36f970e04aa3fcaf6090409145f17dad2c2a83f6528e695fd9d26d9c053c45978502b7e44f73cf25719d7ed3aa SHA512 40a8955fdc8397662ef0d084163e7dcad59e278429792bd7096e193a0d04791c2355a0dbd2c1f72a032bbfc71bc4e27e37a3d0d4e82de8e7170bb70205d983a3 +EBUILD lincity-1.13.1-r2.ebuild 989 BLAKE2B 6616dc088ae5d0b9712176727b1288719f81cb57db3a7910100a8b07f91133868b31ea1fc1d52571d97f2f91072ba4e6d6c9c875926bbe4bcca680c79a0d2e7e SHA512 80ce2dc386e4036ae2906c263ecb400940c85a02ab41c01243bc7fecd0e4f4c4920a9f6e71d581b032b01717212e2ed3fd45ada288c09e16d4195100a07defa4 MISC metadata.xml 330 BLAKE2B 27e534512b77895bcfea8da8f49e1fa4ce2c9a8df47cf0ce813a8a88893b3c69c03d25083412d22bea3d2d73dfe2baa6a26292b983409c28d6c40bd70e222f6f SHA512 c36fecc06a5c84b3a93dfd25ffeb05bb14a5a96676eb1d7e976903ef7892a10c22ee7afa894c581c0bc3079ce2e30574143cc6b49195b346463c48f3e34ff1c0 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 f7f41f954baf..a5244b5387f3 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/files/lincity-1.13.1-gcc-10.patch b/games-simulation/lincity/files/lincity-1.13.1-gcc-10.patch index 77f3a41dcf6c..a1d6ea0f2e70 100644 --- a/games-simulation/lincity/files/lincity-1.13.1-gcc-10.patch +++ b/games-simulation/lincity/files/lincity-1.13.1-gcc-10.patch @@ -1,7 +1,8 @@ +https://bugs.gentoo.org/570574 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 +--- a/fileutil.c ++++ b/fileutil.c @@ -105,7 +105,7 @@ * ---------------------------------------------------------------------- */ char LIBDIR[LC_PATH_MAX]; @@ -11,8 +12,8 @@ https://bugs.gentoo.org/706394 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 +--- a/ldsvguts.c ++++ b/ldsvguts.c @@ -91,8 +91,6 @@ * Private Global Variables * ---------------------------------------------------------------------- */ @@ -22,8 +23,8 @@ https://bugs.gentoo.org/706394 /* ---------------------------------------------------------------------- * * 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 +--- a/main.c ++++ b/main.c @@ -96,9 +96,8 @@ #endif #endif @@ -35,8 +36,28 @@ https://bugs.gentoo.org/706394 #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 +--- a/mouse.c ++++ b/mouse.c +@@ -1094,7 +1094,7 @@ + return 0; + } + +-inline int ++static inline int + mt_temp(int x, int y) + { + if (x < 0 || y < 0 || x >= WORLD_SIDE_LEN || y >= WORLD_SIDE_LEN) +@@ -1128,7 +1128,7 @@ + return 0; + } + +-inline int ++static inline int + mt_perm(int x, int y) + { + /* By now, it has already been mt_erase()'d */ +--- a/screen.h ++++ b/screen.h @@ -20,7 +20,7 @@ extern unsigned char start_font2[4096]; extern unsigned char start_font3[4096]; 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 6479c984045d..000000000000 --- 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 000000000000..c67386702def --- /dev/null +++ b/games-simulation/lincity/lincity-1.13.1-r2.ebuild @@ -0,0 +1,60 @@ +# 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^} +} |