Build with new zlib. Bug #408467

Package-Manager: portage-2.1.10.50/cvs/Linux i686

4 files changed, 86 insertions, 11 deletions

diff --git a/games-simulation/simutrans/ChangeLog b/games-simulation/simutrans/ChangeLog
index 475ef8fb59f7..6d6a7f918e37 100644
--- a/games-simulation/simutrans/ChangeLog
+++ b/games-simulation/simutrans/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-simulation/simutrans
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/ChangeLog,v 1.27 2011/05/09 15:53:23 tupone Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/ChangeLog,v 1.28 2012/03/23 20:14:06 tupone Exp $
+
+  23 Mar 2012; Tupone Alfredo <tupone@gentoo.org> simutrans-0.102.2.2.ebuild,
+  +files/simutrans-0.102.2.2-zlib.patch:
+  Build with new zlib. Bug #408467 by Piotr Szymaniak
 
   09 May 2011; Tupone Alfredo <tupone@gentoo.org> simutrans-0.102.2.2.ebuild,
   +files/simutrans-0.102.2.2-gcc46.patch:
diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index 1b95150b5954..2b8f89dec024 100644
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA1
 
 AUX simutrans-0.102.2.2-gcc46.patch 280 RMD160 3ef61f3cf3b248af92dccebe581ed3445984e26a SHA1 43a0a767d23a9f61d507026e37ec6f947f3c4601 SHA256 e9cf8557799fb825b9f395b0d48071bbf00459d373f93e86c7e6e8b0c92d91c6
+AUX simutrans-0.102.2.2-zlib.patch 1491 RMD160 225daf6de6642e8c6638e094203e52733dad7946 SHA1 dabf97adac747f58f0c9884d39f232ef3ee90d92 SHA256 3d037ceb8fd2a45b732b681dcbf7d8a40d2216a5240d594c6fdbd55bd61e475d
 DIST simulinux-complete-102-2-2.zip 6115022 RMD160 6539c3bc66d4c6a9e6f67dbcf640e0f1588c9618 SHA1 f74d2ac9e03f86754881006c7a36d7089a6d1d6b SHA256 0f7752b7625ecfe18ab29f724321249ca9cc49cc9e05e392b3d19190188a6c98
 DIST simupak64-addon-food-102-2-1.zip 113454 RMD160 f57902d9c882196e50042daa31ba8f0b540599ee SHA1 e41abf1bdd480190bf7a46764895b43b9d65d3c1 SHA256 7add9c3e3dc3959c6a39776043a16beb92f6f59190fcae25b29e367c17e24607
 DIST simutrans-src-102-2-2.zip 2498680 RMD160 c521a50a25fff19a292571f093c0352dead4e941 SHA1 e956fefcf181a32f999d68ff49dbb73c9d9ff566 SHA256 b105013ba180706a4790eddf19e007e1955c4ef7daa1c90fb6aaa48c28134351
-EBUILD simutrans-0.102.2.2.ebuild 1669 RMD160 32e217ba9ae0d545d2de9b281600f5aac59b6ef1 SHA1 589bd287a36eeb2ecfdb1045b6cabe104b92e771 SHA256 69134b1bce307d1cda20d021876832d8c9a5e7ad52e5cafdc53e9d72e414536f
-MISC ChangeLog 4553 RMD160 be3432813d04142550886021be05b873ee9d9496 SHA1 aaed7992c69984bba1eb3767985555d88a45b1a6 SHA256 d99cc9c221eeb1a68ae5da4486d2c069597081704bda868f8234a7bfa7b3fe89
+EBUILD simutrans-0.102.2.2.ebuild 1703 RMD160 748cba22b3a5c8be2e0d0433d196dd9b2b8055ba SHA1 fa08956ea9913d80b31ae4760cdf43bb478b012a SHA256 48972a79c6186bb80e2c8d5afe5bf110eaafffc52535af302b28b29956db2ac3
+MISC ChangeLog 4727 RMD160 5c2155026b867e3e9fc788e0cb27bc288ee73652 SHA1 724255697fa5e8962767f270b0502fb9bed5970e SHA256 0dfdfd03af3ea3cba41e3fac56bceae0aa66bcd4fb30fa6653ccc9060089d217
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk3H2xwACgkQIY77eQFFFC2IDACgylu+onOJtRlfCQ3T6df6nCvK
-q+0AoIvi1P+iCOq0kZwgIhZ+hpYqVH4s
-=LlUh
+iEYEARECAAYFAk9s2ZoACgkQIY77eQFFFC2opwCggihTzxoRrGrhL44ZChZ7C6X0
+E5AAnjX7vKCJIoSAt+8X1gnZu2NiX+2p
+=kGhz
 -----END PGP SIGNATURE-----
