Bug #426206: compile-fix for newer zlib & GCC.

Package-Manager: portage-2.2.7/cvs/Linux x86_64

4 files changed, 49 insertions, 34 deletions

diff --git a/x11-misc/xrmap/ChangeLog b/x11-misc/xrmap/ChangeLog
index ca2ebbe12cf6..64db7967691e 100644
--- a/x11-misc/xrmap/ChangeLog
+++ b/x11-misc/xrmap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xrmap
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.23 2011/10/08 16:45:18 phajdan.jr Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.24 2013/12/28 00:09:57 robbat2 Exp $
+
+  28 Dec 2013; Robin H. Johnson <robbat2@gentoo.org>
+  +files/xrmap-2.33-zlib.patch, xrmap-2.33-r1.ebuild:
+  Bug #426206: compile-fix for newer zlib & GCC.
 
   08 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> xrmap-2.33-r1.ebuild:
   x86 stable wrt bug #385981
@@ -93,4 +97,3 @@
 
   06 Mar 2004; Markus Nigbur <pyrania@gentoo.org> xrmap-2.10.ebuild:
   Initial import.
-
diff --git a/x11-misc/xrmap/Manifest b/x11-misc/xrmap/Manifest
index 431f2054781e..603fb347b65e 100644
--- a/x11-misc/xrmap/Manifest
+++ b/x11-misc/xrmap/Manifest
@@ -1,28 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX xrmap-2.33-Makefile.kit.patch 701 RMD160 97661e2d5e7d5e34db533f66bd3eb6373d4f900a SHA1 01393e37ee1ef8a0dc59415589ad89fcf531493f SHA256 839a5672acd290d24aee62de2ecb30aee584cff7ea7475ef95d778a9ad9125b6
-AUX xrmap-2.33-as-needed.patch 564 RMD160 3760717e2478cab2d2cec0afb26e903480906e31 SHA1 0e5009b2556e3ffcdd8ef102b6191dd0c4aa19f2 SHA256 54ec3017ca34a4a195b79555e0dfe4d2e04df7c80782a52e3719b90745217c86
-AUX xrmap-2.33-libpng15.patch 159 RMD160 715cb38ae83115f6e5994dc918c2cf9c9cdedd1d SHA1 505ddcfd7b33d2a92a99b92de56e41837595d743 SHA256 144cd2745262aadccb71bc0ab47686710c109fca30cdb70208f3afdee62768e8
-AUX xrmap-2.33-parallel-make.patch 940 RMD160 c1eaca645849f81bd70c3608572e0942b036fcb9 SHA1 ba7de59da457d5be948c006d05f3aa1812845872 SHA256 8e40d3819c0a3d598401ad3386709c833c66d578c097eff8652def5901e0d928
-DIST CIA_WDB2.jpd.gz 7391060 RMD160 80fe751ba61405d7b7b7ecdfaf3a9d8e7b9e06b8 SHA1 5d5695c21059dce13ede1f7d5c2a4dfe19b52dd2 SHA256 6bd5c4dc9b31814fdd724563ad27a5a08484d2e8b4f410f8a3a6941491dc13e1
-DIST anthems-1.3.tar.bz2 204506 RMD160 d259a5a891227f27a0f1e8bd5530b0d70fea90f5 SHA1 362fd89839f0990d55e9abc82b2d6fe61efd9616 SHA256 69457f8834e004192884abdccfe4b46d75a08c8c7c5f8e8dae3efe46ef022662
-DIST earthdata_low_res.tar.bz2 8399634 RMD160 a077e62d2f8b97d5fb25799a92abac43eee94031 SHA1 f598ea292f3d75a3d769488b4c17012299754e93 SHA256 659b03d2e461de2d78315dc27a3ddbeb58b9aa434687dfa0920eefd645315de3
-DIST factbook_html_2008.tar.bz2 42761187 RMD160 546e4fd45631f90df92efb464dae6f70d6628ff5 SHA1 fa00c4ba48fad05a22d8443332512e33cf9587fd SHA256 bd260ecbf2c2fac92486d2136d9a7fc4cee84e16ca658cee756977262aa45b0f
-DIST flags-2.9-xpm_150.tar.bz2 1248162 RMD160 95f4fd4c774d4237b01d4dcd723cf5dbfb343872 SHA1 6885408dddd1232650055a0b204bdf443980321d SHA256 e26cd5d66fe48949e00ffe492b89a06916a3cb1b07fd1d3f62eca8a042128b12
-DIST hymns-1.4.tar.bz2 841330 RMD160 58a6874638943a1c93623f920e2ab9d5cc4b065b SHA1 71fee38ba733cd9e073a4445bd05de6b24f93fb7 SHA256 a2197d99bfe88be6bc728dda1160f58a8b8e5be0ce4ee94b886da35dd8754b0d
-DIST xrmap-2.10.tgz 3944521 RMD160 dd398b2e4b24c23b1fbf9edfa37ddf7d1f4eaf65 SHA1 234a3272e5433865ce7e41c0ed663e17c0fa0f6d SHA256 dcc7383064ca03f4bbc097863cc0e54572c7b0c586461f222cfa7a14848acd6c
-DIST xrmap-2.29.tar.bz2 1072241 RMD160 f8cacc343643a66c8236743c76c80d3c33c44c5c SHA1 af2efc47b7ef76840a72a96e67174b0fd5dd8973 SHA256 2c790904c5077940b8e4b23d848b0e6a02757cde18a3256c47f34da7d7ae31d0
-DIST xrmap-2.33.tar.bz2 1224699 RMD160 6c025976f98046315a370405f043aaf2cd05a12d SHA1 bd6392e1732754f5421615ff16ef625e703fbb5b SHA256 120bb1544a7f375e2ed2ec036e7b170081a963b559c3b3b0b5eefe52f56c8440
-EBUILD xrmap-2.29.ebuild 2112 RMD160 1b9f33e54013a4c7ed06c1a0550b9c716f815549 SHA1 fc79529380a944b5585c1655be573511a4cca5df SHA256 bd641e18421edc15bd9f3e439cd97f83c38eef3b1d285ebac970bdff29be6d32
-EBUILD xrmap-2.33-r1.ebuild 3565 RMD160 e2fddff9658468e000d99c15974c41b1ef4e7a99 SHA1 5be7980390a600c022bdd8676c8cf5484d9607c1 SHA256 5727e1657ce1262f42709cc931441f258e64f63a274e3e4a4703c51b01a4bb55
-EBUILD xrmap-2.33.ebuild 2358 RMD160 15819efe33f54db7ae5160f46182e2f4e4570996 SHA1 03241ef116a735f57e32ce5b4ca1347c3427c686 SHA256 327af5cc9fa73e4623d4fe23172ff90d0e36d72bd9e59d01840b7053abed116d
-MISC ChangeLog 3464 RMD160 852315be6724bb49cc92cba484b4ac80e929359d SHA1 da3f33859fe0b8f912b516efc35711eba8f1c3a1 SHA256 2fea7b05093ac59913afa5134df1e1aa78735fce4390fd1865db1b559f102684
-MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREKAAYFAk6QfiQACgkQuUQtlDBCeQI3DQCdErZ9MtwhR1okY0CEgXd+wE2Y
-mtkAn0G+E29qS401SMHc6MjXmnINc54U
-=COsn
------END PGP SIGNATURE-----
+AUX xrmap-2.33-Makefile.kit.patch 701 SHA256 839a5672acd290d24aee62de2ecb30aee584cff7ea7475ef95d778a9ad9125b6 SHA512 b7ae5ec1fc6606544eefa1387171cd8e10140a3d68392f06cb1b19fcba760e437277dbe5cb9c624ce561b1f0fe3b088a789e501116505488ce8adfbef116d5d0 WHIRLPOOL 2db151bf628891687e09006c061ff97f4748522c3ab9ff0129b8798402dfd0ae4697d9108c4f712a2e257f8c0a9f37de3f3e5edbb6ac528470d12813d0251242
+AUX xrmap-2.33-as-needed.patch 564 SHA256 54ec3017ca34a4a195b79555e0dfe4d2e04df7c80782a52e3719b90745217c86 SHA512 5972839b26d29ec2e5eb7f88edcc742dd8bd3464129192bb3318a1605ad3572a1e1393860a6c8600e6a55afd5d496748161a9b9ff890a9316356245604978b8f WHIRLPOOL 453dbc8d4892d61ec99e14874b98c8de7301e52fcfb9c6f0338853d91d7c466e10e8de8a5c3cd7d43ba4437470d8e73037b672a2cf455fa1322cb584b4e0ddc3
+AUX xrmap-2.33-libpng15.patch 159 SHA256 144cd2745262aadccb71bc0ab47686710c109fca30cdb70208f3afdee62768e8 SHA512 3bf598bcc678f91f9fd79a533f6170d2968b91720b391164c0fa802592f58f1caa506e172717df97c53f88214db9b532d4e3fbacdd28dd1d3b74acfbfbc067c2 WHIRLPOOL f3522fd0f431208c5ade805d32035e620a50181e99db74c5463cb3faa03e1e693bd996640b2a6a49ffde2beadbdb041a302cb6bcaf524ad6c794153708d44d00
+AUX xrmap-2.33-parallel-make.patch 940 SHA256 8e40d3819c0a3d598401ad3386709c833c66d578c097eff8652def5901e0d928 SHA512 798982cc58fdfa99cc4fc1984bd939f91407ef2eac186d6fe4decf1e7ee644712ae223d7706265cadac4ae2661aa745701611f77e2cc32aaefc9d05d770a7e17 WHIRLPOOL 95db1c54bb2dddd75d647118513aca8c1e01c9713827ffbb0d81c6347071d046972b9687e80dac5e3dedb0bda18674cf1f62acf9e57b802a85501c2b12e774c1
+AUX xrmap-2.33-zlib.patch 486 SHA256 f820332071230301f3d672e6b1bc348cdebad13c607f3333a6f500486018c41f SHA512 ee4fe1d63267d254b227ed68917e8e43cac3b3c728f115d1c9138ccb9d7c19f6846f4a067e1fa2278ef9583e56caa30ad3b119165cfde08314acb3aff1f59270 WHIRLPOOL a69465841542979006c55279fb716d50adb848b67cbfe1682895df902c54a1a98167ad9c326d844e3afce27605578c5970f818c3a151480d6e9c51fbf75ea1e6
+DIST CIA_WDB2.jpd.gz 7391060 SHA256 6bd5c4dc9b31814fdd724563ad27a5a08484d2e8b4f410f8a3a6941491dc13e1 SHA512 bd17b556369e4b5b4882448888f7d6e4b2557eaf3ed649706f7e06b333cc16c15c556c122234eae6a37535df553aefbbafe326be0a352a3dea42c955d94ca63c WHIRLPOOL 78ff5eb17d294b2a9a2bc76315a00d4ee10e4e921eb76bbb481feab6193abd6f8569b61be22270e5b5edc89036006a8e5b16c37ffb89b935dc8606b56fe4c596
+DIST anthems-1.3.tar.bz2 204506 SHA256 69457f8834e004192884abdccfe4b46d75a08c8c7c5f8e8dae3efe46ef022662 SHA512 08be5ec1b7134214129753626210a6f1b7f644a5615cae33377bbd4bfe3f8ad6fd06874c9cf07d60012c27e30a8b30f713c427b10026e72d559f2008a37b9278 WHIRLPOOL 6c0dd0f804b0fb94ac829fa5ee55c691266cee98d1a4a1d38dbe0031b0e1151cffa707c087efdc334883e5d252e2fe26f1ae53930bd2df63b80624bacf63f9cd
+DIST earthdata_low_res.tar.bz2 8399634 SHA256 659b03d2e461de2d78315dc27a3ddbeb58b9aa434687dfa0920eefd645315de3 SHA512 c4b5d13e4b890ecb16e2f8f9622c0d9c2a4bb148c1dc6f1e3e0fa1987ccef1872727a31d94f5bc45b605c60ba4a21e341c438ce5fa3e6a7f57d69f47d483b6eb WHIRLPOOL 65d1ea801bf25fb98b3d354aa0fbb012ecc0cf546acdd7f0fdce8fe3ebc98c0149f2eb614f2019b56dac89738dec99ad93265f21a02d3fb59adbab08f849d037
+DIST factbook_html_2008.tar.bz2 42761187 SHA256 bd260ecbf2c2fac92486d2136d9a7fc4cee84e16ca658cee756977262aa45b0f SHA512 a501eb7f23310a48bacc40e8e37b451ec7fb87d129fb8839024898d16562130269eea930dac0626979e313ebe76f70dc077cda44c6f60374268439f0f8a93150 WHIRLPOOL 347a8ec4ccf1c5db8d5f98ecf346e3f854ca7930aba80492c2b25d3cff34af796d3613132f2644424efc12724419cfd47be1a80cf503c8d9f6d9fbd55da4bfc3
+DIST flags-2.9-xpm_150.tar.bz2 1248162 SHA256 e26cd5d66fe48949e00ffe492b89a06916a3cb1b07fd1d3f62eca8a042128b12 SHA512 fde4959bd702867d11745dc85af6a0fa19ab87f66938626292f657d9baa17a2ac444686a0c3db9090935ebe822ff0779c0de6457dbdb5fa08f1cb701e328875d WHIRLPOOL 414edfd7efc5113138ed00e58d40cbaef2c8ed31b9e92454262aa1dc19c5db7e5d1e326be34c6ff7f6efaff37122db9ee8fac1bff26d1d044c406eda5eff314d
+DIST hymns-1.4.tar.bz2 841330 SHA256 a2197d99bfe88be6bc728dda1160f58a8b8e5be0ce4ee94b886da35dd8754b0d SHA512 331147e18ee258ed4179986c96b919ce0e884c952291beacf76787380a8e0737ca2f8f2add5363e08f9687540ed3092d7172db28ca3bb5bf1456d19060ed49f6 WHIRLPOOL 6faef4996a4c447148b62abbe221d2ada3fa61b529bb9e3dac5e3464f6f0ef5a7671e03908e20c790228e572bf1e5f99e984880b77ac9bb969c67c4e326389d9
+DIST xrmap-2.10.tgz 3944521 SHA256 dcc7383064ca03f4bbc097863cc0e54572c7b0c586461f222cfa7a14848acd6c SHA512 704c454049ab50b41edb8f2b30c1b386b59d831d16c3b34f98211e66e01cd5711295619303a3576f22a667af3d8cd91261b5462c04d73bc780497f9edaec8609 WHIRLPOOL 4bd89d38f76c3d06803fdf9e15c7a63de834db0b3b59b66a99dcd09d5e415f5070f84d7db66f24df02cdefc1883e3024df2f8d6a087a47e33bbc9c9993039dda
+DIST xrmap-2.29.tar.bz2 1072241 SHA256 2c790904c5077940b8e4b23d848b0e6a02757cde18a3256c47f34da7d7ae31d0
+DIST xrmap-2.33.tar.bz2 1224699 SHA256 120bb1544a7f375e2ed2ec036e7b170081a963b559c3b3b0b5eefe52f56c8440 SHA512 039f13f34b6c72f09858f381847c5f1eaa45d841688244491d0249f9cf74f3883edaa5498a908f12716892d703956272b3bea1b64bc7881306caa2fbaa601158 WHIRLPOOL bfc54ae6a1d8437671d75ab7a0a75107afcc9bb2bad1691b1dbcc982101aed3c36e1bc53299024572ac3b11a3fb8460e73f5e0224330795a335b5b15ccd626ab
+EBUILD xrmap-2.29.ebuild 2112 SHA256 bd641e18421edc15bd9f3e439cd97f83c38eef3b1d285ebac970bdff29be6d32 SHA512 ef747105afa33eb2d35f47807da7aae605c519e37ac3ab77a69ea8d533f0c1acd34034c11922fc479b1e38b6f224bb33c9434c525b6f09f2aaf3848bd94787ab WHIRLPOOL 71cb334d4577b350ca1cd343346b835e38a8eb53aacc9ff87bb89a535c5fe5a16f000465da449dabe18b8c7388a9214bdda365bfda07accb800ba313d997d71a
+EBUILD xrmap-2.33-r1.ebuild 3596 SHA256 9dd8a7b176650560443b06d5d9c3188c22deda245a4e49a1c26d657209a1bcfe SHA512 ce21cb623b7c81cd94b2578267ae7f271fa6b88f7f13f83935ad192f51fb7e42e3ed96cacfd7fd321fdc9afd175177de9a46948d512c05fe7d56b658431cc33e WHIRLPOOL 646414e920a1d09b61e31a2ccd7229ae86cc2250e22ef6901432c5e767b2245bbb9f290a5e81a698498474b3610fe1bf78f1b89c6932f19775b61564730d6b09
+EBUILD xrmap-2.33.ebuild 2358 SHA256 327af5cc9fa73e4623d4fe23172ff90d0e36d72bd9e59d01840b7053abed116d SHA512 15f6382eab456fb59427792475a0df570b1b89f56aee058c92bdc6f490055415b308d8383fcb20a68b0f17e45698baaa97c314af91c69b14432aa09a0ce5f986 WHIRLPOOL bd5186d4b25d0bc5ce4006734494accc8dfb0d919324d4a9ca740befc952275384b8d7e827781bb610c839f7b5477d95a93738780cc9fc34f786d6430a8a5416
+MISC ChangeLog 3617 SHA256 f343961f014f19b39122375845753182669516a92bcb41d1faa9e5aca3c779b8 SHA512 f1f5a3251c2ec70391dac7b890e5b9f4dda586e285d42a8526e1e136aa12c872577658ba88f628097f9fb63dfa0a6833d4b2f4b2c21be98b9138e944a2c14ff3 WHIRLPOOL 8c446d3115bc984945907934ff68871dbf519398937b240363ce2f4f9396b91bf22b35adb52f7365125630f63639bb54110338b2fd5e0f10e9acaa7ff182d180
+MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297
diff --git a/x11-misc/xrmap/files/xrmap-2.33-zlib.patch b/x11-misc/xrmap/files/xrmap-2.33-zlib.patch
new file mode 100644
index 000000000000..8b7301b7b61e
--- /dev/null
+++ b/x11-misc/xrmap/files/xrmap-2.33-zlib.patch
@@ -0,0 +1,20 @@
+--- xrmap-2.33.orig/earthview/earthview.c	2005-07-12 06:56:41.000000000 -0700
++++ xrmap-2.33/earthview/earthview.c	2013-12-27 15:59:14.068667773 -0800
+@@ -96,7 +96,7 @@
+ char *data_file = NULL;
+ char *cps_file, *cps_dir;
+ FILE *fd = NULL;
+-gzFile *gzd = NULL;
++gzFile gzd = NULL;
+ 
+ /* Predefined color schemes */
+ /* You can of course add as many as you like... */
+@@ -212,7 +212,7 @@
+     return n;
+ }
+ 
+-int ngzread(gzFile *gzd)
++int ngzread(gzFile gzd)
+ {
+ unsigned char c;
+ int n;
diff --git a/x11-misc/xrmap/xrmap-2.33-r1.ebuild b/x11-misc/xrmap/xrmap-2.33-r1.ebuild
index 4a108aa2fa95..4ba405ce42fa 100644
--- a/x11-misc/xrmap/xrmap-2.33-r1.ebuild
+++ b/x11-misc/xrmap/xrmap-2.33-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.33-r1.ebuild,v 1.3 2011/10/08 16:45:18 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.33-r1.ebuild,v 1.4 2013/12/28 00:09:57 robbat2 Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -47,7 +47,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-Makefile.kit.patch \
 		"${FILESDIR}"/${P}-as-needed.patch \
 		"${FILESDIR}"/${P}-parallel-make.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
+		"${FILESDIR}"/${P}-libpng15.patch \
+		"${FILESDIR}"/${P}-zlib.patch
 
 	sed  -e 's,^\(X11DIR=\).*,\1/usr/,g' \
 		 -e 's,^\(EDITOR=\).*,\1less,g'   \