diff --git a/games-simulation/simutrans/files/simutrans-0.102.2.2-zlib.patch b/games-simulation/simutrans/files/simutrans-0.102.2.2-zlib.patch
new file mode 100644
index 000000000000..966480232e58
--- /dev/null
+++ b/games-simulation/simutrans/files/simutrans-0.102.2.2-zlib.patch
@@ -0,0 +1,69 @@
+--- dataobj/loadsave.cc.old	2012-03-23 20:37:16.071335099 +0100
++++ dataobj/loadsave.cc	2012-03-23 20:39:53.600282699 +0100
+@@ -82,7 +82,7 @@
+ 		if(fp==NULL) {
+ 			return false;
+ 		}
+-		gzgets(fp, buf, 80);
++		gzgets((gzFile)fp, buf, 80);
+ 	}
+ 	saving = false;
+ 
+@@ -237,11 +237,11 @@
+ 		}
+ 		if(is_zipped()) {
+ 			int err_no;
+-			const char *err_str = gzerror( fp, &err_no );
++			const char *err_str = gzerror((gzFile)fp, &err_no );
+ 			if(err_no!=Z_OK  &&  err_no!=Z_STREAM_END) {
+ 				success =  err_no==Z_ERRNO ? strerror(errno) : err_str;
+ 			}
+-			gzclose(fp);
++			gzclose((gzFile)fp);
+ 		}
+ 		else if(  is_bzip2()  ) {
+ 			if(   saving  ) {
+@@ -280,7 +280,7 @@
+ 		return bse!=BZ_OK;
+ 	}
+ 	else {
+-		return gzeof(fp) != 0;
++		return gzeof((gzFile)fp) != 0;
+ 	}
+ }
+ 
+@@ -288,7 +288,7 @@
+ void loadsave_t::lsputc(int c)
+ {
+ 	if(is_zipped()) {
+-		gzputc(fp, c);
++		gzputc((gzFile)fp, c);
+ 	}
+ 	else if(is_bzip2()) {
+ 		uint8 ch = c;
+@@ -309,14 +309,14 @@
+ 		return bse==BZ_OK ? c[0] : -1;
+ 	}
+ 	else {
+-		return gzgetc(fp);
++		return gzgetc((gzFile)fp);
+ 	}
+ }
+ 
+ long loadsave_t::write(const void *buf, size_t len)
+ {
+ 	if(is_zipped()) {
+-		return gzwrite(fp, const_cast<void *>(buf), len);
++		return gzwrite((gzFile)fp, const_cast<void *>(buf), len);
+ 	}
+ 	else if(is_bzip2()) {
+ 		BZ2_bzWrite( &bse, bzfp, const_cast<void *>(buf), len);
+@@ -338,7 +338,7 @@
+ 		return (long)len&~(bse-BZ_OK);
+ 	}
+ 	else {
+-		return gzread(fp, buf, len);
++		return gzread((gzFile)fp, buf, len);
+ 	}
+ }
+ 
diff --git a/games-simulation/simutrans/simutrans-0.102.2.2.ebuild b/games-simulation/simutrans/simutrans-0.102.2.2.ebuild
index 47b574ea3243..26458a2286a5 100644
--- a/games-simulation/simutrans/simutrans-0.102.2.2.ebuild
+++ b/games-simulation/simutrans/simutrans-0.102.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/simutrans-0.102.2.2.ebuild,v 1.4 2011/05/09 15:53:23 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/simutrans-0.102.2.2.ebuild,v 1.5 2012/03/23 20:14:06 tupone Exp $
 
 EAPI=2
 inherit flag-o-matic eutils games
@@ -52,7 +52,8 @@ FLAGS=-DSTEPS16" > config.default \
 		|| die "sed failed"
 
 	rm -f simutrans/simutrans
-	epatch "${FILESDIR}"/${P}-gcc46.patch
+	epatch "${FILESDIR}"/${P}-gcc46.patch \
+		"${FILESDIR}"/${P}-zlib.patch
 }
 
 src_install() {